@xeokit/xeokit-sdk 2.6.29 → 2.6.30

package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesInstancingRenderer.js

@@ -4,8 +4,8 @@ import {VBORenderer} from "./../../../VBORenderer.js";
  * @private
  */
 export class TrianglesInstancingRenderer extends VBORenderer {
-    constructor(scene, withSAO, {edges = false} = {}) {
-        super(scene, withSAO, {instancing: true, edges});
+    constructor(scene, withSAO, {edges = false, useAlphaCutoff = false} = {}) {
+        super(scene, withSAO, {instancing: true, edges, useAlphaCutoff});
     }
 
     _draw(drawCfg) {
@@ -14,16 +14,17 @@ export class TrianglesInstancingRenderer extends VBORenderer {
         const {
             state,
             frameCtx,
-            incrementDrawState,
+            incrementDrawState
         } = drawCfg;
 
         if (this._edges) {
             gl.drawElementsInstanced(gl.LINES, state.edgeIndicesBuf.numItems, state.edgeIndicesBuf.itemType, 0, state.numInstances);
         } else {
             gl.drawElementsInstanced(gl.TRIANGLES, state.indicesBuf.numItems, state.indicesBuf.itemType, 0, state.numInstances);
+
             if (incrementDrawState) {
                 frameCtx.drawElements++;
             }
         }
     }
-}
+}

package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesSnapRenderer.js

@@ -230,7 +230,7 @@ export class TrianglesSnapRenderer extends VBORenderer {
         // renderPass = PICK
         src.push(`int pickFlag = int(flags) >> 12 & 0xF;`);
         src.push(`if (pickFlag != renderPass) {`);
-        src.push("   gl_Position = vec4(0.0, 0.0, 0.0, 0.0);"); // Cull vertex
+        src.push("   gl_Position = vec4(2.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);");

package/src/viewer/scene/webgl/occlusion/OcclusionLayer.js

@@ -99,7 +99,7 @@ class OcclusionLayer {
         for (let i = 0; i < this.numMarkers; i++) {
             if (this.markerList[i]) {
                 const marker = this.markerList[i];
-                const worldPos = marker.worldPos;
+                const worldPos = marker.rtcPos;
                 this.positions[j++] = worldPos[0];
                 this.positions[j++] = worldPos[1];
                 this.positions[j++] = worldPos[2];

package/src/viewer/scene/webgl/occlusion/OcclusionTester.js

@@ -332,10 +332,7 @@ class OcclusionTester {
                 continue;
             }
 
-            // The `origin` has been changed from `occlusionLayer.origin` to `[ 0, 0, 0 ]`
-            // because OcclusionLayer markers' transformation is being applied through the
-            // OcclusionLayer::positions array. See XEOK-33
-            const origin = [ 0, 0, 0 ];
+            const origin = occlusionLayer.origin;
 
             gl.uniformMatrix4fv(this._uViewMatrix, false, createRTCViewMat(camera.viewMatrix, origin));