diff options
author | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-03-13 20:42:33 +0000 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-03-13 20:42:33 +0000 |
commit | b9771cbeb80e5b540587a01be145154612bbc83d (patch) | |
tree | 6dff7eb8ff1deaa4b11697d7b5a27fac8bff3432 /game/scenary | |
parent | Split core view definition out of Camera into Frustum (diff) | |
parent | Split Terrain::generateMeshes into smaller functions (diff) | |
download | ilt-b9771cbeb80e5b540587a01be145154612bbc83d.tar.bz2 ilt-b9771cbeb80e5b540587a01be145154612bbc83d.tar.xz ilt-b9771cbeb80e5b540587a01be145154612bbc83d.zip |
Merge branch 'culling'
Diffstat (limited to 'game/scenary')
-rw-r--r-- | game/scenary/foliage.cpp | 4 | ||||
-rw-r--r-- | game/scenary/foliage.h | 4 | ||||
-rw-r--r-- | game/scenary/illuminator.cpp | 2 | ||||
-rw-r--r-- | game/scenary/illuminator.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/game/scenary/foliage.cpp b/game/scenary/foliage.cpp index a0ec576..159a078 100644 --- a/game/scenary/foliage.cpp +++ b/game/scenary/foliage.cpp @@ -29,7 +29,7 @@ Foliage::updateStencil(const ShadowStenciller & ss) const } void -Foliage::render(const SceneShader & shader) const +Foliage::render(const SceneShader & shader, const Frustum &) const { if (const auto count = instances.size()) { shader.basicInst.use(); @@ -41,7 +41,7 @@ Foliage::render(const SceneShader & shader) const } void -Foliage::shadows(const ShadowMapper & mapper) const +Foliage::shadows(const ShadowMapper & mapper, const Frustum &) const { if (const auto count = instances.size()) { const auto dimensions = bodyMesh->getDimensions(); diff --git a/game/scenary/foliage.h b/game/scenary/foliage.h index 5da63f0..71bc734 100644 --- a/game/scenary/foliage.h +++ b/game/scenary/foliage.h @@ -24,8 +24,8 @@ public: }; mutable InstanceVertices<LocationVertex> instances; - void render(const SceneShader &) const override; - void shadows(const ShadowMapper &) const override; + void render(const SceneShader &, const Frustum &) const override; + void shadows(const ShadowMapper &, const Frustum &) const override; void updateStencil(const ShadowStenciller &) const override; glTexture shadowStencil = ShadowStenciller::createStencilTexture(256, 256); diff --git a/game/scenary/illuminator.cpp b/game/scenary/illuminator.cpp index e3810ec..f1a02b2 100644 --- a/game/scenary/illuminator.cpp +++ b/game/scenary/illuminator.cpp @@ -59,7 +59,7 @@ Illuminator::postLoad() } void -Illuminator::render(const SceneShader & shader) const +Illuminator::render(const SceneShader & shader, const Frustum &) const { if (const auto count = instances.size()) { shader.basicInst.use(); diff --git a/game/scenary/illuminator.h b/game/scenary/illuminator.h index 44bd583..47ce337 100644 --- a/game/scenary/illuminator.h +++ b/game/scenary/illuminator.h @@ -45,7 +45,7 @@ public: mutable InstanceVertices<LocationVertex> instances; mutable InstanceVertices<SpotLightVertex> instancesSpotLight; mutable InstanceVertices<PointLightVertex> instancesPointLight; - void render(const SceneShader &) const override; + void render(const SceneShader &, const Frustum &) const override; void lights(const SceneShader &) const override; protected: |