summaryrefslogtreecommitdiff
path: root/game/scenary/foliage.h
diff options
context:
space:
mode:
Diffstat (limited to 'game/scenary/foliage.h')
-rw-r--r--game/scenary/foliage.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/game/scenary/foliage.h b/game/scenary/foliage.h
index c599649..f424ffc 100644
--- a/game/scenary/foliage.h
+++ b/game/scenary/foliage.h
@@ -18,13 +18,13 @@ class Foliage : public Asset, public Renderable, public StdTypeDefs<Foliage> {
public:
[[nodiscard]] std::any createAt(const Location &) const override;
- struct LocationVertex {
- glm::mat3 rotation;
- float yaw;
- GlobalPosition3D position;
+ struct InstanceVertex {
+ CommonLocationInstance location;
+ // float scale;
+ // something colorBias;
};
- mutable InstanceVertices<LocationVertex> instances;
+ mutable InstanceVertices<InstanceVertex> instances;
void preFrame(const Frustum &, const Frustum &) override;
void render(const SceneShader &, const Frustum &) const override;
void shadows(const ShadowMapper &, const Frustum &) const override;
@@ -43,5 +43,5 @@ protected:
glTextures<GL_TEXTURE_2D_ARRAY, 3> billboard;
private:
- InstanceVertices<Foliage::LocationVertex>::PartitionResult instancePartitions;
+ InstanceVertices<InstanceVertex>::PartitionResult instancePartitions;
};