@rtzh/engine 0.0.9 → 0.0.11

package/Source/Scene/Model/LightingPipelineStage.js

@@ -1,4 +1,4 @@
-import defined from "../../Core/defined.js";
+import defined from "../../Core/defined.js";
 import ShaderDestination from "../../Renderer/ShaderDestination.js";
 import LightingStageFS from "../../Shaders/Model/LightingStageFS.js";
 import LightingModel from "./LightingModel.js";
@@ -24,10 +24,15 @@ const LightingPipelineStage = {
  * </ul>
  * @param {PrimitiveRenderResources} renderResources The render resources for the primitive
  * @param {ModelComponents.Primitive} primitive The primitive to be rendered
+ * @param {FrameState} frameState The frame state.
  *
  * @private
  */
-LightingPipelineStage.process = function (renderResources, primitive) {
+LightingPipelineStage.process = function (
+  renderResources,
+  primitive,
+  frameState,
+) {
   const { model, lightingOptions, shaderBuilder } = renderResources;
 
   if (defined(model.lightColor)) {
@@ -67,6 +72,16 @@ LightingPipelineStage.process = function (renderResources, primitive) {
     );
   }
 
+  // Add POINT_LIGHTS define if point lights are present
+  const pointLights = frameState.pointLights;
+  if (defined(pointLights) && pointLights.length > 0) {
+    shaderBuilder.addDefine(
+      "POINT_LIGHTS",
+      undefined,
+      ShaderDestination.FRAGMENT,
+    );
+  }
+
   shaderBuilder.addFragmentLines(LightingStageFS);
 };
 

package/Source/Scene/Model/MaterialPipelineStage.js

@@ -65,6 +65,23 @@ MaterialPipelineStage.process = function (
   const hasClassification = defined(model.classificationType);
   const disableTextures = hasClassification;
 
+  // Collect the texture coordinate sets actually present in the geometry.
+  // Some models reference a texture whose UV set (e.g. TEXCOORD_0) does not
+  // exist on the mesh. If we still generate a `TEXCOORD_*` define for such a
+  // texture, the fragment shader would reference an undeclared
+  // `v_texCoord_n` varying and fail to compile, so those textures are skipped.
+  const texCoordSets = new Set();
+  const attributes = primitive.attributes;
+  for (let i = 0; i < attributes.length; i++) {
+    const attribute = attributes[i];
+    if (
+      attribute.semantic === VertexAttributeSemantic.TEXCOORD &&
+      defined(attribute.setIndex)
+    ) {
+      texCoordSets.add(attribute.setIndex);
+    }
+  }
+
   // When textures are loaded incrementally, fall back to a default 1x1 texture
   const { defaultTexture, defaultNormalTexture, defaultEmissiveTexture } =
     frameState.context;
@@ -77,6 +94,7 @@ MaterialPipelineStage.process = function (
     defaultNormalTexture,
     defaultEmissiveTexture,
     disableTextures,
+    texCoordSets,
   );
 
   if (defined(material.specularGlossiness)) {
@@ -86,6 +104,7 @@ MaterialPipelineStage.process = function (
       shaderBuilder,
       defaultTexture,
       disableTextures,
+      texCoordSets,
     );
   } else {
     if (
@@ -98,6 +117,7 @@ MaterialPipelineStage.process = function (
         shaderBuilder,
         defaultTexture,
         disableTextures,
+        texCoordSets,
       );
     }
     if (
@@ -110,6 +130,7 @@ MaterialPipelineStage.process = function (
         shaderBuilder,
         defaultTexture,
         disableTextures,
+        texCoordSets,
       );
     }
     if (
@@ -122,6 +143,7 @@ MaterialPipelineStage.process = function (
         shaderBuilder,
         defaultTexture,
         disableTextures,
+        texCoordSets,
       );
     }
     processMetallicRoughnessUniforms(
@@ -130,6 +152,7 @@ MaterialPipelineStage.process = function (
       shaderBuilder,
       defaultTexture,
       disableTextures,
+      texCoordSets,
     );
   }
 
@@ -272,7 +295,15 @@ function processTexture(
   uniformName,
   defineName,
   defaultTexture,
+  texCoordSets,
 ) {
+  // If the texture references a texture coordinate set that is not present in
+  // the geometry, skip it entirely. Otherwise the generated fragment shader
+  // would use an undeclared `v_texCoord_n` varying and fail to compile.
+  if (!texCoordSets.has(textureReader.texCoord)) {
+    return;
+  }
+
   // Add a uniform for the texture itself
   shaderBuilder.addUniform(
     "sampler2D",
@@ -333,6 +364,7 @@ function processMaterialUniforms(
   defaultNormalTexture,
   defaultEmissiveTexture,
   disableTextures,
+  texCoordSets,
 ) {
   const { emissiveFactor, emissiveTexture, normalTexture, occlusionTexture } =
     material;
@@ -363,6 +395,7 @@ function processMaterialUniforms(
         "u_emissiveTexture",
         "EMISSIVE",
         defaultEmissiveTexture,
+        texCoordSets,
       );
     }
   }
@@ -375,6 +408,7 @@ function processMaterialUniforms(
       "u_normalTexture",
       "NORMAL",
       defaultNormalTexture,
+      texCoordSets,
     );
   }
 
@@ -386,6 +420,7 @@ function processMaterialUniforms(
       "u_occlusionTexture",
       "OCCLUSION",
       defaultTexture,
+      texCoordSets,
     );
   }
 }
@@ -406,6 +441,7 @@ function processSpecularGlossinessUniforms(
   shaderBuilder,
   defaultTexture,
   disableTextures,
+  texCoordSets,
 ) {
   const {
     diffuseTexture,
@@ -429,6 +465,7 @@ function processSpecularGlossinessUniforms(
       "u_diffuseTexture",
       "DIFFUSE",
       defaultTexture,
+      texCoordSets,
     );
   }
 
@@ -459,6 +496,7 @@ function processSpecularGlossinessUniforms(
       "u_specularGlossinessTexture",
       "SPECULAR_GLOSSINESS",
       defaultTexture,
+      texCoordSets,
     );
   }
 
@@ -520,6 +558,7 @@ function processSpecularUniforms(
   shaderBuilder,
   defaultTexture,
   disableTextures,
+  texCoordSets,
 ) {
   const {
     specularTexture,
@@ -542,6 +581,7 @@ function processSpecularUniforms(
       "u_specularTexture",
       "SPECULAR",
       defaultTexture,
+      texCoordSets,
     );
   }
 
@@ -572,6 +612,7 @@ function processSpecularUniforms(
       "u_specularColorTexture",
       "SPECULAR_COLOR",
       defaultTexture,
+      texCoordSets,
     );
   }
 
@@ -616,6 +657,7 @@ function processAnisotropyUniforms(
   shaderBuilder,
   defaultTexture,
   disableTextures,
+  texCoordSets,
 ) {
   const { anisotropyStrength, anisotropyRotation, anisotropyTexture } =
     anisotropy;
@@ -634,6 +676,7 @@ function processAnisotropyUniforms(
       "u_anisotropyTexture",
       "ANISOTROPY",
       defaultTexture,
+      texCoordSets,
     );
   }
 
@@ -668,6 +711,7 @@ function processClearcoatUniforms(
   shaderBuilder,
   defaultTexture,
   disableTextures,
+  texCoordSets,
 ) {
   const {
     clearcoatFactor,
@@ -710,6 +754,7 @@ function processClearcoatUniforms(
       "u_clearcoatTexture",
       "CLEARCOAT",
       defaultTexture,
+      texCoordSets,
     );
   }
 
@@ -740,6 +785,7 @@ function processClearcoatUniforms(
       "u_clearcoatRoughnessTexture",
       "CLEARCOAT_ROUGHNESS",
       defaultTexture,
+      texCoordSets,
     );
   }
 
@@ -751,6 +797,7 @@ function processClearcoatUniforms(
       "u_clearcoatNormalTexture",
       "CLEARCOAT_NORMAL",
       defaultTexture,
+      texCoordSets,
     );
   }
 }
@@ -771,6 +818,7 @@ function processMetallicRoughnessUniforms(
   shaderBuilder,
   defaultTexture,
   disableTextures,
+  texCoordSets,
 ) {
   shaderBuilder.addDefine(
     "USE_METALLIC_ROUGHNESS",
@@ -787,6 +835,7 @@ function processMetallicRoughnessUniforms(
       "u_baseColorTexture",
       "BASE_COLOR",
       defaultTexture,
+      texCoordSets,
     );
   }
 
@@ -822,6 +871,7 @@ function processMetallicRoughnessUniforms(
       "u_metallicRoughnessTexture",
       "METALLIC_ROUGHNESS",
       defaultTexture,
+      texCoordSets,
     );
   }