refactor: move LightingData into common

fix doodlum#171
FlayaN · Feb 7, 2024 · d910e7f · d910e7f
1 parent 28c69b0
commit d910e7f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 24 deletions.
diff --git a/features/Grass Lighting/Shaders/RunGrass.hlsl b/features/Grass Lighting/Shaders/RunGrass.hlsl
@@ -1,14 +1,7 @@
 #include "Common/Color.hlsl"
 #include "Common/FrameBuffer.hlsl"
 #include "Common/MotionBlur.hlsl"
-
-struct LightingData
-{
-	float WaterHeight[25];
-	bool Reflections;
-};
-
-StructuredBuffer<LightingData> lightingData : register(t126);
+#include "Common/LightingData.hlsl"
 
 #define GRASS
 

diff --git a/features/Tree LOD Lighting/Shaders/DistantTree.hlsl b/features/Tree LOD Lighting/Shaders/DistantTree.hlsl
@@ -1,14 +1,7 @@
 #include "Common/Color.hlsl"
 #include "Common/FrameBuffer.hlsl"
 #include "Common/MotionBlur.hlsl"
-
-struct LightingData
-{
-	float WaterHeight[25];
-	bool Reflections;
-};
-
-StructuredBuffer<LightingData> lightingData : register(t126);
+#include "Common/LightingData.hlsl"
 
 cbuffer PerFrame : register(b3)
 {

diff --git a/package/Shaders/Common/LightingData.hlsl b/package/Shaders/Common/LightingData.hlsl
@@ -0,0 +1,7 @@
+struct LightingData
+{
+	float WaterHeight[25];
+	bool Reflections;
+};
+
+StructuredBuffer<LightingData> lightingData : register(t126);
diff --git a/package/Shaders/Lighting.hlsl b/package/Shaders/Lighting.hlsl
@@ -2,17 +2,10 @@
 #include "Common/FrameBuffer.hlsl"
 #include "Common/MotionBlur.hlsl"
 #include "Common/Permutation.hlsl"
+#include "Common/LightingData.hlsl"
 
 #define PI 3.1415927
 
-struct LightingData
-{
-	float WaterHeight[25];
-	bool Reflections;
-};
-
-StructuredBuffer<LightingData> lightingData : register(t126);
-
 #if (defined(TREE_ANIM) || defined(LANDSCAPE)) && !defined(VC)
 #	define VC
 #endif  // TREE_ANIM || LANDSCAPE || !VC