@xeokit/xeokit-sdk 2.6.29 → 2.6.31

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/Renderer.js

@@ -1539,13 +1539,16 @@ const Renderer = function (scene, options) {
             }
 
             const snappedEntity = (snappedPickable && snappedPickable.delegatePickedEntity) ? snappedPickable.delegatePickedEntity() : snappedPickable;
+            if (!snappedEntity && pickable) {
+                pickable = pickable.delegatePickedEntity ? pickable.delegatePickedEntity() : pickable;
+            }
 
             pickResult.reset();
             pickResult.snappedToEdge = (snapType === "edge");
             pickResult.snappedToVertex = (snapType === "vertex");
-            pickResult.worldPos = snappedWorldPos;
-            pickResult.worldNormal = snappedWorldNormal;
-            pickResult.entity = snappedEntity;
+            pickResult.worldPos = snappedWorldPos || worldPos;
+            pickResult.worldNormal = snappedWorldNormal || worldNormal;
+            pickResult.entity = snappedEntity || pickable;
             pickResult.canvasPos = canvasPos || scene.camera.projectWorldPos(worldPos || snappedWorldPos);
             pickResult.snappedCanvasPos = snappedCanvasPos || canvasPos;
 

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));
 

package/types/plugins/GLTFLoaderPlugin/GLTFLoaderPlugin.d.ts

@@ -1,4 +1,4 @@
-import { Plugin, Viewer, Entity, IFCObjectDefaults } from "../../viewer";
+import { Entity, IFCObjectDefaults, Plugin, SceneModel, Viewer } from "../../viewer";
 
 export declare interface IGLTFDefaultDataSource {
   /**
@@ -77,6 +77,8 @@ export declare type LoadGLTFModel = {
   edgeThreshold?: number[]
   /** Set ````false```` to load all the materials and textures provided by the glTF file, otherwise leave ````true```` to load the default high-performance representation optimized for low memory usage and efficient rendering. */
   performance?: boolean;
+  /** When true, generate a single MetaObject that represents the entire glTF model, and a MetaObject for each entity within it. */
+  autoMetaModel?: boolean;
 };
 
 /**
@@ -134,7 +136,7 @@ export declare class GLTFLoaderPlugin extends Plugin {
    * Loads a glTF model from a file into this GLTFLoaderPlugin's {@link Viewer}.
    *
    * @param {LoadGLTFModel} params Loading parameters.
-   * @returns {Entity} Entity representing the model, which will have {@link Entity.isModel} set ````true```` and will be registered by {@link Entity.id} in {@link Scene.models}
+   * @returns {SceneModel} SceneModel representing the model, which will have {@link Entity.isModel} set ````true```` and will be registered by {@link Entity.id} in {@link Scene.models}.
    */
-  load(params: LoadGLTFModel): Entity;
+  load(params: LoadGLTFModel): SceneModel;
 }

package/types/plugins/LASLoaderPlugin/LASLoaderPlugin.d.ts

@@ -1,4 +1,4 @@
-import { Entity, Plugin, Viewer } from "../../viewer";
+import { Entity, Plugin, SceneModel, Viewer } from "../../viewer";
 import { ModelStats } from "../index";
 
 export declare interface ILASDefaultDataSource {
@@ -142,5 +142,5 @@ export declare class LASLoaderPlugin extends Plugin {
    * @param {LoadLASModel} params Loading parameters.
    * @returns {SceneModel} SceneModel representing the model, which will have {@link Entity.isModel} set ````true```` and will be registered by {@link Entity.id} in {@link Scene.models}.
    */
-  load(params?: LoadLASModel): Entity;
+  load(params?: LoadLASModel): SceneModel;
 }

package/types/plugins/OBJLoaderPlugin/OBJLoaderPlugin.d.ts

@@ -1,4 +1,4 @@
-import { Plugin, Viewer, Entity } from "../../viewer";
+import { Entity, Node, Plugin, Viewer } from "../../viewer";
 
 export declare type LoadOBJModel = {
   /** ID to assign to the model's root {@link Entity}, unique among all components in the Viewer's {@link Scene}. */
@@ -38,7 +38,7 @@ export declare class OBJLoaderPlugin extends Plugin {
    * Loads an OBJ model from a file into this OBJLoader's {@link Viewer}.
    *
    * @param {LoadOBJModel} params  Loading parameters.
-   * @returns {Entity} Entity representing the model, which will have {@link Entity.isModel} set ````true```` and will be registered by {@link Entity.id} in {@link Scene.models}
+   * @returns {Node} An {@link Entity} that is a scene graph node that can have child Nodes and {@link Mesh}es.
    */
-  load(params: LoadOBJModel): Entity;
+  load(params: LoadOBJModel): Node;
 }