leaflet-city-mapper 0.1.0 → 0.1.1

package/src/shaders/materialBaseShader.js

@@ -1,26 +1,26 @@
-/**
- * Generate fragment code for base color, alpha and optional roof texture.
- *
- * @param {Object} material Material settings.
- * @param {boolean} hasBase Whether a base texture is bound.
- * @param {boolean} hasRoof Whether a roof texture is bound.
- *
- * @returns {string} WGSL fragment code.
- */
-export function materialBaseShader(material, hasBase, hasRoof) {
-  return /* wgsl */ `
-      var normal = normalize(input.normal) * select(-1.0, 1.0, frontFacing);
-      let texel = ${hasBase ? 'textureSample(baseTexture, baseTextureSampler, input.uv)' : 'vec4<f32>(1.0)'};
-      let alpha = u.material.z * texel.a;
-      ${material.alphaMode === 'MASK' ? 'if (alpha < u.material.w) { discard; }' : ''}
-      ${material.alphaMode === 'BLEND' ? 'if (alpha < 0.01) { discard; }' : ''}
-      var base = ${material.vertexColors ? 'toLinear(min(input.color, vec3<f32>(1.0)))' : 'input.color'} *
-        ${material.baseTexture?.srgb ? 'texel.rgb' : 'toLinear(texel.rgb)'};
-      ${hasRoof ? /* wgsl */ `
-        if (input.roof > 0.0 && all(input.roofUv >= vec2<f32>(0.0)) &&
-          all(input.roofUv <= vec2<f32>(1.0))) {
-          let roof = textureSampleLevel(roofTexture, roofTextureSampler, input.roofUv, 0.0);
-          base = mix(base, toLinear(roof.rgb), roof.a * input.roof);
-        }
-      ` : ''}`;
-}
+/**
+ * Generate fragment code for base color, alpha and optional roof texture.
+ *
+ * @param {Object} material Material settings.
+ * @param {boolean} hasBase Whether a base texture is bound.
+ * @param {boolean} hasRoof Whether a roof texture is bound.
+ *
+ * @returns {string} WGSL fragment code.
+ */
+export function materialBaseShader(material, hasBase, hasRoof) {
+  return /* wgsl */ `
+      var normal = normalize(input.normal) * select(-1.0, 1.0, frontFacing);
+      let texel = ${hasBase ? 'textureSample(baseTexture, baseTextureSampler, input.uv)' : 'vec4<f32>(1.0)'};
+      let alpha = u.material.z * texel.a;
+      ${material.alphaMode === 'MASK' ? 'if (alpha < u.material.w) { discard; }' : ''}
+      ${material.alphaMode === 'BLEND' ? 'if (alpha < 0.01) { discard; }' : ''}
+      var base = ${material.vertexColors ? 'toLinear(min(input.color, vec3<f32>(1.0)))' : 'input.color'} *
+        ${material.baseTexture?.srgb ? 'texel.rgb' : 'toLinear(texel.rgb)'};
+      ${hasRoof ? /* wgsl */ `
+        if (input.roof > 0.0 && all(input.roofUv >= vec2<f32>(0.0)) &&
+          all(input.roofUv <= vec2<f32>(1.0))) {
+          let roof = textureSampleLevel(roofTexture, roofTextureSampler, input.roofUv, 0.0);
+          base = mix(base, toLinear(roof.rgb), roof.a * input.roof);
+        }
+      ` : ''}`;
+}

package/src/shaders/materialSurfaceShader.js

