@xeokit/xeokit-sdk 2.6.91 → 2.6.93

package/src/viewer/scene/mesh/draw/LambertShaderSource.js

@@ -0,0 +1,35 @@
+import {createLightSetup} from "../../webgl/WebGLRenderer.js";
+
+export const LambertShaderSource = function(meshDrawHash, programVariables, geometry, material, scene) {
+    const lightSetup       = createLightSetup(programVariables, scene._lightsState);
+    const colorize         = programVariables.createUniform("vec4",  "colorize",         (set, state) => set(state.meshColorize));
+    const materialAlpha    = programVariables.createUniform("float", "materialAlpha",    (set, state) => set(state.material.alpha));
+    const materialColor    = programVariables.createUniform("vec3",  "materialColor",    (set, state) => set(state.material.color));
+    const materialEmissive = programVariables.createUniform("vec3",  "materialEmissive", (set, state) => set(state.material.emissive));
+    const vColor           = programVariables.createVarying("vec4", "vColor", () => {
+        const attributes = geometry.attributes;
+        const lightComponents = [
+            lightSetup.getAmbientColor()
+        ].concat(attributes.normal
+                 ? lightSetup.directionalLights.map(
+                     light => `(max(dot(${attributes.normal.view}, ${light.getDirection(geometry.viewMatrix, attributes.position.view)}), 0.0) * ${light.getColor()})`)
+                 : [ ]);
+        return `${colorize} * vec4((${lightComponents.join(" + ")}) * ${materialColor} + ${materialEmissive}, ${materialAlpha});`; // TODO: How to have ambient bright enough for canvas BG but not too bright for scene?
+    });
+    const outColor = programVariables.createOutput("vec4", "outColor");
+
+    return {
+        getHash: () => [
+            meshDrawHash,
+            scene.gammaOutput ? "go" : "",
+            lightSetup.getHash(),
+            material._state.hash
+        ],
+        programName: "Lambert",
+        canActAsBackground: true,
+        discardPoints: true,
+        setupPointSize: true,
+        setsLineWidth: true,
+        appendFragmentOutputs: (src, getGammaOutputExpression) => src.push(`${outColor} = ${getGammaOutputExpression ? getGammaOutputExpression(vColor) : vColor};`)
+    };
+};

package/src/viewer/scene/mesh/emphasis/EmphasisShaderSource.js

@@ -0,0 +1,34 @@
+import {createLightSetup} from "../../webgl/WebGLRenderer.js";
+
+export const EmphasisShaderSource = function(meshHash, programVariables, geometry, scene, isFill) {
+    const lightSetup = isFill && createLightSetup(programVariables, scene._lightsState);
+    const uColor = programVariables.createUniform("vec3",  "uColor", (set, state) => set(isFill ? state.material.fillColor : state.material.edgeColor));
+    const uAlpha = programVariables.createUniform("float", "uAlpha", (set, state) => set(isFill ? state.material.fillAlpha : state.material.edgeAlpha));
+    const vColor = programVariables.createVarying("vec4", "vColor", () => {
+        const attributes = geometry.attributes;
+        const lightComponents = isFill && [
+            lightSetup.getAmbientColor()
+        ].concat(attributes.normal
+                 ? lightSetup.directionalLights.map(
+                     light => `(max(dot(${attributes.normal.view}, ${light.getDirection(geometry.viewMatrix, attributes.position.view)}), 0.0) * ${light.getColor()})`)
+                 : [ ]);
+        // TODO: A blending mode for emphasis materials, to select add/multiply/mix
+        // `vec4((mix(reflectedColor, ${uColor}, 0.7)), ${uAlpha})`
+        return `vec4(${uColor}${lightComponents ? ` * (${lightComponents.join(" + ")})` : ""}, ${uAlpha})`;
+        // `${vColor} = vec4(reflectedColor + ${uColor}, ${uAlpha})`
+    });
+
+    const outColor = programVariables.createOutput("vec4", "outColor");
+    return {
+        getHash: () => [
+            meshHash,
+            scene.gammaOutput ? "go" : "", // Gamma input not needed
+            lightSetup && lightSetup.getHash()
+        ],
+        programName: isFill ? "EmphasisFill" : "EmphasisEdges",
+        dontSetFrontFace: true,
+        discardPoints: isFill,
+        drawEdges: ! isFill,
+        appendFragmentOutputs: (src, getGammaOutputExpression) => src.push(`${outColor} = ${getGammaOutputExpression ? getGammaOutputExpression(vColor) : vColor};`)
+    };
+};

