diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-01 17:56:26 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-01 17:56:26 +0000 |
| commit | d5cdbbf38380239524e351cb69aec94090884ca5 (patch) | |
| tree | 5d7dff2f2775701069806eceb4eaef23b22eba3f /assetFactory/texturePacker.h | |
| parent | Reformat with new clang-format (diff) | |
| parent | Remove more use of legacy types (diff) | |
| download | ilt-d5cdbbf38380239524e351cb69aec94090884ca5.tar.bz2 ilt-d5cdbbf38380239524e351cb69aec94090884ca5.tar.xz ilt-d5cdbbf38380239524e351cb69aec94090884ca5.zip | |
Merge remote-tracking branch 'origin/terrain'
Diffstat (limited to 'assetFactory/texturePacker.h')
| -rw-r--r-- | assetFactory/texturePacker.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/assetFactory/texturePacker.h b/assetFactory/texturePacker.h index 93413eb..05e3204 100644 --- a/assetFactory/texturePacker.h +++ b/assetFactory/texturePacker.h @@ -1,13 +1,14 @@ #pragma once +#include "config/types.h" #include <glm/vec2.hpp> #include <span> #include <vector> class TexturePacker { public: - using Position = glm::uvec2; - using Size = glm::uvec2; + using Position = TextureAbsCoord; + using Size = TextureAbsCoord; struct Area { #ifndef __cpp_aggregate_paren_init @@ -40,5 +41,5 @@ public: private: std::span<const Image> inputImages; std::vector<size_t> sortedIndexes; - unsigned int maxTextureSize; + GLsizei maxTextureSize; }; |