@@ -1,60 +1,60 @@
-import { materialBaseShader } from './materialBaseShader.js';
-
-/**
- * Generate lit or unlit material fragment code for the available textures.
- *
- * @param {Object} material Material settings.
- * @param {boolean} sparkle Whether to include sparkle shading.
- * @param {boolean} hasBase Whether a base texture is bound.
- * @param {boolean} hasMetal Whether a metallic-roughness texture is bound.
- * @param {boolean} hasEmissive Whether an emissive texture is bound.
- * @param {boolean} hasOcclusion Whether an occlusion texture is bound.
- * @param {boolean} hasRoof Whether a roof texture is bound.
- *
- * @returns {string} WGSL fragment code.
- */
-export function materialSurfaceShader(material, sparkle, hasBase, hasMetal, hasEmissive, hasOcclusion, hasRoof) {
-  return material.unlit ? /* wgsl */ `
-        let rasterTexel = ${hasBase ? 'textureSample(baseTexture, baseTextureSampler, input.uv)' : 'vec4<f32>(input.color, 1.0)'};
-        return vec4<f32>(toSRGB(toLinear(rasterTexel.rgb) * (frame.atmosphereTint.rgb * (0.55 + 0.45 * sunlight) + artificial)), ${material.alphaMode === 'BLEND' ? 'u.material.z * rasterTexel.a' : '1.0'});
-      ` : /* wgsl */ `${materialBaseShader(material, hasBase, hasRoof)}
-      let mr = ${hasMetal ? 'textureSample(metalTexture, metalTextureSampler, input.uv)' : 'vec4<f32>(1.0)'};
-      let metal = clamp(u.material.x * mr.b, 0.0, 1.0);
-      let rough = clamp(u.material.y * mr.g, 0.08, 1.0);
-      let view = normalize(-input.viewPosition);
-      let halfVector = normalize(view + frame.lightDirection.xyz);
-      let nl = max(dot(normal, frame.lightDirection.xyz), 0.0) * frame.lightDirection.w * sunlight;
-      let nv = max(dot(normal, view), 0.001);
-      let nh = max(dot(normal, halfVector), 0.0);
-      let vh = max(dot(view, halfVector), 0.0);
-      let a2 = pow(rough, 4.0);
-      let d = a2 / max(PI * pow(nh * nh * (a2 - 1.0) + 1.0, 2.0), 0.0001);
-      let gv = nl * sqrt(nv * nv * (1.0 - a2) + a2);
-      let gl = nv * sqrt(nl * nl * (1.0 - a2) + a2);
-      let visibility = 0.5 / max(gv + gl, 0.0001);
-      let f0 = mix(vec3<f32>(0.04), base, metal);
-      let fresnel = f0 + (1.0 - f0) * pow(1.0 - vh, 5.0);
-      let specular = d * visibility * fresnel;
-      let diffuse = (1.0 - metal) * base / PI;
-      let sky = dot(normal, frame.skyDirection.xyz) * 0.5 + 0.5;
-      let ambient = mix(toLinear(vec3<f32>(0.455, 0.412, 0.322)), vec3<f32>(1.0), sky) * (2.0 / PI);
-      let ao = ${hasOcclusion ? 'mix(1.0, textureSample(occlusionTexture, occlusionTextureSampler, input.uv).r, u.emissive.w)' : '1.0'};
-      ${sparkle ? /* wgsl */ `
-        let lattice = (fract(input.localPosition / 2.5) - 0.5) * 2.5;
-        let pointGlow = (1.0 - smoothstep(0.16, 0.42, length(lattice))) * u.highlight.z;
-      ` : ''}
-      // Vertex colour components above 1 are self-lit (e.g. vehicle lamps): dim by day, bright at night.
-      let glow = ${sparkle ? 'vec3<f32>(3.0, 2.6, 1.8) * pointGlow +' : ''}${material.vertexColors
-      ? ' max(input.color - vec3<f32>(1.0), vec3<f32>(0.0)) * (0.3 + 5.0 * frame.skyDirection.w) +' : ''} u.emissive.rgb * ${hasEmissive
-      ? material.emissiveTexture.srgb
-        ? 'textureSample(emissiveTexture, emissiveTextureSampler, input.uv).rgb'
-        : 'toLinear(textureSample(emissiveTexture, emissiveTextureSampler, input.uv).rgb)'
-      : 'vec3<f32>(1.0)'};
-      var color = ambient * base * (1.0 - metal) * ao +
-        (diffuse + specular) * nl * toLinear(vec3<f32>(1.0, 0.937, 0.835)) * 3.0 + glow;
-      ${material.vertexColors ? 'color = base * (ambient + toLinear(vec3<f32>(1.0, 0.937, 0.835)) * (3.0 / PI) * nl) + glow;' : ''}
-      color = (color - glow) * frame.atmosphereTint.rgb + base * artificial * (1.0 - metal * 0.5) + glow;
-      appearance(input.position.xy);
-      return vec4<f32>(toSRGB(color), ${material.alphaMode === 'BLEND' ? 'alpha' : '1.0'});
-      `;
-}
+import { materialBaseShader } from './materialBaseShader.js';
+
+/**
+ * Generate lit or unlit material fragment code for the available textures.
+ *
+ * @param {Object} material Material settings.
+ * @param {boolean} sparkle Whether to include sparkle shading.
+ * @param {boolean} hasBase Whether a base texture is bound.
+ * @param {boolean} hasMetal Whether a metallic-roughness texture is bound.
+ * @param {boolean} hasEmissive Whether an emissive texture is bound.
+ * @param {boolean} hasOcclusion Whether an occlusion texture is bound.
+ * @param {boolean} hasRoof Whether a roof texture is bound.
+ *
+ * @returns {string} WGSL fragment code.
+ */
+export function materialSurfaceShader(material, sparkle, hasBase, hasMetal, hasEmissive, hasOcclusion, hasRoof) {
+  return material.unlit ? /* wgsl */ `
+        let rasterTexel = ${hasBase ? 'textureSample(baseTexture, baseTextureSampler, input.uv)' : 'vec4<f32>(input.color, 1.0)'};
+        return vec4<f32>(toSRGB(toLinear(rasterTexel.rgb) * (frame.atmosphereTint.rgb * (0.55 + 0.45 * sunlight) + artificial)), ${material.alphaMode === 'BLEND' ? 'u.material.z * rasterTexel.a' : '1.0'});
+      ` : /* wgsl */ `${materialBaseShader(material, hasBase, hasRoof)}
+      let mr = ${hasMetal ? 'textureSample(metalTexture, metalTextureSampler, input.uv)' : 'vec4<f32>(1.0)'};
+      let metal = clamp(u.material.x * mr.b, 0.0, 1.0);
+      let rough = clamp(u.material.y * mr.g, 0.08, 1.0);
+      let view = normalize(-input.viewPosition);
+      let halfVector = normalize(view + frame.lightDirection.xyz);
+      let nl = max(dot(normal, frame.lightDirection.xyz), 0.0) * frame.lightDirection.w * sunlight;
+      let nv = max(dot(normal, view), 0.001);
+      let nh = max(dot(normal, halfVector), 0.0);
+      let vh = max(dot(view, halfVector), 0.0);
+      let a2 = pow(rough, 4.0);
+      let d = a2 / max(PI * pow(nh * nh * (a2 - 1.0) + 1.0, 2.0), 0.0001);
+      let gv = nl * sqrt(nv * nv * (1.0 - a2) + a2);
+      let gl = nv * sqrt(nl * nl * (1.0 - a2) + a2);
+      let visibility = 0.5 / max(gv + gl, 0.0001);
+      let f0 = mix(vec3<f32>(0.04), base, metal);
+      let fresnel = f0 + (1.0 - f0) * pow(1.0 - vh, 5.0);
+      let specular = d * visibility * fresnel;
+      let diffuse = (1.0 - metal) * base / PI;
+      let sky = dot(normal, frame.skyDirection.xyz) * 0.5 + 0.5;
+      let ambient = mix(toLinear(vec3<f32>(0.455, 0.412, 0.322)), vec3<f32>(1.0), sky) * (2.0 / PI);
+      let ao = ${hasOcclusion ? 'mix(1.0, textureSample(occlusionTexture, occlusionTextureSampler, input.uv).r, u.emissive.w)' : '1.0'};
+      ${sparkle ? /* wgsl */ `
+        let lattice = (fract(input.localPosition / 2.5) - 0.5) * 2.5;
+        let pointGlow = (1.0 - smoothstep(0.16, 0.42, length(lattice))) * u.highlight.z;
+      ` : ''}
+      // Vertex colour components above 1 are self-lit (e.g. vehicle lamps): dim by day, bright at night.
+      let glow = ${sparkle ? 'vec3<f32>(3.0, 2.6, 1.8) * pointGlow +' : ''}${material.vertexColors
+      ? ' max(input.color - vec3<f32>(1.0), vec3<f32>(0.0)) * (0.3 + 5.0 * frame.skyDirection.w) +' : ''} u.emissive.rgb * ${hasEmissive
+      ? material.emissiveTexture.srgb
+        ? 'textureSample(emissiveTexture, emissiveTextureSampler, input.uv).rgb'
+        : 'toLinear(textureSample(emissiveTexture, emissiveTextureSampler, input.uv).rgb)'
+      : 'vec3<f32>(1.0)'};
+      var color = ambient * base * (1.0 - metal) * ao +
+        (diffuse + specular) * nl * toLinear(vec3<f32>(1.0, 0.937, 0.835)) * 3.0 + glow;
+      ${material.vertexColors ? 'color = base * (ambient + toLinear(vec3<f32>(1.0, 0.937, 0.835)) * (3.0 / PI) * nl) + glow;' : ''}
+      color = (color - glow) * frame.atmosphereTint.rgb + base * artificial * (1.0 - metal * 0.5) + glow;
+      appearance(input.position.xy);
+      return vec4<f32>(toSRGB(color), ${material.alphaMode === 'BLEND' ? 'alpha' : '1.0'});
+      `;
+}