package/src/viewer/scene/mesh/occlusion/OcclusionShaderSource.js

@@ -1,158 +1,9 @@
-/**
- * @author xeolabs / https://github.com/xeolabs
- */
-
-import {WEBGL_INFO} from "../../webglInfo.js";
-
-/**
- * @private
- */
-class OcclusionShaderSource {
-    constructor(mesh) {
-        this.vertex = buildVertex(mesh);
-        this.fragment = buildFragment(mesh);
-    }
-}
-
-function buildVertex(mesh) {
-    const scene = mesh.scene;
-    const sectionPlanesState = scene._sectionPlanesState;
-    const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
-    const quantizedGeometry = !!mesh._geometry._state.compressGeometry;
-    const billboard = mesh._state.billboard;
-    const stationary = mesh._state.stationary;
-    const src = [];
-    src.push('#version 300 es');
-    src.push("// Mesh occlusion vertex shader");
-    src.push("in vec3 position;");
-    src.push("uniform mat4 modelMatrix;");
-    src.push("uniform mat4 viewMatrix;");
-    src.push("uniform mat4 projMatrix;");
-    src.push("uniform vec3 offset;");
-    src.push("uniform vec3 scale;");
-    if (quantizedGeometry) {
-        src.push("uniform mat4 positionsDecodeMatrix;");
-    }
-    if (clipping) {
-        src.push("out vec4 vWorldPosition;");
-    }
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("uniform float logDepthBufFC;");
-        src.push("out float vFragDepth;");
-        src.push("bool isPerspectiveMatrix(mat4 m) {");
-        src.push("    return (m[2][3] == - 1.0);");
-        src.push("}");
-        src.push("out float isPerspective;");
-    }
-    if (billboard === "spherical" || billboard === "cylindrical") {
-        src.push("void billboard(inout mat4 mat) {");
-        src.push("   mat[0][0] = scale[0];");
-        src.push("   mat[0][1] = 0.0;");
-        src.push("   mat[0][2] = 0.0;");
-        if (billboard === "spherical") {
-            src.push("   mat[1][0] = 0.0;");
-            src.push("   mat[1][1] = scale[1];");
-            src.push("   mat[1][2] = 0.0;");
-        }
-        src.push("   mat[2][0] = 0.0;");
-        src.push("   mat[2][1] = 0.0;");
-        src.push("   mat[2][2] =1.0;");
-        src.push("}");
-    }
-    src.push("void main(void) {");
-    src.push("vec4 localPosition = vec4(position, 1.0); ");
-    src.push("vec4 worldPosition;");
-    if (quantizedGeometry) {
-        src.push("localPosition = positionsDecodeMatrix * localPosition;");
-    }
-    src.push("mat4 viewMatrix2 = viewMatrix;");
-    src.push("mat4 modelMatrix2 = modelMatrix;");
-    if (stationary) {
-        src.push("viewMatrix2[3][0] = viewMatrix2[3][1] = viewMatrix2[3][2] = 0.0;")
-    }
-    if (billboard === "spherical" || billboard === "cylindrical") {
-        src.push("mat4 modelViewMatrix = viewMatrix2 * modelMatrix2;");
-        src.push("billboard(modelMatrix2);");
-        src.push("billboard(viewMatrix2);");
-        src.push("billboard(modelViewMatrix);");
-        src.push("worldPosition = modelMatrix2 * localPosition;");
-        src.push("worldPosition.xyz = worldPosition.xyz + offset;");
-        src.push("vec4 viewPosition = modelViewMatrix * localPosition;");
-    } else {
-        src.push("worldPosition = modelMatrix2 * localPosition;");
-        src.push("worldPosition.xyz = worldPosition.xyz + offset;");
-        src.push("vec4 viewPosition  = viewMatrix2 * worldPosition; ");
-    }
-    if (clipping) {
-        src.push("   vWorldPosition = worldPosition;");
-    }
-    src.push("vec4 clipPos = projMatrix * viewPosition;");
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("vFragDepth = 1.0 + clipPos.w;");
-        src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
-    }
-    src.push("gl_Position = clipPos;");
-    src.push("}");
-    return src;
-}
-
-function buildFragment(mesh) {
-
-    const scene = mesh.scene;
-    const sectionPlanesState = scene._sectionPlanesState;
-    const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
-    const src = [];
-    src.push('#version 300 es');
-    src.push("// Mesh occlusion fragment shader");
-    src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
-    src.push("precision highp float;");
-    src.push("precision highp int;");
-    src.push("#else");
-    src.push("precision mediump float;");
-    src.push("precision mediump int;");
-    src.push("#endif");
-
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("in float isPerspective;");
-        src.push("uniform float logDepthBufFC;");
-        src.push("in float vFragDepth;");
-    }
-
-    if (clipping) {
-        src.push("uniform bool clippable;");
-        src.push("in vec4 vWorldPosition;");
-        for (var i = 0; i < sectionPlanesState.getNumAllocatedSectionPlanes(); i++) {
-            src.push("uniform bool sectionPlaneActive" + i + ";");
-            src.push("uniform vec3 sectionPlanePos" + i + ";");
-            src.push("uniform vec3 sectionPlaneDir" + i + ";");
-        }
-    }
-
-    src.push("out vec4 outColor;");
-
-    src.push("void main(void) {");
-
-    if (clipping) {
-        src.push("if (clippable) {");
-        src.push("  float dist = 0.0;");
-        for (var i = 0; i < sectionPlanesState.getNumAllocatedSectionPlanes(); i++) {
-            src.push("if (sectionPlaneActive" + i + ") {");
-            src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
-            src.push("}");
-        }
-        src.push("  if (dist > 0.0) { discard; }");
-        src.push("}");
-    }
-
-    src.push("   outColor = vec4(0.0, 0.0, 1.0, 1.0); ");
-
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
-    }
-
-    src.push("}");
-
-    return src;
-}
-
-export {OcclusionShaderSource};
+export const OcclusionShaderSource = function(meshPickOcclusionHash, programVariables) {
+    const outColor = programVariables.createOutput("vec4", "outColor");
+    return {
+        getHash: () => [ meshPickOcclusionHash ],
+        programName: "Occlusion",
+        skipIfTransparent: true,
+        appendFragmentOutputs: (src) => src.push(`${outColor} = vec4(0.0, 0.0, 1.0, 1.0);`)
+    };
+};

