diff options
author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-10 18:45:13 +0100 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-10 18:45:13 +0100 |
commit | b25bc3cc32c5a9057c66ad282fa1cdfe0ed6094a (patch) | |
tree | 469ffd495b9114ff7f7a7ccca75e4a1977c1f662 /assetFactory/assetFactory.h | |
parent | Support loading textures from an in memory buffer (diff) | |
download | ilt-b25bc3cc32c5a9057c66ad282fa1cdfe0ed6094a.tar.bz2 ilt-b25bc3cc32c5a9057c66ad282fa1cdfe0ed6094a.tar.xz ilt-b25bc3cc32c5a9057c66ad282fa1cdfe0ed6094a.zip |
First cut loading assets using assimp
This is far from perfect, specifically the created texture atlas is not compatibile with wrapping texture UVs
Diffstat (limited to 'assetFactory/assetFactory.h')
-rw-r--r-- | assetFactory/assetFactory.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/assetFactory/assetFactory.h b/assetFactory/assetFactory.h index 52692c4..7843d44 100644 --- a/assetFactory/assetFactory.h +++ b/assetFactory/assetFactory.h @@ -1,6 +1,7 @@ #pragma once #include "asset.h" +#include "assimp.h" #include "persistence.h" #include "shape.h" #include "textureFragment.h" @@ -12,6 +13,7 @@ class AssetFactory : public Persistence::Persistable { public: using Shapes = std::map<std::string, Shape::Ptr, std::less<>>; using Assets = std::map<std::string, Asset::Ptr, std::less<>>; + using AssImps = std::map<std::string, AssImp::Ptr, std::less<>>; using TextureFragments = std::map<std::string, TextureFragment::Ptr, std::less<>>; using Colour = glm::vec3; using ColourAlpha = glm::vec4; @@ -26,6 +28,7 @@ public: Shapes shapes; Assets assets; + AssImps assimps; Colours colours; TextureFragments textureFragments; |