package/src/shaders/materialVertexShader.js

@@ -1,89 +1,89 @@
-import { roofVertexShader } from './roofVertexShader.js';
-import { nativeStrokeShader } from './nativeStrokeShader.js';
-
-/**
- * Generate a vertex shader for the material and its enabled rendering features.
- *
- * @param {Object} material Material settings.
- * @param {boolean} sparkle Whether to output local sparkle coordinates.
- * @param {string} elevationWGSL Terrain elevation WGSL functions.
- * @param {boolean} hasTerrain Whether terrain elevation is enabled.
- * @param {boolean} textured Whether texture coordinates are needed.
- * @param {boolean} hasRoof Whether roof texture coordinates are needed.
- *
- * @returns {string} WGSL vertex shader.
- */
-export function materialVertexShader(material, sparkle, elevationWGSL, hasTerrain, textured, hasRoof) {
-  const instanceOffset = material.instanced ? ' + input.instanceOffset.xyz' : '';
-  const stroke = nativeStrokeShader(material);
-  return /* wgsl */ `
-    struct Mesh {
-      worldMatrix: mat4x4<f32>,
-      baseColor: vec4<f32>,
-      material: vec4<f32>,
-      emissive: vec4<f32>,
-      terrain: vec4<f32>,
-      highlight: vec4<f32>,
-      cutout: vec4<f32>,
-      nativeStroke: vec4<f32>,
-    };
-    struct Frame {
-      viewMatrix: mat4x4<f32>,
-      projectionMatrix: mat4x4<f32>,
-      roofMatrix: mat4x4<f32>,
-      lightDirection: vec4<f32>,
-      skyDirection: vec4<f32>,
-      atmosphereTint: vec4<f32>,
-    };
-    struct Solar {
-      matrix: mat4x4<f32>,
-      params: vec4<f32>
-    };
-    struct VertexInput {
-      @location(0) position: vec3<f32>,
-      @location(1) normal: vec3<f32>,
-      ${material.instanced ? '@location(4) instanceOffset: vec4<f32>,' : ''}
-      ${material.vertexColors ? '@location(2) color: vec3<f32>,' : ''}
-      ${textured ? '@location(3) uv: vec2<f32>,' : ''}
-    };
-    struct VertexOutput {
-      @builtin(position) position: vec4<f32>,
-      @location(0) color: vec3<f32>,
-      @location(1) normal: vec3<f32>,
-      @location(2) viewPosition: vec3<f32>,
-      @location(6) shadowPosition: vec4<f32>,
-      @location(7) worldPosition: vec3<f32>,
-      ${sparkle ? '@location(8) localPosition: vec3<f32>,' : ''}
-      ${textured ? '@location(3) uv: vec2<f32>,' : ''}
-      ${hasRoof ? '@location(4) roofUv: vec2<f32>, @location(5) roof: f32,' : ''}
-    };
-    @group(0) @binding(0) var<uniform> u: Mesh;
-    @group(0) @binding(1) var<uniform> frame: Frame;
-    @group(1) @binding(0) var<uniform> solar: Solar;
-    ${hasTerrain ? /* wgsl */ `@group(0) @binding(2) var dem: texture_2d<f32>;${elevationWGSL}` : ''}
-    @vertex fn vertexMain(input: VertexInput, @builtin(vertex_index) vertexIndex: u32) -> VertexOutput {
-      var output: VertexOutput;
-      var position = input.position${instanceOffset};
-      ${stroke.position}
-      ${hasTerrain ? 'position.y = elevation(u.terrain.xy + input.uv * u.terrain.z, u.terrain.w) - u.terrain.w;' : ''}
-      let featureVertex = f32(vertexIndex)${material.instanced ? ' + input.instanceOffset.w' : ''};
-      let highlighted = featureVertex >= u.highlight.x && featureVertex < u.highlight.y;
-      output.color = ${material.vertexColors ? 'select(input.color, vec3<f32>(72.0 / 255.0, 217.0 / 255.0, 1.0), highlighted)' : 'u.baseColor.rgb'};
-      // Inverse-transpose from cofactors; the camera view matrix is orthonormal.
-      let m = mat3x3<f32>(u.worldMatrix[0].xyz, u.worldMatrix[1].xyz, u.worldMatrix[2].xyz);
-      ${stroke.normal}
-      let normal = (cross(m[1], m[2]) * sourceNormal.x + cross(m[2], m[0]) * sourceNormal.y + cross(m[0], m[1]) * sourceNormal.z) / determinant(m);
-      output.normal = (frame.viewMatrix * vec4<f32>(normal, 0.0)).xyz;
-      let world = u.worldMatrix * vec4<f32>(position, 1.0);
-      output.shadowPosition = solar.matrix * world;
-      output.worldPosition = world.xyz / world.w;
-      ${sparkle ? `output.localPosition = input.position${instanceOffset};` : ''}
-      let viewPosition = frame.viewMatrix * world;
-      output.viewPosition = viewPosition.xyz;
-      ${textured ? 'output.uv = input.uv;' : ''}
-      ${hasRoof ? roofVertexShader(material) : ''}
-      output.position = frame.projectionMatrix * viewPosition;
-      return output;
-    }
-  `;
-}
+import { roofVertexShader } from './roofVertexShader.js';
+import { nativeStrokeShader } from './nativeStrokeShader.js';
+
+/**
+ * Generate a vertex shader for the material and its enabled rendering features.
+ *
+ * @param {Object} material Material settings.
+ * @param {boolean} sparkle Whether to output local sparkle coordinates.
+ * @param {string} elevationWGSL Terrain elevation WGSL functions.
+ * @param {boolean} hasTerrain Whether terrain elevation is enabled.
+ * @param {boolean} textured Whether texture coordinates are needed.
+ * @param {boolean} hasRoof Whether roof texture coordinates are needed.
+ *
+ * @returns {string} WGSL vertex shader.
+ */
+export function materialVertexShader(material, sparkle, elevationWGSL, hasTerrain, textured, hasRoof) {
+  const instanceOffset = material.instanced ? ' + input.instanceOffset.xyz' : '';
+  const stroke = nativeStrokeShader(material);
+  return /* wgsl */ `
+    struct Mesh {
+      worldMatrix: mat4x4<f32>,
+      baseColor: vec4<f32>,
+      material: vec4<f32>,
+      emissive: vec4<f32>,
+      terrain: vec4<f32>,
+      highlight: vec4<f32>,
+      cutout: vec4<f32>,
+      nativeStroke: vec4<f32>,
+    };
+    struct Frame {
+      viewMatrix: mat4x4<f32>,
+      projectionMatrix: mat4x4<f32>,
+      roofMatrix: mat4x4<f32>,
+      lightDirection: vec4<f32>,
+      skyDirection: vec4<f32>,
+      atmosphereTint: vec4<f32>,
+    };
+    struct Solar {
+      matrix: mat4x4<f32>,
+      params: vec4<f32>
+    };
+    struct VertexInput {
+      @location(0) position: vec3<f32>,
+      @location(1) normal: vec3<f32>,
+      ${material.instanced ? '@location(4) instanceOffset: vec4<f32>,' : ''}
+      ${material.vertexColors ? '@location(2) color: vec3<f32>,' : ''}
+      ${textured ? '@location(3) uv: vec2<f32>,' : ''}
+    };
+    struct VertexOutput {
+      @builtin(position) position: vec4<f32>,
+      @location(0) color: vec3<f32>,
+      @location(1) normal: vec3<f32>,
+      @location(2) viewPosition: vec3<f32>,
+      @location(6) shadowPosition: vec4<f32>,
+      @location(7) worldPosition: vec3<f32>,
+      ${sparkle ? '@location(8) localPosition: vec3<f32>,' : ''}
+      ${textured ? '@location(3) uv: vec2<f32>,' : ''}
+      ${hasRoof ? '@location(4) roofUv: vec2<f32>, @location(5) roof: f32,' : ''}
+    };
+    @group(0) @binding(0) var<uniform> u: Mesh;
+    @group(0) @binding(1) var<uniform> frame: Frame;
+    @group(1) @binding(0) var<uniform> solar: Solar;
+    ${hasTerrain ? /* wgsl */ `@group(0) @binding(2) var dem: texture_2d<f32>;${elevationWGSL}` : ''}
+    @vertex fn vertexMain(input: VertexInput, @builtin(vertex_index) vertexIndex: u32) -> VertexOutput {
+      var output: VertexOutput;
+      var position = input.position${instanceOffset};
+      ${stroke.position}
+      ${hasTerrain ? 'position.y = elevation(u.terrain.xy + input.uv * u.terrain.z, u.terrain.w) - u.terrain.w;' : ''}
+      let featureVertex = f32(vertexIndex)${material.instanced ? ' + input.instanceOffset.w' : ''};
+      let highlighted = featureVertex >= u.highlight.x && featureVertex < u.highlight.y;
+      output.color = ${material.vertexColors ? 'select(input.color, vec3<f32>(72.0 / 255.0, 217.0 / 255.0, 1.0), highlighted)' : 'u.baseColor.rgb'};
+      // Inverse-transpose from cofactors; the camera view matrix is orthonormal.
+      let m = mat3x3<f32>(u.worldMatrix[0].xyz, u.worldMatrix[1].xyz, u.worldMatrix[2].xyz);
+      ${stroke.normal}
+      let normal = (cross(m[1], m[2]) * sourceNormal.x + cross(m[2], m[0]) * sourceNormal.y + cross(m[0], m[1]) * sourceNormal.z) / determinant(m);
+      output.normal = (frame.viewMatrix * vec4<f32>(normal, 0.0)).xyz;
+      let world = u.worldMatrix * vec4<f32>(position, 1.0);
+      output.shadowPosition = solar.matrix * world;
+      output.worldPosition = world.xyz / world.w;
+      ${sparkle ? `output.localPosition = input.position${instanceOffset};` : ''}
+      let viewPosition = frame.viewMatrix * world;
+      output.viewPosition = viewPosition.xyz;
+      ${textured ? 'output.uv = input.uv;' : ''}
+      ${hasRoof ? roofVertexShader(material) : ''}
+      output.position = frame.projectionMatrix * viewPosition;
+      return output;
+    }
+  `;
+}

