diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-13 02:20:50 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-13 02:20:50 +0100 |
| commit | 1b97b7b4cb126c8b60ac1acbd7e72274f0ddf21f (patch) | |
| tree | 5271470d667c2d1b3372848d60bbcb04a011f2fe /assetFactory/assetFactory.h | |
| parent | Add missing forward declaration (diff) | |
| download | ilt-1b97b7b4cb126c8b60ac1acbd7e72274f0ddf21f.tar.bz2 ilt-1b97b7b4cb126c8b60ac1acbd7e72274f0ddf21f.tar.xz ilt-1b97b7b4cb126c8b60ac1acbd7e72274f0ddf21f.zip | |
Use texture atlas for asset factory
Diffstat (limited to 'assetFactory/assetFactory.h')
| -rw-r--r-- | assetFactory/assetFactory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/assetFactory/assetFactory.h b/assetFactory/assetFactory.h index 7843d44..9e5d205 100644 --- a/assetFactory/assetFactory.h +++ b/assetFactory/assetFactory.h @@ -23,7 +23,7 @@ public: AssetFactory(); [[nodiscard]] static std::shared_ptr<AssetFactory> loadXML(const std::filesystem::path &); [[nodiscard]] ColourAlpha parseColour(std::string_view) const; - [[nodiscard]] TextureFragmentCoords getTextureCoords(std::string_view) const; + [[nodiscard]] GLuint getMaterialIndex(std::string_view) const; [[nodiscard]] Asset::TexturePtr getTexture() const; Shapes shapes; @@ -42,5 +42,5 @@ private: void createTexutre() const; mutable Asset::TexturePtr texture; - mutable std::map<std::string_view, glm::vec4, std::less<>> textureFragmentPositions; + mutable std::map<std::string_view, GLuint, std::less<>> textureFragmentPositions; }; |