@xeokit/xeokit-sdk 2.6.84 → 2.6.85-renderers-refactor-v2

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

@@ -1,262 +0,0 @@
-import {WEBGL_INFO} from "../../webglInfo.js";
-
-/**
- * @private
- */
-class EmphasisFillShaderSource {
-    constructor(mesh) {
-        this.vertex = buildVertex(mesh);
-        this.fragment = buildFragment(mesh);
-    }
-}
-
-function buildVertex(mesh) {
-
-    const scene = mesh.scene;
-    const lightsState = scene._lightsState;
-    const normals = hasNormals(mesh);
-    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("// EmphasisFillShaderSource 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 vec4 colorize;");
-    src.push("uniform vec3 offset;");
-    if (quantizedGeometry) {
-        src.push("uniform mat4 positionsDecodeMatrix;");
-    }
-    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 (clipping) {
-        src.push("out vec4 vWorldPosition;");
-    }
-    src.push("uniform vec4   lightAmbient;");
-    src.push("uniform vec4   fillColor;");
-    if (normals) {
-        src.push("in vec3 normal;");
-        src.push("uniform mat4 modelNormalMatrix;");
-        src.push("uniform mat4 viewNormalMatrix;");
-        for (let i = 0, len = lightsState.lights.length; i < len; i++) {
-            const light = lightsState.lights[i];
-            if (light.type === "ambient") {
-                continue;
-            }
-            src.push("uniform vec4 lightColor" + i + ";");
-            if (light.type === "dir") {
-                src.push("uniform vec3 lightDir" + i + ";");
-            }
-            if (light.type === "point") {
-                src.push("uniform vec3 lightPos" + i + ";");
-            }
-            if (light.type === "spot") {
-                src.push("uniform vec3 lightPos" + i + ";");
-            }
-        }
-        if (quantizedGeometry) {
-            src.push("vec3 octDecode(vec2 oct) {");
-            src.push("    vec3 v = vec3(oct.xy, 1.0 - abs(oct.x) - abs(oct.y));");
-            src.push("    if (v.z < 0.0) {");
-            src.push("        v.xy = (1.0 - abs(v.yx)) * vec2(v.x >= 0.0 ? 1.0 : -1.0, v.y >= 0.0 ? 1.0 : -1.0);");
-            src.push("    }");
-            src.push("    return normalize(v);");
-            src.push("}");
-        }
-    }
-    src.push("out vec4 vColor;");
-    if (billboard === "spherical" || billboard === "cylindrical") {
-        src.push("void billboard(inout mat4 mat) {");
-        src.push("   mat[0][0] = 1.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] = 1.0;");
-            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;");
-    }
-    if (normals) {
-        if (quantizedGeometry) {
-            src.push("vec4 localNormal = vec4(octDecode(normal.xy), 0.0); ");
-        } else {
-            src.push("vec4 localNormal = vec4(normal, 0.0); ");
-        }
-        src.push("mat4 modelNormalMatrix2 = modelNormalMatrix;");
-        src.push("mat4 viewNormalMatrix2 = viewNormalMatrix;");
-    }
-    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);");
-        if (normals) {
-            src.push("mat4 modelViewNormalMatrix =  viewNormalMatrix2 * modelNormalMatrix2;");
-            src.push("billboard(modelNormalMatrix2);");
-            src.push("billboard(viewNormalMatrix2);");
-            src.push("billboard(modelViewNormalMatrix);");
-        }
-        src.push("worldPosition = modelMatrix2 * localPosition;");
-        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 (normals) {
-        src.push("vec3 viewNormal = normalize((viewNormalMatrix2 * modelNormalMatrix2 * localNormal).xyz);");
-    }
-    src.push("vec3 reflectedColor = vec3(0.0, 0.0, 0.0);");
-    src.push("vec3 viewLightDir = vec3(0.0, 0.0, -1.0);");
-    src.push("float lambertian = 1.0;");
-    if (normals) {
-        for (let i = 0, len = lightsState.lights.length; i < len; i++) {
-            const light = lightsState.lights[i];
-            if (light.type === "ambient") {
-                continue;
-            }
-            if (light.type === "dir") {
-                if (light.space === "view") {
-                    src.push("viewLightDir = normalize(lightDir" + i + ");");
-                } else {
-                    src.push("viewLightDir = normalize((viewMatrix2 * vec4(lightDir" + i + ", 0.0)).xyz);");
-                }
-            } else if (light.type === "point") {
-                if (light.space === "view") {
-                    src.push("viewLightDir = normalize(lightPos" + i + " - viewPosition.xyz);");
-                } else {
-                    src.push("viewLightDir = normalize((viewMatrix2 * vec4(lightPos" + i + ", 0.0)).xyz);");
-                }
-            } else {
-                continue;
-            }
-            src.push("lambertian = max(dot(-viewNormal, viewLightDir), 0.0);");
-            src.push("reflectedColor += lambertian * (lightColor" + i + ".rgb * lightColor" + i + ".a);");
-        }
-    }
-    // TODO: A blending mode for emphasis materials, to select add/multiply/mix
-    //src.push("vColor = vec4((mix(reflectedColor, fillColor.rgb, 0.7)), fillColor.a);");
-    src.push("vColor = vec4(reflectedColor * fillColor.rgb, fillColor.a);");
-    //src.push("vColor = vec4(reflectedColor + fillColor.rgb, fillColor.a);");
-    if (clipping) {
-        src.push("vWorldPosition = worldPosition;");
-    }
-    if (mesh._geometry._state.primitiveName === "points") {
-        src.push("gl_PointSize = pointSize;");
-    }
-    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 hasNormals(mesh) {
-    const primitive = mesh._geometry._state.primitiveName;
-    if ((mesh._geometry._state.autoVertexNormals || mesh._geometry._state.normalsBuf) && (primitive === "triangles" || primitive === "triangle-strip" || primitive === "triangle-fan")) {
-        return true;
-    }
-    return false;
-}
-
-function buildFragment(mesh) {
-
-    const scene = mesh.scene;
-    const sectionPlanesState = mesh.scene._sectionPlanesState;
-    const gammaOutput = mesh.scene.gammaOutput;
-    const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
-    const src = [];
-    src.push("#version 300 es");
-    src.push("// Lambertian drawing 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 (gammaOutput) {
-        src.push("uniform float gammaFactor;");
-        src.push("vec4 linearToGamma( in vec4 value, in float gammaFactor ) {");
-        src.push("  return vec4( pow( value.xyz, vec3( 1.0 / gammaFactor ) ), value.w );");
-        src.push("}");
-    }
-    if (clipping) {
-        src.push("in vec4 vWorldPosition;");
-        src.push("uniform bool clippable;");
-        for (let i = 0, len = sectionPlanesState.getNumAllocatedSectionPlanes(); i < len; i++) {
-            src.push("uniform bool sectionPlaneActive" + i + ";");
-            src.push("uniform vec3 sectionPlanePos" + i + ";");
-            src.push("uniform vec3 sectionPlaneDir" + i + ";");
-        }
-    }
-    src.push("in vec4 vColor;");
-    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, len = sectionPlanesState.getNumAllocatedSectionPlanes(); i < len; 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 (mesh._geometry._state.primitiveName === "points") {
-        src.push("vec2 cxy = 2.0 * gl_PointCoord - 1.0;");
-        src.push("float r = dot(cxy, cxy);");
-        src.push("if (r > 1.0) {");
-        src.push("   discard;");
-        src.push("}");
-    }
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
-    }
-    if (gammaOutput) {
-        src.push("outColor = linearToGamma(vColor, gammaFactor);");
-    } else {
-        src.push("outColor = vColor;");
-    }
-    src.push("}");
-    return src;
-}
-
-export {EmphasisFillShaderSource};

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