package/src/shaders/nativeStrokeShader.js

@@ -1,13 +1,13 @@
-/**
- * Generate optional native-stroke position and normal vertex snippets.
- *
- * @param {Object} material Material settings.
- *
- * @returns {Object} WGSL position and normal snippets.
- */
-export function nativeStrokeShader(material) {
-  return /* alloc */ {
-    position: material.nativeStroke ? 'position = input.normal + (input.position - input.normal) * u.nativeStroke.x;' : '',
-    normal: material.nativeStroke ? 'let sourceNormal = vec3<f32>(0.0, 1.0, 0.0);' : 'let sourceNormal = input.normal;',
-  };
-}
+/**
+ * Generate optional native-stroke position and normal vertex snippets.
+ *
+ * @param {Object} material Material settings.
+ *
+ * @returns {Object} WGSL position and normal snippets.
+ */
+export function nativeStrokeShader(material) {
+  return /* alloc */ {
+    position: material.nativeStroke ? 'position = input.normal + (input.position - input.normal) * u.nativeStroke.x;' : '',
+    normal: material.nativeStroke ? 'let sourceNormal = vec3<f32>(0.0, 1.0, 0.0);' : 'let sourceNormal = input.normal;',
+  };
+}

package/src/shaders/roofVertexShader.js

