Binary serializing sprites

Author: catastropher

src/Components/IsometricSpriteComponent.cpp

@@ -5,11 +5,11 @@
 
 void IsometricSpriteComponent::Render(Renderer* renderer)
 {
-    auto spriteBounds = sprite->sprite.Bounds().Size();
+    auto spriteBounds = sprite->Get().Bounds().Size();
     auto position = owner->ScreenCenter() + offsetFromCenter - spriteBounds + baseSize / 2;
     int layer = GetScene()->GetService<PathFinderService>()->GetCell(GetScene()->isometricSettings.WorldToTile(owner->Center())).height;
 
     auto depth = GetScene()->isometricSettings.GetTileDepth(owner->Center(), layer + 1, layerOffset);
 
-    renderer->RenderSprite(&sprite->sprite, position, depth);
+    renderer->RenderSprite(&sprite->Get(), position, depth);
 }

src/Components/ParticleSystemComponent.cpp

@@ -97,7 +97,7 @@ void ParticleEffect::Stop()
 
 void ParticleSystemComponent::OnAdded()
 {
-    effect.emplace(GetResource<SpriteResource>("particle")->sprite, 100);
+    effect.emplace(GetResource<SpriteResource>("particle")->Get(), 100);
 }
 
 void ParticleSystemComponent::Render(Renderer* renderer)

src/Components/SpriteComponent.cpp

@@ -15,8 +15,8 @@ void SpriteComponent::Render(Renderer* renderer)
         : scene->isometricSettings.GetTileDepth(owner->Center(), depth);
 
     renderer->RenderSprite(
-        &sprite->sprite,
-        owner->Center() + offsetFromCenter - sprite->sprite.Bounds().Size() * scale / 2,
+        &sprite->Get(),
+        owner->Center() + offsetFromCenter - sprite->Get().Bounds().Size() * scale / 2,
         spriteDepth,
         scale,
         owner->Rotation(),

src/Renderer/SpriteAtlas.cpp

@@ -17,7 +17,7 @@ void SpriteAtlas::GetFrame(const int frameIndex, Sprite* outSprite) const
     const Vector2 cell(col, row);
 
     *outSprite = Sprite(
-        _atlas->sprite.GetTexture(),
+        _atlas->Get().GetTexture(),
         Rectangle(
             cell * (_cellSize + Vector2(8, 8)),
             _cellSize));

src/Renderer/SpriteFont.cpp

@@ -6,7 +6,7 @@ SpriteFont::SpriteFont(SpriteResource* fontSprite, int rows, int cols)
         : _characterAtlas(fontSprite, std::vector<AtlasAnimation>(), rows, cols, Vector2(0, 0), Vector2(16, 16)),
           _characterDimensions({ 16, 16})
 {
-    auto size = fontSprite->sprite.Bounds().Size();
+    auto size = fontSprite->Get().Bounds().Size();
     //Assert((int)size.x % cols == 0, "Font sprite not multiple of character width");
     //Assert((int)size.y % rows == 0, "Font sprite not multiple of character height");
 }

src/Resource/ResourceManager.cpp

@@ -7,7 +7,7 @@
 #include "Tools/Console.hpp"
 #include "Resource/ScriptResource.hpp"
 
-ConsoleVar<std::string> assetPath("asset-path", "assets", true);
+ConsoleVar<std::string> assetPath("asset-path", "../assets", true);
 
 void ResourceManager::LoadResourceFromFile(const char* filePath, const char* resourceName, const char* resourceType)
 {

src/Resource/ResourceManager.hpp

@@ -8,6 +8,8 @@
 #include <optional>
 
 struct Engine;
+class BinaryStreamWriter;
+class BinaryStreamReader;
 
 struct ResourceSettings
 {
@@ -23,6 +25,9 @@ struct BaseResource
 {
 public:
     virtual bool LoadFromFile(const ResourceSettings& settings) { return false; }
+    virtual bool WriteToBinary(const ResourceSettings& settings, BinaryStreamWriter& writer) { return false; }
+    virtual bool LoadFromBinary(BinaryStreamReader& reader) { return false; }
+
     virtual bool TryCleanup() { return false; }
 
     template<typename TResource>

src/Resource/SpriteResource.cpp

@@ -1,15 +1,18 @@
 #include <SDL_image.h>
 #include <memory>
+#include <System/BinaryStreamReader.hpp>
 
 #include "SpriteResource.hpp"
 #include "System/Logger.hpp"
 #include "Renderer/Texture.hpp"
 
 struct TextureManager
 {
-    void AddTexture(Texture* texture)
+    Texture* AddTexture(std::unique_ptr<Texture> texture)
     {
-        textures.emplace_back(texture);
+        auto ptr = texture.get();
+        textures.emplace_back(std::move(texture));
+        return ptr;
     }
 
     std::vector<std::unique_ptr<Texture>> textures;
@@ -32,11 +35,28 @@ bool SpriteResource::LoadFromFile(const ResourceSettings& settings)
         return false;
     }
 
-    auto texture = new Texture(surface);
-    g_textureManager.AddTexture(texture);
+    auto texture = g_textureManager.AddTexture(std::make_unique<Texture>(surface));
     SDL_FreeSurface(surface);
 
-    sprite = Sprite(texture, Rectangle(Vector2(0, 0), texture->Size()));
+    _resource.emplace(texture, Rectangle(Vector2(0, 0), texture->Size()));
 
     return true;
 }
+
+bool SpriteResource::WriteToBinary(const ResourceSettings& settings, BinaryStreamWriter& writer)
+{
+    return writer.TryWriteFile(settings.path);
+}
+
+bool SpriteResource::LoadFromBinary(BinaryStreamReader& reader)
+{
+    const unsigned char* data = reader.Data();
+    auto ops = SDL_RWFromMem(const_cast<void*>(reinterpret_cast<const void*>(data)), reader.TotalSize());
+    SDL_Surface* loadedSurface = IMG_LoadPNG_RW(ops);
+    auto texture = g_textureManager.AddTexture(std::make_unique<Texture>(loadedSurface));
+    SDL_FreeSurface(loadedSurface);
+
+    _resource.emplace(texture, Rectangle(Vector2(0, 0), texture->Size()));
+
+    return true;
+}

src/Resource/SpriteResource.hpp

@@ -1,11 +1,12 @@
 #pragma once
 
+#include <System/BinaryStreamWriter.hpp>
 #include "Renderer/Sprite.hpp"
 #include "ResourceManager.hpp"
 
-struct SpriteResource : BaseResource
+struct SpriteResource : ResourceTemplate<Sprite>
 {
-    bool LoadFromFile(const ResourceSettings& settings);
-
-    Sprite sprite;
+    bool LoadFromFile(const ResourceSettings& settings) override;
+    bool WriteToBinary(const ResourceSettings& settings, BinaryStreamWriter& writer) override;
+    bool LoadFromBinary(BinaryStreamReader& reader) override;
 };

src/Resource/TilemapResource.cpp

@@ -510,7 +510,7 @@ void DtoToSegment(MapSegment* segment, MapSegmentDto& segmentDto)
     {
         auto tileBounds = tilePropertiesDto.bounds.As<float>();
 
-        Sprite* tileSprite = &GetResource<SpriteResource>(tilePropertiesDto.spriteResource.c_str())->sprite;
+        Sprite* tileSprite = &GetResource<SpriteResource>(tilePropertiesDto.spriteResource.c_str())->Get();
         segment->tileProperties.push_back(new TileProperties(
             Sprite(tileSprite->GetTexture(), tileBounds, tilePropertiesDto.bounds.As<float>()),
             0,