diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-14 14:49:52 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-14 14:49:52 +0100 |
| commit | 70bddc3f8ef3eeb020b4d6114f3abf4ab160003f (patch) | |
| tree | f8e83df70e00c9f7f3588638c756ac66a8ab0199 /assetFactory/textureFragment.h | |
| parent | Externalise a neater definition of TGAHead (diff) | |
| parent | Load texture images in Worker (diff) | |
| download | ilt-70bddc3f8ef3eeb020b4d6114f3abf4ab160003f.tar.bz2 ilt-70bddc3f8ef3eeb020b4d6114f3abf4ab160003f.tar.xz ilt-70bddc3f8ef3eeb020b4d6114f3abf4ab160003f.zip | |
Merge branch 'worker' into assimp
Diffstat (limited to 'assetFactory/textureFragment.h')
| -rw-r--r-- | assetFactory/textureFragment.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/assetFactory/textureFragment.h b/assetFactory/textureFragment.h index d03affd..75fe96e 100644 --- a/assetFactory/textureFragment.h +++ b/assetFactory/textureFragment.h @@ -3,12 +3,13 @@ #include "gfx/image.h" #include "persistence.h" #include "stdTypeDefs.hpp" +#include "worker.h" class TextureFragment : public Persistence::Persistable, public StdTypeDefs<TextureFragment> { public: std::string id; std::string path; - std::unique_ptr<Image> image; + Worker::WorkPtrT<std::unique_ptr<Image>> image; private: friend Persistence::SelectionPtrBase<Ptr>; |