@@ -1,16 +1,16 @@
-/**
- * Generate vertex code for roof and wall texture coordinates and opacity.
- *
- * @param {Object} material Roof and wall texture settings.
- *
- * @returns {string} WGSL vertex code.
- */
-export function roofVertexShader(material) {
-  const roofOpacity = Number(material.roofTexture ?? 0);
-  const wallOpacity = Number(material.wallTexture ?? 0);
-  return /* wgsl */ `
-        output.roofUv = (frame.roofMatrix * world).xz;
-        output.roof = select(0.0, select(${wallOpacity.toFixed(8)}, ${roofOpacity.toFixed(8)}, input.normal.y >= 0.5), ((${Boolean(material.roofTexture)} && input.normal.y >= 0.5) ||
-          (${Boolean(material.wallTexture)} && abs(input.normal.y) < 0.5)) && !highlighted);
-      `;
-}
+/**
+ * Generate vertex code for roof and wall texture coordinates and opacity.
+ *
+ * @param {Object} material Roof and wall texture settings.
+ *
+ * @returns {string} WGSL vertex code.
+ */
+export function roofVertexShader(material) {
+  const roofOpacity = Number(material.roofTexture ?? 0);
+  const wallOpacity = Number(material.wallTexture ?? 0);
+  return /* wgsl */ `
+        output.roofUv = (frame.roofMatrix * world).xz;
+        output.roof = select(0.0, select(${wallOpacity.toFixed(8)}, ${roofOpacity.toFixed(8)}, input.normal.y >= 0.5), ((${Boolean(material.roofTexture)} && input.normal.y >= 0.5) ||
+          (${Boolean(material.wallTexture)} && abs(input.normal.y) < 0.5)) && !highlighted);
+      `;
+}

