quake2ts 0.0.234 → 0.0.236

package/packages/client/dist/cjs/index.cjs

@@ -2393,11 +2393,13 @@ const int MAX_DLIGHTS = ${MAX_DLIGHTS};
 
 in vec2 v_texCoord;
 in vec2 v_lightmapCoord;
+in float v_lightmapStep;
 in vec3 v_position;
 
 uniform sampler2D u_diffuseMap;
 uniform sampler2D u_lightmapAtlas;
 uniform vec4 u_lightStyleFactors;
+uniform vec4 u_styleLayerMapping; // 0, 1, 2... or -1 if invalid
 uniform float u_alpha;
 uniform bool u_applyLightmap;
 uniform bool u_warp;
@@ -2431,9 +2433,35 @@ void main() {
       vec3 totalLight = vec3(1.0);
 
       if (u_applyLightmap) {
-        vec3 light = texture(u_lightmapAtlas, warpCoords(v_lightmapCoord)).rgb;
-        float styleScale = dot(u_lightStyleFactors, vec4(1.0));
-        totalLight = light * styleScale;
+        // Multi-style lightmap accumulation
+        vec3 light = vec3(0.0);
+        bool hasLight = false;
+
+        vec2 lmBase = warpCoords(v_lightmapCoord);
+
+        // Loop unrolled-ish
+        for (int i = 0; i < 4; i++) {
+             // We can access vec4 components by index in newer GLSL ES, or use direct access
+             float layer = u_styleLayerMapping[i];
+             float factor = u_lightStyleFactors[i];
+
+             if (layer >= -0.5) { // Valid layer (check >= 0 approx)
+                  // Offset V by layer * step
+                  // Since we packed vertically
+                  vec2 offset = vec2(0.0, layer * v_lightmapStep);
+                  light += texture(u_lightmapAtlas, lmBase + offset).rgb * factor;
+                  hasLight = true;
+             }
+        }
+
+        // If no valid lightmaps found (e.g. unlit surface?), default to full bright?
+        // Or if u_applyLightmap is true, there should be at least one style.
+        // Fallback to 1.0 if accumulator is empty?
+        // In Q2, unlit surfs are fullbright (or use minlight).
+        // If hasLight is false, it means no styles are active.
+        if (!hasLight) light = vec3(1.0);
+
+        totalLight = light; // Dynamic lights add on top or multiply? Q2 adds.
 
         // Add dynamic lights
         for (int i = 0; i < MAX_DLIGHTS; i++) {