From 790599b583e1b819b5023a35b13b707ec9de3439 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 20 Jul 2024 17:57:35 +0100 Subject: Apply StdTypeDefs for Texture --- game/scenary/foliage.h | 4 ++-- game/scenary/illuminator.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'game/scenary') 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 { Mesh::Ptr bodyMesh; - std::shared_ptr 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 { Mesh::Ptr bodyMesh; - std::shared_ptr texture; + Texture::Ptr texture; glVertexArray instanceVAO; std::optional instancesSpotLightVAO, instancesPointLightVAO; -- cgit v1.2.3