package/src/shadows/shadowMeshMatches.js

@@ -1,19 +1,19 @@
-/**
- * Check a mesh against its cached shadow state and pending attribute updates.
- *
- * @param {Object} cache Shadow cache containing mesh snapshots.
- * @param {Object} mesh Mesh to compare.
- *
- * @returns {boolean} Whether the mesh still matches its snapshot.
- */
-export function shadowMeshMatches(cache, mesh) {
-  const previous = cache.meshes.get(mesh), range = mesh.geometry.drawRange;
-  if (!(previous && previous.world === mesh._worldMatrixVersion && previous.geometry === mesh.geometry &&
-    previous.start === range.start && previous.count === range.count &&
-    previous.appearance === (mesh._appearance ?? 1))) return false;
-  let attribute;
-  for (attribute of Object.values(mesh.geometry.attributes)) {
-    if (attribute.needsUpdate) return false;
-  }
-  return true;
-}
+/**
+ * Check a mesh against its cached shadow state and pending attribute updates.
+ *
+ * @param {Object} cache Shadow cache containing mesh snapshots.
+ * @param {Object} mesh Mesh to compare.
+ *
+ * @returns {boolean} Whether the mesh still matches its snapshot.
+ */
+export function shadowMeshMatches(cache, mesh) {
+  const previous = cache.meshes.get(mesh), range = mesh.geometry.drawRange;
+  if (!(previous && previous.world === mesh._worldMatrixVersion && previous.geometry === mesh.geometry &&
+    previous.start === range.start && previous.count === range.count &&
+    previous.appearance === (mesh._appearance ?? 1))) return false;
+  let attribute;
+  for (attribute of Object.values(mesh.geometry.attributes)) {
+    if (attribute.needsUpdate) return false;
+  }
+  return true;
+}