@@ -1,221 +0,0 @@
-/**
- * @author xeolabs / https://github.com/xeolabs
- */
-
-import {OcclusionShaderSource} from "./OcclusionShaderSource.js";
-import {Program} from "../../webgl/Program.js";
-import {stats} from "../../stats.js";
-import {math} from "../../math/math.js";
-import {getPlaneRTCPos} from "../../math/rtcCoords.js";
-
-const tempVec3a = math.vec3();
-
-// No ID, because there is exactly one PickMeshRenderer per scene
-
-/**
- * @private
- */
-const OcclusionRenderer = function (hash, mesh) {
-    this._hash = hash;
-    this._shaderSource = new OcclusionShaderSource(mesh);
-    this._scene = mesh.scene;
-    this._useCount = 0;
-    this._allocate(mesh);
-};
-
-const renderers = {};
-
-OcclusionRenderer.get = function (mesh) {
-    const hash = [
-        mesh.scene.canvas.canvas.id,
-        mesh.scene._sectionPlanesState.getHash(),
-        mesh._geometry._state.hash,
-        mesh._state.occlusionHash
-    ].join(";");
-    let renderer = renderers[hash];
-    if (!renderer) {
-        renderer = new OcclusionRenderer(hash, mesh);
-        if (renderer.errors) {
-            console.log(renderer.errors.join("\n"));
-            return null;
-        }
-        renderers[hash] = renderer;
-        stats.memory.programs++;
-    }
-    renderer._useCount++;
-    return renderer;
-};
-
-OcclusionRenderer.prototype.put = function () {
-    if (--this._useCount === 0) {
-        if (this._program) {
-            this._program.destroy();
-        }
-        delete renderers[this._hash];
-        stats.memory.programs--;
-    }
-};
-
-OcclusionRenderer.prototype.webglContextRestored = function () {
-    this._program = null;
-};
-
-OcclusionRenderer.prototype.drawMesh = function (frameCtx, mesh) {
-
-    if (!this._program) {
-        this._allocate(mesh);
-    }
-
-    const scene = this._scene;
-    const gl = scene.canvas.gl;
-    const materialState = mesh._material._state;
-    const meshState = mesh._state;
-    const geometryState = mesh._geometry._state;
-    const origin = mesh.origin;
-
-    if (materialState.alpha < 1.0) {
-        return;
-    }
-
-    if (frameCtx.lastProgramId !== this._program.id) {
-        frameCtx.lastProgramId = this._program.id;
-        this._bindProgram(frameCtx);
-    }
-
-    if (materialState.id !== this._lastMaterialId) {
-        const backfaces = materialState.backfaces;
-        if (frameCtx.backfaces !== backfaces) {
-            if (backfaces) {
-                gl.disable(gl.CULL_FACE);
-            } else {
-                gl.enable(gl.CULL_FACE);
-            }
-            frameCtx.backfaces = backfaces;
-        }
-        const frontface = materialState.frontface;
-        if (frameCtx.frontface !== frontface) {
-            if (frontface) {
-                gl.frontFace(gl.CCW);
-            } else {
-                gl.frontFace(gl.CW);
-            }
-            frameCtx.frontface = frontface;
-        }
-        this._lastMaterialId = materialState.id;
-    }
-
-    const camera = scene.camera;
-
-    gl.uniformMatrix4fv(this._uViewMatrix, false, origin ? frameCtx.getRTCViewMatrix(meshState.originHash, origin) : camera.viewMatrix);
-
-    if (meshState.clippable) {
-        const numAllocatedSectionPlanes = scene._sectionPlanesState.getNumAllocatedSectionPlanes();
-        const numSectionPlanes = scene._sectionPlanesState.sectionPlanes.length;
-        if (numAllocatedSectionPlanes > 0) {
-            const sectionPlanes = scene._sectionPlanesState.sectionPlanes;
-            const renderFlags = mesh.renderFlags;
-            for (let sectionPlaneIndex = 0; sectionPlaneIndex < numAllocatedSectionPlanes; sectionPlaneIndex++) {
-                const sectionPlaneUniforms = this._uSectionPlanes[sectionPlaneIndex];
-                if (sectionPlaneUniforms) {
-                    if (sectionPlaneIndex < numSectionPlanes) {
-                        const active = renderFlags.sectionPlanesActivePerLayer[sectionPlaneIndex];
-                        gl.uniform1i(sectionPlaneUniforms.active, active ? 1 : 0);
-                        if (active) {
-                            const sectionPlane = sectionPlanes[sectionPlaneIndex];
-                            if (origin) {
-                                const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a);
-                                gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
-                            } else {
-                                gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
-                            }
-                            gl.uniform3fv(sectionPlaneUniforms.dir, sectionPlane.dir);
-                        }
-                    } else {
-                        gl.uniform1i(sectionPlaneUniforms.active, 0);
-                    }
-                }
-            }
-        }
-    }
-
-    gl.uniformMatrix4fv(this._uProjMatrix, false, camera._project._state.matrix);
-    gl.uniformMatrix4fv(this._uModelMatrix, gl.FALSE, mesh.worldMatrix);
-
-    if (this._uClippable) {
-        gl.uniform1i(this._uClippable, mesh._state.clippable);
-    }
-
-    gl.uniform3fv(this._uOffset, mesh._state.offset);
-
-    if (geometryState.id !== this._lastGeometryId) {
-        if (this._uPositionsDecodeMatrix) {
-            gl.uniformMatrix4fv(this._uPositionsDecodeMatrix, false, geometryState.positionsDecodeMatrix);
-        }
-        if (this._aPosition) {
-            this._aPosition.bindArrayBuffer(geometryState.positionsBuf, geometryState.compressGeometry ? gl.UNSIGNED_SHORT : gl.FLOAT);
-            frameCtx.bindArray++;
-        }
-        if (geometryState.indicesBuf) {
-            geometryState.indicesBuf.bind();
-            frameCtx.bindArray++;
-        }
-        this._lastGeometryId = geometryState.id;
-    }
-    if (geometryState.indicesBuf) {
-        gl.drawElements(geometryState.primitive, geometryState.indicesBuf.numItems, geometryState.indicesBuf.itemType, 0);
-        frameCtx.drawElements++;
-    } else if (geometryState.positions) {
-        gl.drawArrays(gl.TRIANGLES, 0, geometryState.positions.numItems);
-    }
-};
-
-OcclusionRenderer.prototype._allocate = function (mesh) {
-    const scene = mesh.scene;
-    const gl = scene.canvas.gl;
-    this._program = new Program(gl, this._shaderSource);
-    if (this._program.errors) {
-        this.errors = this._program.errors;
-        return;
-    }
-    const program = this._program;
-    this._uPositionsDecodeMatrix = program.getLocation("positionsDecodeMatrix");
-    this._uModelMatrix = program.getLocation("modelMatrix");
-    this._uViewMatrix = program.getLocation("viewMatrix");
-    this._uProjMatrix = program.getLocation("projMatrix");
-    this._uSectionPlanes = [];
-    const clips = scene._sectionPlanesState.sectionPlanes;
-    for (let i = 0, len = clips.length; i < len; i++) {
-        this._uSectionPlanes.push({
-            active: program.getLocation("sectionPlaneActive" + i),
-            pos: program.getLocation("sectionPlanePos" + i),
-            dir: program.getLocation("sectionPlaneDir" + i)
-        });
-    }
-    this._aPosition = program.getAttribute("position");
-    this._uClippable = program.getLocation("clippable");
-    this._uOffset = program.getLocation("offset");
-    if (scene.logarithmicDepthBufferEnabled ) {
-        this._uLogDepthBufFC = program.getLocation("logDepthBufFC");
-    }
-    this._lastMaterialId = null;
-    this._lastVertexBufsId = null;
-    this._lastGeometryId = null;
-};
-
-OcclusionRenderer.prototype._bindProgram = function (frameCtx) {
-    const scene = this._scene;
-    const project = scene.camera.project;
-    const gl = scene.canvas.gl;
-    this._program.bind();
-    frameCtx.useProgram++;
-    gl.uniformMatrix4fv(this._uProjMatrix, false, project.matrix);
-    if (scene.logarithmicDepthBufferEnabled ) {
-        const logDepthBufFC = 2.0 / (Math.log(project.far + 1.0) / Math.LN2);
-        gl.uniform1f(this._uLogDepthBufFC, logDepthBufFC);
-    }
-    this._lastMaterialId = null;
-    this._lastVertexBufsId = null;
-    this._lastGeometryId = null;
-};
-
-export {OcclusionRenderer};