diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-13 23:06:39 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-13 23:06:39 +0100 |
| commit | 1c8e84d9503237e7a308107a0a44fbc7f188c700 (patch) | |
| tree | 60e80d7f4e91621bc62cb5fb2f6c61aae631b4d9 /assetFactory/asset.h | |
| parent | Load assimp textures in parallel (diff) | |
| parent | Fix typo in name SceneCPtr (diff) | |
| download | ilt-1c8e84d9503237e7a308107a0a44fbc7f188c700.tar.bz2 ilt-1c8e84d9503237e7a308107a0a44fbc7f188c700.tar.xz ilt-1c8e84d9503237e7a308107a0a44fbc7f188c700.zip | |
Merge branch 'materials' into assimp
Diffstat (limited to 'assetFactory/asset.h')
| -rw-r--r-- | assetFactory/asset.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/assetFactory/asset.h b/assetFactory/asset.h index 30f40cd..dba4974 100644 --- a/assetFactory/asset.h +++ b/assetFactory/asset.h @@ -4,11 +4,11 @@ #include "persistence.h" #include <stdTypeDefs.hpp> -class Texture; +class TextureAtlas; class Asset : public Persistence::Persistable, public StdTypeDefs<Asset> { public: - using TexturePtr = std::shared_ptr<Texture>; + using TexturePtr = std::shared_ptr<TextureAtlas>; std::string id; std::string name; |