package/src/sources/buildAreaFeatures.js

@@ -1,23 +1,23 @@
-import { buildAreaFeature } from './buildAreaFeature.js';
-
-/**
- * Process features in time-limited batches, stopping if the area request is aborted.
- *
- * @param {Object} context Area build context.
- * @param {Object} area Area state and abort controller.
- * @param {Array<Object>} features GeoJSON features to process.
- *
- * @returns {Promise<void>} Completion of feature processing.
- */
-export async function buildAreaFeatures(context, area, features) {
-  let deadline = performance.now() + 4, feature;
-  for (feature of features) {
-    if (area.request.signal.aborted) return;
-    if (performance.now() >= deadline) {
-      await /* alloc */ new Promise(requestAnimationFrame);
-      if (area.request.signal.aborted) return;
-      deadline = performance.now() + 4;
-    }
-    buildAreaFeature(context, feature);
-  }
-}
+import { buildAreaFeature } from './buildAreaFeature.js';
+
+/**
+ * Process features in time-limited batches, stopping if the area request is aborted.
+ *
+ * @param {Object} context Area build context.
+ * @param {Object} area Area state and abort controller.
+ * @param {Array<Object>} features GeoJSON features to process.
+ *
+ * @returns {Promise<void>} Completion of feature processing.
+ */
+export async function buildAreaFeatures(context, area, features) {
+  let deadline = performance.now() + 4, feature;
+  for (feature of features) {
+    if (area.request.signal.aborted) return;
+    if (performance.now() >= deadline) {
+      await /* alloc */ new Promise(requestAnimationFrame);
+      if (area.request.signal.aborted) return;
+      deadline = performance.now() + 4;
+    }
+    buildAreaFeature(context, feature);
+  }
+}

package/src/sources/extrusionStyle.js

