fix forward clusters spotDir & spotBlend

MoritzBrueckner · Feb 14, 2024 · 95de89e · 95de89e
1 parent 98e8caf
commit 95de89e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Shaders/std/light.glsl b/Shaders/std/light.glsl
@@ -53,7 +53,7 @@
 			uniform sampler2DShadow shadowMapAtlasSpot;
 			#endif
 			#else
-			uniform sampler2DShadow shadowMapSpot[maxLightsCluster];
+			uniform sampler2DShadow shadowMapSpot[4];
 			#endif
 			uniform mat4 LWVPSpotArray[maxLightsCluster];
 		#endif

diff --git a/blender/arm/material/make_cluster.py b/blender/arm/material/make_cluster.py
@@ -78,8 +78,8 @@ def write(vert: shader.Shader, frag: shader.Shader):
     if '_Spot' in wrd.world_defs:
         frag.write('\t, lightsArray[li * 3 + 2].y != 0.0')
         frag.write('\t, lightsArray[li * 3 + 2].y') # spot size (cutoff)
-        frag.write('\t, lightsArraySpot[li].w') # spot blend (exponent)
-        frag.write('\t, lightsArraySpot[li].xyz') # spotDir
+        frag.write('\t, lightsArraySpot[li * 2].w') # spot blend (exponent)
+        frag.write('\t, lightsArraySpot[li * 2].xyz') # spotDir
         frag.write('\t, vec2(lightsArray[li * 3].w, lightsArray[li * 3 + 1].w)') # scale
         frag.write('\t, lightsArraySpot[li * 2 + 1].xyz') # right
     if '_VoxelShadow' in wrd.world_defs and '_VoxelAOvar' in wrd.world_defs: