@xeokit/xeokit-sdk 2.4.0-alpha-81 → 2.4.0-alpha-83

package/src/viewer/scene/model/vbo/linesInstancing/LinesInstancingRenderers.js

@@ -0,0 +1,71 @@
+import {LinesInstancingColorRenderer} from "./renderers/LinesInstancingColorRenderer.js";
+import {LinesInstancingSilhouetteRenderer} from "./renderers/LinesInstancingSilhouetteRenderer.js";
+
+/**
+ * @private
+ */
+class LinesInstancingRenderers {
+
+    constructor(scene) {
+        this._scene = scene;
+    }
+
+    _compile() {
+        if (this._colorRenderer && (!this._colorRenderer.getValid())) {
+            this._colorRenderer.destroy();
+            this._colorRenderer = null;
+        }
+        if (this._silhouetteRenderer && (!this._silhouetteRenderer.getValid())) {
+            this._silhouetteRenderer.destroy();
+            this._silhouetteRenderer = null;
+        }
+    }
+
+    get colorRenderer() {
+        if (!this._colorRenderer) {
+            this._colorRenderer = new LinesInstancingColorRenderer(this._scene);
+        }
+        return this._colorRenderer;
+    }
+
+    get silhouetteRenderer() {
+        if (!this._silhouetteRenderer) {
+            this._silhouetteRenderer = new LinesInstancingSilhouetteRenderer(this._scene);
+        }
+        return this._silhouetteRenderer;
+    }
+
+    _destroy() {
+        if (this._colorRenderer) {
+            this._colorRenderer.destroy();
+        }
+        if (this._silhouetteRenderer) {
+            this._silhouetteRenderer.destroy();
+        }
+    }
+}
+
+const cachedRenderers = {};
+
+/**
+ * @private
+ */
+function getInstancingRenderers(scene) {
+    const sceneId = scene.id;
+    let instancingRenderers = cachedRenderers[sceneId];
+    if (!instancingRenderers) {
+        instancingRenderers = new LinesInstancingRenderers(scene);
+        cachedRenderers[sceneId] = instancingRenderers;
+        instancingRenderers._compile();
+        scene.on("compile", () => {
+            instancingRenderers._compile();
+        });
+        scene.on("destroyed", () => {
+            delete cachedRenderers[sceneId];
+            instancingRenderers._destroy();
+        });
+    }
+    return instancingRenderers;
+}
+
+export {getInstancingRenderers};

package/src/viewer/scene/model/vbo/linesInstancing/renderers/LinesInstancingColorRenderer.js

