@xeokit/xeokit-sdk 2.4.2-beta-8 → 2.4.2-beta-9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.4.2-beta-8",
+  "version": "2.4.2-beta-9",
   "description": "Web Programming Toolkit for 3D/2D BIM and AEC Graphics",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/viewer/metadata/MetaModel.js

@@ -151,8 +151,7 @@ class MetaModel {
      * @property rootMetaObject
      * @type {MetaObject|null}
      */
-    get rootMetaObject()
-    {
+    get rootMetaObject() {
         if (this.rootMetaObjects.length == 1) {
             return this.rootMetaObjects[0];
         }
@@ -172,6 +171,7 @@ class MetaModel {
         this._globalizeIDs(metaModelData, options)
 
         const metaScene = this.metaScene;
+        const propertyLookup = metaModelData.properties;
 
         // Create global Property Sets
 
@@ -180,6 +180,9 @@ class MetaModel {
                 const propertySetData = metaModelData.propertySets[i];
                 let propertySet = metaScene.propertySets[propertySetData.id];
                 if (!propertySet) {
+                    if (propertyLookup) {
+                        this._decompressProperties(propertyLookup, propertySetData.properties);
+                    }
                     propertySet = new PropertySet({
                         id: propertySetData.id,
                         originalSystemId: propertySetData.originalSystemId || propertySetData.id,
@@ -225,6 +228,18 @@ class MetaModel {
         }
     }
 
+    _decompressProperties(propertyLookup, properties) {
+        for (let i = 0, len = properties.length; i < len; i++) {
+            const property = properties[i];
+            if (Number.isInteger(property)) {
+                const lookupProperty = propertyLookup[property];
+                if (lookupProperty) {
+                    properties[i] = lookupProperty;
+                }
+            }
+        }
+    }
+
     finalize() {
 
         if (this.finalized) {

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

@@ -522,6 +522,11 @@ class LinesInstancingLayer {
     }
 
     setMatrix(portionId, matrix) {
+
+        ////////////////////////////////////////
+        // TODO: Update portion matrix
+        ////////////////////////////////////////
+
         if (!this._finalized) {
             throw "Not finalized";
         }

package/src/viewer/scene/model/vbo/pointsInstancing/PointsInstancingLayer.js

@@ -427,6 +427,10 @@ class PointsInstancingLayer {
     }
 
     // setMatrix(portionId, matrix) {
+
+    ////////////////////////////////////////
+    // TODO: Update portion matrix
+    ////////////////////////////////////////
     //
     //     if (!this._finalized) {
     //         throw "Not finalized";

package/src/viewer/scene/model/vbo/trianglesInstancing/TrianglesInstancingLayer.js

@@ -752,28 +752,33 @@ class TrianglesInstancingLayer {
         if (!this._finalized) {
             throw "Not finalized";
         }
-            var offset = portionId * 4;
 
-            tempFloat32Vec4[0] = matrix[0];
-            tempFloat32Vec4[1] = matrix[4];
-            tempFloat32Vec4[2] = matrix[8];
-            tempFloat32Vec4[3] = matrix[12];
+        ////////////////////////////////////////
+        // TODO: Update portion matrix
+        ////////////////////////////////////////
 
-            this._state.modelMatrixCol0Buf.setData(tempFloat32Vec4, offset);
+        var offset = portionId * 4;
 
-            tempFloat32Vec4[0] = matrix[1];
-            tempFloat32Vec4[1] = matrix[5];
-            tempFloat32Vec4[2] = matrix[9];
-            tempFloat32Vec4[3] = matrix[13];
+        tempFloat32Vec4[0] = matrix[0];
+        tempFloat32Vec4[1] = matrix[4];
+        tempFloat32Vec4[2] = matrix[8];
+        tempFloat32Vec4[3] = matrix[12];
 
-            this._state.modelMatrixCol1Buf.setData(tempFloat32Vec4, offset);
+        this._state.modelMatrixCol0Buf.setData(tempFloat32Vec4, offset);
 
-            tempFloat32Vec4[0] = matrix[2];
-            tempFloat32Vec4[1] = matrix[6];
-            tempFloat32Vec4[2] = matrix[10];
-            tempFloat32Vec4[3] = matrix[14];
+        tempFloat32Vec4[0] = matrix[1];
+        tempFloat32Vec4[1] = matrix[5];
+        tempFloat32Vec4[2] = matrix[9];
+        tempFloat32Vec4[3] = matrix[13];
 
-            this._state.modelMatrixCol2Buf.setData(tempFloat32Vec4, offset);
+        this._state.modelMatrixCol1Buf.setData(tempFloat32Vec4, offset);
+
+        tempFloat32Vec4[0] = matrix[2];
+        tempFloat32Vec4[1] = matrix[6];
+        tempFloat32Vec4[2] = matrix[10];
+        tempFloat32Vec4[3] = matrix[14];
+
+        this._state.modelMatrixCol2Buf.setData(tempFloat32Vec4, offset);
     }
 
     // ---------------------- COLOR RENDERING -----------------------------------

package/types/viewer/scene/mesh/Mesh.d.ts

@@ -783,4 +783,11 @@ export declare class Mesh extends Component implements Omit<Entity, 'parent'> {
    * @returns {number}
    */
   stateSortCompare(mesh1: Mesh, mesh2: Mesh): number;
+
+  /**
+   * Gets the World, View and Canvas-space positions of each vertex in a callback.
+   *
+   * @param callback
+   */
+  getEachVertex(callback: any): void;
 }