@@ -1,21 +1,21 @@
-/**
- * Evaluate and validate a feature's extrusion style.
- *
- * @param {L.Layer} layer Source layer with a style function.
- * @param {Object} feature GeoJSON feature.
- *
- * @returns {Object|null} Valid style, or null to skip the feature.
- *
- * @throws {Error} If the style is neither an object nor null.
- * @throws {Error} If extrusion heights do not satisfy top > bottom >= 0.
- */
-export function extrusionStyle(layer, feature) {
-  const style = layer.options.style(feature);
-  if (style === null) return null;
-  if (!style || typeof style !== 'object') throw /* alloc */ new Error('style must return an extrusion style or null');
-  const { top, bottom = 0 } = style;
-  if (!Number.isFinite(top) || !Number.isFinite(bottom) || bottom < 0 || top <= bottom) {
-    throw /* alloc */ new Error('Invalid extrusion heights: expected top > bottom >= 0');
-  }
-  return style;
-}
+/**
+ * Evaluate and validate a feature's extrusion style.
+ *
+ * @param {L.Layer} layer Source layer with a style function.
+ * @param {Object} feature GeoJSON feature.
+ *
+ * @returns {Object|null} Valid style, or null to skip the feature.
+ *
+ * @throws {Error} If the style is neither an object nor null.
+ * @throws {Error} If extrusion heights do not satisfy top > bottom >= 0.
+ */
+export function extrusionStyle(layer, feature) {
+  const style = layer.options.style(feature);
+  if (style === null) return null;
+  if (!style || typeof style !== 'object') throw /* alloc */ new Error('style must return an extrusion style or null');
+  const { top, bottom = 0 } = style;
+  if (!Number.isFinite(top) || !Number.isFinite(bottom) || bottom < 0 || top <= bottom) {
+    throw /* alloc */ new Error('Invalid extrusion heights: expected top > bottom >= 0');
+  }
+  return style;
+}

package/src/sources/featureAnchor.js

@@ -1,21 +1,21 @@
-/**
- * Return the point or first polygon coordinate used to assign a feature to an area.
- *
- * @param {Object} feature GeoJSON feature.
- * @param {boolean} nightLight Whether point geometry is required for a night light.
- *
- * @returns {Array<number>} Anchor coordinates in longitude, latitude order.
- *
- * @throws {Error} If a night-light feature is not a point.
- * @throws {Error} If the geometry type is unsupported.
- * @throws {Error} If anchor coordinates are not finite.
- */
-export function featureAnchor(feature, nightLight) {
-  const geometry = feature?.geometry, point = geometry?.type === 'Point';
-  if (nightLight && !point) throw /* alloc */ new Error('Night lights require Point geometry');
-  if (geometry?.type !== 'Polygon' && geometry?.type !== 'MultiPolygon' && !point) throw /* alloc */ new Error('Unsupported GeoJSON geometry');
-  const coordinates = point ? geometry.coordinates :
-    geometry.type === 'Polygon' ? geometry.coordinates[0]?.[0] : geometry.coordinates[0]?.[0]?.[0];
-  if (!Number.isFinite(coordinates?.[0]) || !Number.isFinite(coordinates?.[1])) throw /* alloc */ new Error('Invalid GeoJSON coordinates');
-  return coordinates;
-}
+/**
+ * Return the point or first polygon coordinate used to assign a feature to an area.
+ *
+ * @param {Object} feature GeoJSON feature.
+ * @param {boolean} nightLight Whether point geometry is required for a night light.
+ *
+ * @returns {Array<number>} Anchor coordinates in longitude, latitude order.
+ *
+ * @throws {Error} If a night-light feature is not a point.
+ * @throws {Error} If the geometry type is unsupported.
+ * @throws {Error} If anchor coordinates are not finite.
+ */
+export function featureAnchor(feature, nightLight) {
+  const geometry = feature?.geometry, point = geometry?.type === 'Point';
+  if (nightLight && !point) throw /* alloc */ new Error('Night lights require Point geometry');
+  if (geometry?.type !== 'Polygon' && geometry?.type !== 'MultiPolygon' && !point) throw /* alloc */ new Error('Unsupported GeoJSON geometry');
+  const coordinates = point ? geometry.coordinates :
+    geometry.type === 'Polygon' ? geometry.coordinates[0]?.[0] : geometry.coordinates[0]?.[0]?.[0];
+  if (!Number.isFinite(coordinates?.[0]) || !Number.isFinite(coordinates?.[1])) throw /* alloc */ new Error('Invalid GeoJSON coordinates');
+  return coordinates;
+}

package/src/sources/groundOffset.js

@@ -1,10 +1,10 @@
-/**
- * Read the projected point's ground offset, defaulting to zero.
- *
- * @param {Object} point Projected point.
- *
- * @returns {number} Ground offset.
- */
-export function groundOffset(point) {
-  return point.ground || 0;
+/**
+ * Read the projected point's ground offset, defaulting to zero.
+ *
+ * @param {Object} point Projected point.
+ *
+ * @returns {number} Ground offset.
+ */
+export function groundOffset(point) {
+  return point.ground || 0;
 }