package/src/viewer/scene/mesh/pick/PickMeshShaderSource.js

@@ -1,152 +1,22 @@
-/**
- * @author xeolabs / https://github.com/xeolabs
- */
+import {math} from "../../math/math.js";
+const tmpVec4 = math.vec4();
 
-/**
- * @private
- */
-class PickMeshShaderSource {
-    constructor(mesh) {
-        this.vertex = buildVertex(mesh);
-        this.fragment = buildFragment(mesh);
-    }
-}
-
-function buildVertex(mesh) {
-    const scene = mesh.scene;
-    const sectionPlanesState = scene._sectionPlanesState;
-    const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
-    const quantizedGeometry = !!mesh._geometry._state.compressGeometry;
-    const billboard = mesh._state.billboard;
-    const stationary = mesh._state.stationary;
-    const src = [];
-    src.push('#version 300 es');
-    src.push("// Mesh picking vertex shader");
-    src.push("in vec3 position;");
-    src.push("uniform mat4 modelMatrix;");
-    src.push("uniform mat4 viewMatrix;");
-    src.push("uniform mat4 projMatrix;");
-    src.push("out vec4 vViewPosition;");
-    src.push("uniform vec3 offset;");
-    src.push("uniform vec3 scale;");
-    if (quantizedGeometry) {
-        src.push("uniform mat4 positionsDecodeMatrix;");
-    }
-    if (clipping) {
-        src.push("out vec4 vWorldPosition;");
-    }
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("uniform float logDepthBufFC;");
-        src.push("out float vFragDepth;");
-        src.push("bool isPerspectiveMatrix(mat4 m) {");
-        src.push("    return (m[2][3] == - 1.0);");
-        src.push("}");
-        src.push("out float isPerspective;");
-    }
-    if (billboard === "spherical" || billboard === "cylindrical") {
-        src.push("void billboard(inout mat4 mat) {");
-        src.push("   mat[0][0] = scale[0];");
-        src.push("   mat[0][1] = 0.0;");
-        src.push("   mat[0][2] = 0.0;");
-        if (billboard === "spherical") {
-            src.push("   mat[1][0] = 0.0;");
-            src.push("   mat[1][1] = scale[1];");
-            src.push("   mat[1][2] = 0.0;");
-        }
-        src.push("   mat[2][0] = 0.0;");
-        src.push("   mat[2][1] = 0.0;");
-        src.push("   mat[2][2] =1.0;");
-        src.push("}");
-    }
-
-    src.push("uniform vec2 pickClipPos;");
-
-    src.push("vec4 remapClipPos(vec4 clipPos) {");
-    src.push("    clipPos.xy /= clipPos.w;")
-    src.push("    clipPos.xy -= pickClipPos;");
-    src.push("    clipPos.xy *= clipPos.w;")
-    src.push("    return clipPos;")
-    src.push("}");
-
-    src.push("void main(void) {");
-    src.push("vec4 localPosition = vec4(position, 1.0); ");
-    if (quantizedGeometry) {
-        src.push("localPosition = positionsDecodeMatrix * localPosition;");
-    }
-    src.push("mat4 viewMatrix2 = viewMatrix;");
-    src.push("mat4 modelMatrix2 = modelMatrix;");
-    if (stationary) {
-        src.push("viewMatrix2[3][0] = viewMatrix2[3][1] = viewMatrix2[3][2] = 0.0;")
-    }
-    if (billboard === "spherical" || billboard === "cylindrical") {
-        src.push("mat4 modelViewMatrix = viewMatrix2 * modelMatrix2;");
-        src.push("billboard(modelMatrix2);");
-        src.push("billboard(viewMatrix2);");
-    }
-    src.push("   vec4 worldPosition = modelMatrix2 * localPosition;");
-    src.push("   worldPosition.xyz = worldPosition.xyz + offset;");
-    src.push("   vec4 viewPosition = viewMatrix2 * worldPosition;");
-    if (clipping) {
-        src.push("   vWorldPosition = worldPosition;");
-    }
-    src.push("vec4 clipPos = projMatrix * viewPosition;");
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("vFragDepth = 1.0 + clipPos.w;");
-        src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
-    }
-    src.push("gl_Position = remapClipPos(clipPos);");
-    src.push("}");
-    return src;
-}
-
-function buildFragment(mesh) {
-    const scene = mesh.scene;
-    const sectionPlanesState = scene._sectionPlanesState;
-    const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
-    const src = [];
-    src.push('#version 300 es');
-    src.push("// Mesh picking fragment shader");
-    src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
-    src.push("precision highp float;");
-    src.push("precision highp int;");
-    src.push("#else");
-    src.push("precision mediump float;");
-    src.push("precision mediump int;");
-    src.push("#endif");
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("in float isPerspective;");
-        src.push("uniform float logDepthBufFC;");
-        src.push("in float vFragDepth;");
-    }
-    src.push("uniform vec4 pickColor;");
-    if (clipping) {
-        src.push("uniform bool clippable;");
-        src.push("in vec4 vWorldPosition;");
-        for (var i = 0; i < sectionPlanesState.getNumAllocatedSectionPlanes(); i++) {
-            src.push("uniform bool sectionPlaneActive" + i + ";");
-            src.push("uniform vec3 sectionPlanePos" + i + ";");
-            src.push("uniform vec3 sectionPlaneDir" + i + ";");
-        }
-    }
-    src.push("out vec4 outColor;");
-    src.push("void main(void) {");
-    if (clipping) {
-        src.push("if (clippable) {");
-        src.push("  float dist = 0.0;");
-        for (var i = 0; i < sectionPlanesState.getNumAllocatedSectionPlanes(); i++) {
-            src.push("if (sectionPlaneActive" + i + ") {");
-            src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
-            src.push("}");
-        }
-        src.push("  if (dist > 0.0) { discard; }");
-        src.push("}");
-    }
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
-    }
-    src.push("   outColor = pickColor; ");
-    src.push("}");
-    return src;
-}
-
-export {PickMeshShaderSource};
+export const PickMeshShaderSource = function(meshHash, programVariables) {
+    const pickColor = programVariables.createUniform("vec4", "pickColor", (set, state) => {
+        var pickID = state.meshPickID; // Mesh-indexed color
+        tmpVec4[0] = pickID       & 0xFF;
+        tmpVec4[1] = pickID >>  8 & 0xFF;
+        tmpVec4[2] = pickID >> 16 & 0xFF;
+        tmpVec4[3] = pickID >> 24 & 0xFF;
+        math.mulVec4Scalar(tmpVec4, 1 / 255, tmpVec4);
+        set(tmpVec4);
+    });
+    const outColor = programVariables.createOutput("vec4", "outColor");
+    return {
+        getHash: () => [ meshHash ],
+        programName: "PickMesh",
+        isPick: true,
+        dontBillboardAnything: true,
+        appendFragmentOutputs: (src) => src.push(`${outColor} = ${pickColor};`)
+    };
+};