@@ -0,0 +1,150 @@
+import {VBOSceneModelLineInstancingRenderer} from "../../VBOSceneModelRenderers.js";
+
+/**
+ * @private
+ */
+class LinesInstancingColorRenderer extends VBOSceneModelLineInstancingRenderer {
+
+    drawLayer(frameCtx, layer, renderPass) {
+        super.drawLayer(frameCtx, layer, renderPass, { incrementDrawState: true });
+    }
+
+    _buildVertexShader() {
+        const scene = this._scene;
+        const sectionPlanesState = scene._sectionPlanesState;
+        const clipping = sectionPlanesState.sectionPlanes.length > 0;
+        const src = [];
+        src.push('#version 300 es');
+        src.push("// Lines instancing color vertex shader");
+        src.push("uniform int renderPass;");
+
+        src.push("in vec3 position;");
+        src.push("in vec4 color;");
+        src.push("in float flags;");
+
+        if (scene.entityOffsetsEnabled) {
+            src.push("in vec3 offset;");
+        }
+
+        src.push("in vec4 modelMatrixCol0;"); // Modeling matrix
+        src.push("in vec4 modelMatrixCol1;");
+        src.push("in vec4 modelMatrixCol2;");
+
+        this._addMatricesUniformBlockLines(src);
+
+        if (scene.logarithmicDepthBufferEnabled) {
+            src.push("uniform float logDepthBufFC;");
+            src.push("out float vFragDepth;");
+        }
+
+        src.push("uniform vec4 lightAmbient;");
+
+        if (clipping) {
+            src.push("out vec4 vWorldPosition;");
+            src.push("out float vFlags;");
+        }
+        src.push("out vec4 vColor;");
+
+        src.push("void main(void) {");
+
+        // colorFlag = NOT_RENDERED | COLOR_OPAQUE | COLOR_TRANSPARENT
+        // renderPass = COLOR_OPAQUE | COLOR_TRANSPARENT
+
+        src.push(`int colorFlag = int(flags) & 0xF;`);
+        src.push(`if (colorFlag != renderPass) {`);
+        src.push("   gl_Position = vec4(0.0, 0.0, 0.0, 0.0);"); // Cull vertex
+
+        src.push("} else {");
+
+        src.push("vec4 worldPosition =  positionsDecodeMatrix * vec4(position, 1.0); ");
+        src.push("worldPosition = worldMatrix * vec4(dot(worldPosition, modelMatrixCol0), dot(worldPosition, modelMatrixCol1), dot(worldPosition, modelMatrixCol2), 1.0);");
+        if (scene.entityOffsetsEnabled) {
+            src.push("      worldPosition.xyz = worldPosition.xyz + offset;");
+        }
+
+        src.push("vec4 viewPosition  = viewMatrix * worldPosition; ");
+
+        src.push("vColor = vec4(float(color.r) / 255.0, float(color.g) / 255.0, float(color.b) / 255.0,  float(color.a) / 255.0);");
+
+        if (clipping) {
+            src.push("vWorldPosition = worldPosition;");
+            src.push("vFlags = flags;");
+        }
+        src.push("vec4 clipPos = projMatrix * viewPosition;");
+        if (scene.logarithmicDepthBufferEnabled) {
+            src.push("vFragDepth = 1.0 + clipPos.w;");
+        }
+        src.push("gl_Position = clipPos;");
+        src.push("}");
+        src.push("}");
+        return src;
+    }
+
+    _buildFragmentShader() {
+        const scene = this._scene;
+        const sectionPlanesState = scene._sectionPlanesState;
+        let i;
+        let len;
+        const clipping = sectionPlanesState.sectionPlanes.length > 0;
+        const src = [];
+        src.push('#version 300 es');
+        src.push("// Lines instancing color 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("uniform float logDepthBufFC;");
+            src.push("in float vFragDepth;");
+        }
+        if (clipping) {
+            src.push("in vec4 vWorldPosition;");
+            src.push("in float vFlags;");
+            for (i = 0, len = sectionPlanesState.sectionPlanes.length; 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("  bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
+            src.push("  if (clippable) {");
+            src.push("  float dist = 0.0;");
+            for (i = 0, len = sectionPlanesState.sectionPlanes.length; 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("}");
+        }
+
+        // Doing SAO blend in the main solid fill draw shader just so that edge lines can be drawn over the top
+        // Would be more efficient to defer this, then render lines later, using same depth buffer for Z-reject
+
+        if (this._withSAO) {
+            src.push("   float viewportWidth     = uSAOParams[0];");
+            src.push("   float viewportHeight    = uSAOParams[1];");
+            src.push("   float blendCutoff       = uSAOParams[2];");
+            src.push("   float blendFactor       = uSAOParams[3];");
+            src.push("   vec2 uv                 = vec2(gl_FragCoord.x / viewportWidth, gl_FragCoord.y / viewportHeight);");
+            src.push("   float ambient           = smoothstep(blendCutoff, 1.0, unpackRGBAToDepth(texture(uOcclusionTexture, uv))) * blendFactor;");
+            src.push("   outColor            = vec4(vColor.rgb * ambient, vColor.a);");
+        } else {
+            src.push("    outColor           = vColor;");
+        }
+        if (scene.logarithmicDepthBufferEnabled) {
+            src.push("gl_FragDepth = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+        }
+        src.push("}");
+        return src;
+    }
+}
+
+export {LinesInstancingColorRenderer};

package/src/viewer/scene/model/vbo/linesInstancing/renderers/LinesInstancingSilhouetteRenderer.js

@@ -0,0 +1,128 @@
+import {VBOSceneModelLineInstancingRenderer} from "../../VBOSceneModelRenderers.js";
+
+/**
+ * @private
+ */
+class LinesInstancingSilhouetteRenderer extends VBOSceneModelLineInstancingRenderer {
+
+    drawLayer(frameCtx, instancingLayer, renderPass) {
+        super.drawLayer(frameCtx, instancingLayer, renderPass, { colorUniform: true });
+    }
+
+    _buildVertexShader() {
+        const scene = this._scene;
+        const sectionPlanesState = scene._sectionPlanesState;
+        const clipping = sectionPlanesState.sectionPlanes.length > 0;
+        const src = [];
+        src.push('#version 300 es');
+        src.push("// Lines instancing silhouette vertex shader");
+        src.push("uniform int renderPass;");
+
+        src.push("in vec3 position;");
+        if (scene.entityOffsetsEnabled) {
+            src.push("in vec3 offset;");
+        }
+        src.push("in float flags;");
+
+        src.push("in vec4 modelMatrixCol0;"); // Modeling matrix
+        src.push("in vec4 modelMatrixCol1;");
+        src.push("in vec4 modelMatrixCol2;");
+
+        this._addMatricesUniformBlockLines(src);
+
+        if (scene.logarithmicDepthBufferEnabled) {
+            src.push("uniform float logDepthBufFC;");
+            src.push("out float vFragDepth;");
+        }
+
+        src.push("uniform vec4 color;");
+
+        if (clipping) {
+            src.push("out vec4 vWorldPosition;");
+            src.push("out float vFlags;");
+        }
+
+        src.push("void main(void) {");
+
+        // silhouetteFlag = NOT_RENDERED | SILHOUETTE_HIGHLIGHTED | SILHOUETTE_SELECTED | | SILHOUETTE_XRAYED
+        // renderPass = SILHOUETTE_HIGHLIGHTED | SILHOUETTE_SELECTED | | SILHOUETTE_XRAYED
+
+        src.push(`int silhouetteFlag = int(flags) >> 4 & 0xF;`);
+        src.push(`if (silhouetteFlag != renderPass) {`);
+        src.push("   gl_Position = vec4(0.0, 0.0, 0.0, 0.0);"); // Cull vertex
+
+        src.push("} else {");
+
+        src.push("vec4 worldPosition = positionsDecodeMatrix * vec4(position, 1.0); ");
+        src.push("worldPosition = worldMatrix * vec4(dot(worldPosition, modelMatrixCol0), dot(worldPosition, modelMatrixCol1), dot(worldPosition, modelMatrixCol2), 1.0);");
+        if (scene.entityOffsetsEnabled) {
+            src.push("      worldPosition.xyz = worldPosition.xyz + offset;");
+        }
+        src.push("vec4 viewPosition  = viewMatrix * worldPosition; ");
+
+        if (clipping) {
+            src.push("vWorldPosition = worldPosition;");
+            src.push("vFlags = flags;");
+        }
+        src.push("vec4 clipPos = projMatrix * viewPosition;");
+        if (scene.logarithmicDepthBufferEnabled) {
+            src.push("vFragDepth = 1.0 + clipPos.w;");
+        }
+        src.push("gl_Position = clipPos;");
+        src.push("}");
+        src.push("}");
+        return src;
+    }
+
+    _buildFragmentShader() {
+        const scene = this._scene;
+        const sectionPlanesState = scene._sectionPlanesState;
+        const clipping = sectionPlanesState.sectionPlanes.length > 0;
+        const src = [];
+        src.push('#version 300 es');
+        src.push("// Lines instancing silhouette 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("uniform float logDepthBufFC;");
+            src.push("in float vFragDepth;");
+        }
+        if (clipping) {
+            src.push("in vec4 vWorldPosition;");
+            src.push("in float vFlags;");
+            for (let i = 0, len = sectionPlanesState.sectionPlanes.length; i < len; i++) {
+                src.push("uniform bool sectionPlaneActive" + i + ";");
+                src.push("uniform vec3 sectionPlanePos" + i + ";");
+                src.push("uniform vec3 sectionPlaneDir" + i + ";");
+            }
+        }
+        src.push("uniform vec4 color;");
+        src.push("out vec4 outColor;");
+        src.push("void main(void) {");
+        if (clipping) {
+            src.push("  bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
+            src.push("  if (clippable) {");
+            src.push("  float dist = 0.0;");
+            for (let i = 0, len = sectionPlanesState.sectionPlanes.length; 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 (scene.logarithmicDepthBufferEnabled) {
+            src.push("gl_FragDepth = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+        }
+        src.push("outColor = color;");
+        src.push("}");
+        return src;
+    }
+}
+
+export {LinesInstancingSilhouetteRenderer};

package/src/viewer/scene/model/vbo/pointsBatching/PointsBatchingBuffer.js

@@ -0,0 +1,22 @@
+/**
+ * @private
+ */
+class PointsBatchingBuffer {
+
+    constructor(maxGeometryBatchSize = 5000000) {
+
+        if (maxGeometryBatchSize > 5000000) {
+            maxGeometryBatchSize = 5000000;
+        }
+
+        this.maxVerts = maxGeometryBatchSize;
+        this.maxIndices = maxGeometryBatchSize * 3; // Rough rule-of-thumb
+        this.positions = [];
+        this.colors = [];
+        this.intensities = [];
+        this.pickColors = [];
+        this.offsets = [];
+    }
+}
+
+export {PointsBatchingBuffer};