diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-07-20 17:57:35 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-08-10 18:06:01 +0100 |
| commit | 790599b583e1b819b5023a35b13b707ec9de3439 (patch) | |
| tree | 71fd0359798a2792586695cdd8042829c4b820f6 /game/scenary | |
| parent | Add missing truthy/falsy operators to AnyPtr (diff) | |
| download | ilt-790599b583e1b819b5023a35b13b707ec9de3439.tar.bz2 ilt-790599b583e1b819b5023a35b13b707ec9de3439.tar.xz ilt-790599b583e1b819b5023a35b13b707ec9de3439.zip | |
Apply StdTypeDefs for Texture
Diffstat (limited to 'game/scenary')
| -rw-r--r-- | game/scenary/foliage.h | 4 | ||||
| -rw-r--r-- | game/scenary/illuminator.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/game/scenary/foliage.h b/game/scenary/foliage.h index 3beda89..0a4261c 100644 --- a/game/scenary/foliage.h +++ b/game/scenary/foliage.h @@ -2,16 +2,16 @@ #include "assetFactory/asset.h" #include "gfx/gl/instanceVertices.h" +#include "gfx/models/texture.h" #include "gfx/renderable.h" class SceneShader; class ShadowMapper; class Location; -class Texture; class Foliage : public Asset, public Renderable, public StdTypeDefs<Foliage> { Mesh::Ptr bodyMesh; - std::shared_ptr<Texture> texture; + Texture::Ptr texture; glVertexArray instanceVAO; public: diff --git a/game/scenary/illuminator.h b/game/scenary/illuminator.h index cd6073c..44bd583 100644 --- a/game/scenary/illuminator.h +++ b/game/scenary/illuminator.h @@ -2,15 +2,15 @@ #include "assetFactory/asset.h" #include "gfx/gl/instanceVertices.h" +#include "gfx/models/texture.h" #include "gfx/renderable.h" class SceneShader; class Location; -class Texture; class Illuminator : public Asset, public Renderable, public StdTypeDefs<Illuminator> { Mesh::Ptr bodyMesh; - std::shared_ptr<Texture> texture; + Texture::Ptr texture; glVertexArray instanceVAO; std::optional<glVertexArray> instancesSpotLightVAO, instancesPointLightVAO; |