package/src/viewer/scene/mesh/pick/PickTriangleShaderSource.js

@@ -1,124 +1,12 @@
-/**
- * @private
- */
-
-class PickTriangleShaderSource {
-    constructor(mesh) {
-        this.vertex = buildVertex(mesh);
-        this.fragment = buildFragment(mesh);
-    }
-}
-
-function buildVertex(mesh) {
-    const scene = mesh.scene;
-    const sectionPlanesState = scene._sectionPlanesState;
-    const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
-    const quantizedGeometry = !!mesh._geometry._state.compressGeometry;
-    const src = [];
-    src.push('#version 300 es');
-    src.push("// Surface picking vertex shader");
-    src.push("in vec3 position;");
-    src.push("in vec4 color;");
-    src.push("uniform mat4 modelMatrix;");
-    src.push("uniform mat4 viewMatrix;");
-    src.push("uniform mat4 projMatrix;");
-    src.push("uniform vec3 offset;");
-    if (clipping) {
-        src.push("uniform bool clippable;");
-        src.push("out vec4 vWorldPosition;");
-    }
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("uniform float logDepthBufFC;");
-        src.push("out float vFragDepth;");
-        src.push("bool isPerspectiveMatrix(mat4 m) {");
-        src.push("    return (m[2][3] == - 1.0);");
-        src.push("}");
-        src.push("out float isPerspective;");
-    }
-
-    src.push("uniform vec2 pickClipPos;");
-
-    src.push("vec4 remapClipPos(vec4 clipPos) {");
-    src.push("    clipPos.xy /= clipPos.w;")
-    src.push("    clipPos.xy -= pickClipPos;");
-    src.push("    clipPos.xy *= clipPos.w;")
-    src.push("    return clipPos;")
-    src.push("}");
-
-    src.push("out vec4 vColor;");
-    if (quantizedGeometry) {
-        src.push("uniform mat4 positionsDecodeMatrix;");
-    }
-    src.push("void main(void) {");
-    src.push("vec4 localPosition = vec4(position, 1.0); ");
-    if (quantizedGeometry) {
-        src.push("localPosition = positionsDecodeMatrix * localPosition;");
-    }
-    src.push("   vec4 worldPosition = modelMatrix * localPosition; ");
-    src.push("   worldPosition.xyz = worldPosition.xyz + offset;");
-    src.push("   vec4 viewPosition = viewMatrix * worldPosition;");
-    if (clipping) {
-        src.push("   vWorldPosition = worldPosition;");
-    }
-    src.push("   vColor = color;");
-    src.push("vec4 clipPos = projMatrix * viewPosition;");
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("vFragDepth = 1.0 + clipPos.w;");
-        src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
-    }
-    src.push("gl_Position = remapClipPos(clipPos);");
-    src.push("}");
-    return src;
-}
-
-function buildFragment(mesh) {
-    const scene = mesh.scene;
-    const sectionPlanesState = scene._sectionPlanesState;
-    const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
-    const src = [];
-    src.push('#version 300 es');
-    src.push("// Surface picking fragment shader");
-    src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
-    src.push("precision highp float;");
-    src.push("precision highp int;");
-    src.push("#else");
-    src.push("precision mediump float;");
-    src.push("precision mediump int;");
-    src.push("#endif");
-    src.push("in vec4 vColor;");
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("in float isPerspective;");
-        src.push("uniform float logDepthBufFC;");
-        src.push("in float vFragDepth;");
-    }
-    if (clipping) {
-        src.push("uniform bool clippable;");
-        src.push("in vec4 vWorldPosition;");
-        for (let i = 0; i < sectionPlanesState.getNumAllocatedSectionPlanes(); i++) {
-            src.push("uniform bool sectionPlaneActive" + i + ";");
-            src.push("uniform vec3 sectionPlanePos" + i + ";");
-            src.push("uniform vec3 sectionPlaneDir" + i + ";");
-        }
-    }
-    src.push("out vec4 outColor;");
-    src.push("void main(void) {");
-    if (clipping) {
-        src.push("if (clippable) {");
-        src.push("  float dist = 0.0;");
-        for (let i = 0; i < sectionPlanesState.getNumAllocatedSectionPlanes(); i++) {
-            src.push("if (sectionPlaneActive" + i + ") {");
-            src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
-            src.push("}");
-        }
-        src.push("  if (dist > 0.0) { discard; }");
-        src.push("}");
-    }
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
-    }
-    src.push("   outColor = vColor;");
-    src.push("}");
-    return src;
-}
-
-export {PickTriangleShaderSource};
+export const PickTriangleShaderSource = function(meshHash, programVariables, geometry) {
+    const vColor = programVariables.createVarying("vec4", "vColor", () => geometry.attributes.pickColor);
+    const outColor = programVariables.createOutput("vec4", "outColor");
+    return {
+        getHash: () => [ meshHash ],
+        programName: "PickTriangle",
+        isPick: true,
+        trianglePick: true,
+        dontBillboardAnything: true,
+        appendFragmentOutputs: (src) => src.push(`${outColor} = ${vColor};`)
+    };
+};

