diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:49:42 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-20 09:49:42 +1100 |
commit | aa987a217779e71f97ee4c9cce531aec1c861bf8 (patch) | |
tree | e51fcce110306d93bf93870f13a5ff7d6b575427 /source/application/StarTextureAtlas.hpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/application/StarTextureAtlas.hpp')
-rw-r--r-- | source/application/StarTextureAtlas.hpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/application/StarTextureAtlas.hpp b/source/application/StarTextureAtlas.hpp index db5a163..595f6ba 100644 --- a/source/application/StarTextureAtlas.hpp +++ b/source/application/StarTextureAtlas.hpp @@ -33,6 +33,8 @@ public: TextureAtlasSet(unsigned cellSize, unsigned atlasNumCells); + virtual ~TextureAtlasSet() = default; + // The constant square size of all atlas textures Vec2U atlasTextureSize() const; @@ -88,6 +90,8 @@ private: }; struct TextureEntry : Texture { + virtual ~TextureEntry() = default; + Vec2U imageSize() const override; AtlasTextureHandle const& atlasTexture() const override; @@ -168,7 +172,7 @@ auto TextureAtlasSet<AtlasTextureHandle>::addTexture(Image const& image, bool bo return nullptr; auto textureEntry = make_shared<TextureEntry>(); - textureEntry->textureImage = move(finalImage); + textureEntry->textureImage = std::move(finalImage); textureEntry->atlasPlacement = *placement; m_textures.add(textureEntry); |