sparcoon 0.4.2 → 0.4.3

package/dist/materials/FXDiffuseMaterial/FXDiffuseMaterial.Internal.js

@@ -40,6 +40,7 @@ function wrapShadowCalls(source, uniformName) {
 function buildFXDiffuseMaterial(varyings, blending, useAlphaHashing, alphaTest, premultipliedAlpha, albedoNodes, normalNodes, emissionNodes, scatterUniforms, shadowSensitivity) {
     const useScatter = scatterUniforms !== undefined;
     const useShadowSensitivity = shadowSensitivity !== undefined;
+    const useNormals = normalNodes.length > 0;
     const attributeDeclarations = [];
     const varyingDeclarations = [];
     const vertexAssignments = [];
@@ -67,7 +68,7 @@ function buildFXDiffuseMaterial(varyings, blending, useAlphaHashing, alphaTest,
             PARTICLE_DEFINES,
             attributeDeclarations.join("\n"),
             "varying vec2 p_uv;",
-            "varying float p_rotation;",
+            useNormals ? "varying vec2 p_billboardSinCos;" : "",
             useScatter ? "varying vec3 v_viewPosition;" : "",
             varyingDeclarations.join("\n"),
         ].join("\n");
@@ -79,7 +80,6 @@ function buildFXDiffuseMaterial(varyings, blending, useAlphaHashing, alphaTest,
                     .replace("#include <defaultnormal_vertex>", "vec3 transformedNormal = vec3(0.0, 0.0, 1.0);")
                     .replace("#include <begin_vertex>", [
                     "p_uv = uv;",
-                    "p_rotation = PARTICLE_ROTATION;",
                     vertexAssignments.join("\n"),
                     "vec3 transformed = position;",
                     "#ifdef USE_ALPHAHASH",
@@ -98,6 +98,9 @@ function buildFXDiffuseMaterial(varyings, blending, useAlphaHashing, alphaTest,
                     "  billboardOffset.x * sinRotation + billboardOffset.y * cosRotation",
                     ");",
                     "",
+                    // Pass the exact sin/cos that rotated the billboard to the fragment shader.
+                    useNormals ? "p_billboardSinCos = vec2(sinRotation, cosRotation);" : "",
+                    "",
                     "vec3 particleCenter = vec3(PARTICLE_POSITION_X, PARTICLE_POSITION_Y, PARTICLE_POSITION_Z);",
                     "vec4 mvPosition = modelViewMatrix * vec4(particleCenter, 1.0);",
                     "mvPosition.xy += billboardOffset;",
@@ -155,7 +158,7 @@ function buildFXDiffuseMaterial(varyings, blending, useAlphaHashing, alphaTest,
         const fragmentPreamble = [
             PARTICLE_DEFINES,
             "varying vec2 p_uv;",
-            "varying float p_rotation;",
+            useNormals ? "varying vec2 p_billboardSinCos;" : "",
             varyingDeclarations.join("\n"),
             albedoNodes.flatMap((n) => n.uniformDeclarations).join("\n"),
             uniqueHelpers(albedoNodes),
@@ -186,7 +189,7 @@ function buildFXDiffuseMaterial(varyings, blending, useAlphaHashing, alphaTest,
             Object.assign(shader.uniforms, node.uniforms);
         }
         let fragmentShader = shader.fragmentShader;
-        if (normalNodes.length > 0) {
+        if (useNormals) {
             const normalExpressions = normalNodes.map((node) => {
                 if (node instanceof FXTextureNode) {
                     return `normalize(${node.colorExpression}.rgb * 2.0 - 1.0)`;
@@ -200,10 +203,17 @@ function buildFXDiffuseMaterial(varyings, blending, useAlphaHashing, alphaTest,
                 "float faceDirection = gl_FrontFacing ? 1.0 : -1.0;",
                 `vec3 normal = ${normalExpressions[0]};`,
                 ...blendLines,
-                "// Rotate normal xy to match billboard PARTICLE_ROTATION",
-                "float cosR = cos(p_rotation);",
-                "float sinR = sin(p_rotation);",
-                "normal = vec3(normal.x * cosR - normal.y * sinR, normal.x * sinR + normal.y * cosR, normal.z);",
+                "",
+                "// Rotate tangent-space normal XY into view space to match billboard rotation.",
+                "// p_billboardSinCos carries the exact sin/cos that rotated the quad vertices.",
+                "float sinR = p_billboardSinCos.x;",
+                "float cosR = p_billboardSinCos.y;",
+                "normal = vec3(",
+                "  normal.x * cosR - normal.y * sinR,",
+                "  normal.x * sinR + normal.y * cosR,",
+                "  normal.z",
+                ");",
+                "",
                 "normal *= faceDirection;",
             ].join("\n");
             fragmentShader = fragmentShader.replace("#include <normal_fragment_begin>", normalCode);
@@ -252,13 +262,6 @@ function buildFXDiffuseMaterial(varyings, blending, useAlphaHashing, alphaTest,
           }
         #endif
 
-        // calculateScatter() includes a "* alpha" density factor. Compositing
-        // will apply another "* alpha" (via blend equation in straight mode,
-        // or via premultiplied_alpha_fragment + One/OneMinusSrcAlpha blend).
-        // Without correction, scatter would get alpha² while diffuse lighting
-        // only gets alpha¹. Dividing diffuseColor.rgb by alpha cancels the
-        // extra factor, so scatter composites at the same alpha power as
-        // the rest of outgoingLight.
         vec3 albedo = diffuseColor.a > 0.001
             ? diffuseColor.rgb / diffuseColor.a
             : vec3(0.0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sparcoon",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "",
   "keywords": [
     "particles",