Merge branch 'pointlights' of github.com:vlj/warzone2100 into pointli…

…ghts
Warzone2100 · Jan 13, 2024 · a72a019 · a72a019
2 parents 8cd2d90 + 4734cd4
commit a72a019
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/ivis_opengl/pielighting.h b/lib/ivis_opengl/pielighting.h
@@ -79,7 +79,7 @@ struct ILightingManager
 
 	virtual void ComputeFrameData(const LightingData& data, LightMap& lightmap, const glm::mat4& worldViewProjectionMatrix) = 0;
 
-	PointLightBuckets getPointLightBuckets() const
+	const PointLightBuckets& getPointLightBuckets() const
 	{
 		return currentPointLightBuckets;
 	}

diff --git a/src/terrain.h b/src/terrain.h
@@ -27,13 +27,14 @@
 #include "terrain_defs.h"
 
 struct ShadowCascadesInfo;
+struct LightMap;
 
 void loadTerrainTextures(MAP_TILESET mapTileset);
 
 bool initTerrain();
 void shutdownTerrain();
 
-void perFrameTerrainUpdates(const struct LightMap& lightData);
+void perFrameTerrainUpdates(const LightMap& lightData);
 void drawTerrainDepthOnly(const glm::mat4 &mvp);
 void drawTerrain(const glm::mat4 &mvp, const glm::mat4& viewMatrix, const Vector3f &cameraPos, const Vector3f &sunPos, const ShadowCascadesInfo& shadowMVPMatrix);
 void drawWater(const glm::mat4 &ModelViewProjection, const Vector3f &cameraPos, const Vector3f &sunPos);