package/src/viewer/scene/mesh/shadow/ShadowShaderSource.js

@@ -1,98 +1,23 @@
-/**
- * @private
- */
-class ShadowShaderSource {
-    constructor(mesh) {
-        this.vertex = buildVertex(mesh);
-        this.fragment = buildFragment(mesh);
-    }
-}
-
-function buildVertex(mesh) {
-    const scene = mesh.scene;
-    const clipping = scene._sectionPlanesState.sectionPlanes.length > 0;
-    const quantizedGeometry = !!mesh._geometry._state.compressGeometry;
-    const src = [];
-    src.push("// Mesh shadow vertex shader");
-    src.push("in vec3 position;");
-    src.push("uniform mat4 modelMatrix;");
-    src.push("uniform mat4 shadowViewMatrix;");
-    src.push("uniform mat4 shadowProjMatrix;");
-    src.push("uniform vec3 offset;");
-    if (quantizedGeometry) {
-        src.push("uniform mat4 positionsDecodeMatrix;");
-    }
-    if (clipping) {
-        src.push("out vec4 vWorldPosition;");
-    }
-    src.push("void main(void) {");
-    src.push("vec4 localPosition = vec4(position, 1.0); ");
-    src.push("vec4 worldPosition;");
-    if (quantizedGeometry) {
-        src.push("localPosition = positionsDecodeMatrix * localPosition;");
-    }
-    src.push("worldPosition = modelMatrix * localPosition;");
-    src.push("worldPosition.xyz = worldPosition.xyz + offset;");
-    src.push("vec4 viewPosition  = shadowViewMatrix * worldPosition; ");
-    if (clipping) {
-        src.push("vWorldPosition = worldPosition;");
-    }
-    src.push("   gl_Position = shadowProjMatrix * viewPosition;");
-    src.push("}");
-    return src;
-}
-
-function buildFragment(mesh) {
-    const scene = mesh.scene;
-    const gl = scene.canvas.gl;
-    const sectionPlanesState = scene._sectionPlanesState;
-    const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
-    const src = [];
-    src.push("// Mesh shadow fragment shader");
-
-    src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
-    src.push("precision highp float;");
-    src.push("precision highp int;");
-    src.push("#else");
-    src.push("precision mediump float;");
-    src.push("precision mediump int;");
-    src.push("#endif");
-
-    if (clipping) {
-        src.push("uniform bool clippable;");
-        src.push("in vec4 vWorldPosition;");
-        for (var i = 0; i < sectionPlanesState.getNumAllocatedSectionPlanes(); i++) {
-            src.push("uniform bool sectionPlaneActive" + i + ";");
-            src.push("uniform vec3 sectionPlanePos" + i + ";");
-            src.push("uniform vec3 sectionPlaneDir" + i + ";");
-        }
-    }
-
-    src.push("vec4 encodeFloat( const in float depth ) {");
-    src.push("  const vec4 bitShift = vec4(256 * 256 * 256, 256 * 256, 256, 1.0);");
-    src.push("  const vec4 bitMask = vec4(0, 1.0 / 256.0, 1.0 / 256.0, 1.0 / 256.0);");
-    src.push("  vec4 comp = fract(depth * bitShift);");
-    src.push("  comp -= comp.xxyz * bitMask;");
-    src.push("  return comp;");
-    src.push("}");
-
-    src.push("out vec4 outColor;");
-
-    src.push("void main(void) {");
-    if (clipping) {
-        src.push("if (clippable) {");
-        src.push("  float dist = 0.0;");
-        for (var i = 0; i < sectionPlanesState.getNumAllocatedSectionPlanes(); i++) {
-            src.push("if (sectionPlaneActive" + i + ") {");
-            src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
+export const ShadowShaderSource = function(meshHash, programVariables) {
+    const encodeFloat = programVariables.createFragmentDefinition(
+        "encodeFloat",
+        (name, src) => {
+            src.push(`vec4 ${name}( const in float depth ) {`);
+            src.push("  const vec4 bitShift = vec4(256 * 256 * 256, 256 * 256, 256, 1.0);");
+            src.push("  const vec4 bitMask = vec4(0, 1.0 / 256.0, 1.0 / 256.0, 1.0 / 256.0);");
+            src.push("  vec4 comp = fract(depth * bitShift);");
+            src.push("  comp -= comp.xxyz * bitMask;");
+            src.push("  return comp;");
             src.push("}");
-        }
-        src.push("  if (dist > 0.0) { discard; }");
-        src.push("}");
-    }
-    src.push("outColor = encodeFloat(gl_FragCoord.z);");
-    src.push("}");
-    return src;
-}
-
-export {ShadowShaderSource};
+        });
+    const outColor = programVariables.createOutput("vec4", "outColor");
+    return {
+        getHash: () => [ meshHash ],
+        programName: "Shadow",
+        setsLineWidth: true,
+        useShadowView: true,
+        dontBillboardAnything: true,
+        dontGetLogDepth: true,
+        appendFragmentOutputs: (src, getGammaOutputExpression, gl_FragCoord) => src.push(`${outColor} = ${encodeFloat}(${gl_FragCoord}.z);`)
+    };
+};