feat(map): use defines to control layer blends in terrain fragment sh…

…ader
wowserhq · Feb 11, 2024 · 29e2d15 · 29e2d15
1 parent bffa6a6
commit 29e2d15
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/lib/map/terrain/TerrainMaterial.ts b/src/lib/map/terrain/TerrainMaterial.ts
@@ -11,9 +11,10 @@ class TerrainMaterial extends THREE.RawShaderMaterial {
   ) {
     super();
 
+    this.defines['LAYER_COUNT'] = layerCount;
+
     this.uniforms = {
       ...uniforms,
-      layerCount: { value: layerCount },
       layers: { value: layerTextures },
       splat: { value: splatTexture },
     };

diff --git a/src/lib/map/terrain/shader/fragment.ts b/src/lib/map/terrain/shader/fragment.ts
@@ -4,7 +4,6 @@ import { composeShader } from '../../../shader/util.js';
 const FRAGMENT_SHADER_PRECISIONS = ['highp float'];
 
 const FRAGMENT_SHADER_UNIFORMS = [
-  { name: 'layerCount', type: 'int' },
   { name: 'layers[4]', type: 'sampler2D' },
   { name: 'splat', type: 'sampler2D' },
   { name: 'sunDiffuseColor', type: 'vec3' },
@@ -36,21 +35,21 @@ color = texture(layers[0], vLayerCoord);
 blend = texture(splat, vSplatCoord);
 
 // 2nd layer
-if (layerCount > 1) {
+#if LAYER_COUNT > 1
   layer = texture(layers[1], vLayerCoord);
   color = blendLayer(color, layer, blend.rrrr);
-}
+#endif
 
-if (layerCount > 2) {
+#if LAYER_COUNT > 2
   layer = texture(layers[2], vLayerCoord);
   color = blendLayer(color, layer, blend.gggg);
-}
+#endif
 
 // 3rd layer
-if (layerCount > 3) {
+#if LAYER_COUNT > 3
   layer = texture(layers[3], vLayerCoord);
   color = blendLayer(color, layer, blend.bbbb);
-}
+#endif
 
 // Terrain is always opaque
 color.a = 1.0;