@xeokit/xeokit-sdk 2.6.50 → 2.6.51

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/dist/xeokit-sdk.cjs.js +14 -22
  2. package/dist/xeokit-sdk.es.js +14 -22
  3. package/dist/xeokit-sdk.es5.js +71 -71
  4. package/dist/xeokit-sdk.min.cjs.js +3 -3
  5. package/dist/xeokit-sdk.min.es.js +3 -3
  6. package/dist/xeokit-sdk.min.es5.js +3 -3
  7. package/package.json +1 -1
  8. package/src/plugins/AngleMeasurementsPlugin/AngleMeasurementsMouseControl.js +5 -5
  9. package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsMouseControl.js +5 -5
  10. package/src/plugins/TreeViewPlugin/TreeViewPlugin.js +3 -3
  11. package/src/viewer/metadata/MetaModel.js +2 -2
  12. package/src/viewer/scene/model/SceneModel.js +1 -7
  13. package/types/plugins/TreeViewPlugin/renderService.d.ts +1 -1
package/dist/xeokit-sdk.cjs.js CHANGED
@@ -12936,9 +12936,6 @@ class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
12936
12936
  const mouseHoverCanvasPos = math.vec2();
12937
12937
  this._currentAngleMeasurement = null;
12938
12938
 
12939
- const getTop = el => el.offsetTop + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getTop(el.offsetParent));
12940
- const getLeft = el => el.offsetLeft + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getLeft(el.offsetParent));
12941
-
12942
12939
  const pagePos = math.vec2();
12943
12940
 
12944
12941
  const hoverOn = event => {
@@ -12973,8 +12970,10 @@ class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
12973
12970
  this.markerDiv.style.left = `${pagePos[0] - 5}px`;
12974
12971
  this.markerDiv.style.top = `${pagePos[1] - 5}px`;
12975
12972
  } else {
12976
- this.markerDiv.style.left = `${getLeft(canvas) + canvasPos[0] - 5}px`;
12977
- this.markerDiv.style.top = `${getTop(canvas) + canvasPos[1] - 5}px`;
12973
+ const markerPos = math.vec2(canvasPos);
12974
+ transformToNode(canvas, this.markerDiv.parentNode, markerPos);
12975
+ this.markerDiv.style.left = `${markerPos[0] - 5}px`;
12976
+ this.markerDiv.style.top = `${markerPos[1] - 5}px`;
12978
12977
  }
12979
12978
  break;
12980
12979
  case MOUSE_FINDING_CORNER:
@@ -84280,13 +84279,7 @@ class SceneModel extends Component {
84280
84279
  */
84281
84280
  set matrix(value) {
84282
84281
  this._matrix.set(value || DEFAULT_MATRIX);
84283
-
84284
- math.quaternionToRotationMat4(this._quaternion, this._worldRotationMatrix);
84285
- math.conjugateQuaternion(this._quaternion, this._conjugateQuaternion);
84286
- math.quaternionToRotationMat4(this._quaternion, this._worldRotationMatrixConjugate);
84287
- this._matrix.set(this._worldRotationMatrix);
84288
- math.translateMat4v(this._position, this._matrix);
84289
-
84282
+ math.decomposeMat4(this._matrix, this._position, this._quaternion, this._scale);
84290
84283
  this._matrixDirty = false;
84291
84284
  this._setWorldMatrixDirty();
84292
84285
  this._sceneModelDirty();
@@ -89384,9 +89377,6 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
89384
89377
 
89385
89378
  this._mouseState = MOUSE_FIRST_CLICK_EXPECTED;
89386
89379
 
89387
- const getTop = el => el.offsetTop + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getTop(el.offsetParent));
89388
- const getLeft = el => el.offsetLeft + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getLeft(el.offsetParent));
89389
-
89390
89380
  const pagePos = math.vec2();
89391
89381
 
89392
89382
  const hoverOn = event => {
@@ -89401,8 +89391,10 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
89401
89391
  this._markerDiv.style.left = `${pagePos[0] - 5}px`;
89402
89392
  this._markerDiv.style.top = `${pagePos[1] - 5}px`;
89403
89393
  } else {
89404
- this._markerDiv.style.left = `${getLeft(canvas) + canvasPos[0] - 5}px`;
89405
- this._markerDiv.style.top = `${getTop(canvas) + canvasPos[1] - 5}px`;
89394
+ const markerPos = math.vec2(canvasPos);
89395
+ transformToNode(canvas, this._markerDiv.parentNode, markerPos);
89396
+ this._markerDiv.style.left = `${markerPos[0] - 5}px`;
89397
+ this._markerDiv.style.top = `${markerPos[1] - 5}px`;
89406
89398
  }
89407
89399
 
89408
89400
  this._markerDiv.style.background = "pink";
@@ -101689,8 +101681,8 @@ class MetaModel {
101689
101681
 
101690
101682
  for (let modelId in metaScene.metaModels) {
101691
101683
  const metaModel = metaScene.metaModels[modelId];
101692
- for (let i = 0, len = metaModel.metaObjects.length; i < len; i++) {
101693
- const metaObject = metaModel.metaObjects[i];
101684
+ for (let objectId in metaModel.metaObjects) {
101685
+ const metaObject = metaModel.metaObjects[objectId];
101694
101686
  metaObject.metaModels.push(metaModel);
101695
101687
  }
101696
101688
  }
@@ -127243,7 +127235,7 @@ class TreeViewPlugin extends Plugin {
127243
127235
  buildingNode = {
127244
127236
  nodeId: `${this._id}-${objectId}`,
127245
127237
  objectId: objectId,
127246
- title: (metaObject.metaModels.length === 0) ? "na" : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
127238
+ title: (metaObject.metaModels.length === 0) ? metaObjectName : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
127247
127239
  type: metaObjectType,
127248
127240
  parent: null,
127249
127241
  numEntities: 0,
@@ -127346,7 +127338,7 @@ class TreeViewPlugin extends Plugin {
127346
127338
  rootNode = {
127347
127339
  nodeId: `${this._id}-${objectId}`,
127348
127340
  objectId: objectId,
127349
- title: metaObject.metaModels.length === 0 ? "na" : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
127341
+ title: metaObject.metaModels.length === 0 ? metaObjectName : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
127350
127342
  type: metaObjectType,
127351
127343
  parent: null,
127352
127344
  numEntities: 0,
@@ -127427,7 +127419,7 @@ class TreeViewPlugin extends Plugin {
127427
127419
  const node = {
127428
127420
  nodeId: `${this._id}-${objectId}`,
127429
127421
  objectId: objectId,
127430
- title: (!parent) ? metaObject.metaModels.length === 0 ? "na" : (this._rootNames[metaObject.metaModels[0].id] || metaObjectName) : (metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType,
127422
+ title: (!parent) ? metaObject.metaModels.length === 0 ? metaObjectName : (this._rootNames[metaObject.metaModels[0].id] || metaObjectName) : (metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType,
127431
127423
  type: metaObjectType,
127432
127424
  parent: parent,
127433
127425
  numEntities: 0,
package/dist/xeokit-sdk.es.js CHANGED
@@ -12932,9 +12932,6 @@ class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
12932
12932
  const mouseHoverCanvasPos = math.vec2();
12933
12933
  this._currentAngleMeasurement = null;
12934
12934
 
12935
- const getTop = el => el.offsetTop + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getTop(el.offsetParent));
12936
- const getLeft = el => el.offsetLeft + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getLeft(el.offsetParent));
12937
-
12938
12935
  const pagePos = math.vec2();
12939
12936
 
12940
12937
  const hoverOn = event => {
@@ -12969,8 +12966,10 @@ class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
12969
12966
  this.markerDiv.style.left = `${pagePos[0] - 5}px`;
12970
12967
  this.markerDiv.style.top = `${pagePos[1] - 5}px`;
12971
12968
  } else {
12972
- this.markerDiv.style.left = `${getLeft(canvas) + canvasPos[0] - 5}px`;
12973
- this.markerDiv.style.top = `${getTop(canvas) + canvasPos[1] - 5}px`;
12969
+ const markerPos = math.vec2(canvasPos);
12970
+ transformToNode(canvas, this.markerDiv.parentNode, markerPos);
12971
+ this.markerDiv.style.left = `${markerPos[0] - 5}px`;
12972
+ this.markerDiv.style.top = `${markerPos[1] - 5}px`;
12974
12973
  }
12975
12974
  break;
12976
12975
  case MOUSE_FINDING_CORNER:
@@ -84276,13 +84275,7 @@ class SceneModel extends Component {
84276
84275
  */
84277
84276
  set matrix(value) {
84278
84277
  this._matrix.set(value || DEFAULT_MATRIX);
84279
-
84280
- math.quaternionToRotationMat4(this._quaternion, this._worldRotationMatrix);
84281
- math.conjugateQuaternion(this._quaternion, this._conjugateQuaternion);
84282
- math.quaternionToRotationMat4(this._quaternion, this._worldRotationMatrixConjugate);
84283
- this._matrix.set(this._worldRotationMatrix);
84284
- math.translateMat4v(this._position, this._matrix);
84285
-
84278
+ math.decomposeMat4(this._matrix, this._position, this._quaternion, this._scale);
84286
84279
  this._matrixDirty = false;
84287
84280
  this._setWorldMatrixDirty();
84288
84281
  this._sceneModelDirty();
@@ -89380,9 +89373,6 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
89380
89373
 
89381
89374
  this._mouseState = MOUSE_FIRST_CLICK_EXPECTED;
89382
89375
 
89383
- const getTop = el => el.offsetTop + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getTop(el.offsetParent));
89384
- const getLeft = el => el.offsetLeft + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getLeft(el.offsetParent));
89385
-
89386
89376
  const pagePos = math.vec2();
89387
89377
 
89388
89378
  const hoverOn = event => {
@@ -89397,8 +89387,10 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
89397
89387
  this._markerDiv.style.left = `${pagePos[0] - 5}px`;
89398
89388
  this._markerDiv.style.top = `${pagePos[1] - 5}px`;
89399
89389
  } else {
89400
- this._markerDiv.style.left = `${getLeft(canvas) + canvasPos[0] - 5}px`;
89401
- this._markerDiv.style.top = `${getTop(canvas) + canvasPos[1] - 5}px`;
89390
+ const markerPos = math.vec2(canvasPos);
89391
+ transformToNode(canvas, this._markerDiv.parentNode, markerPos);
89392
+ this._markerDiv.style.left = `${markerPos[0] - 5}px`;
89393
+ this._markerDiv.style.top = `${markerPos[1] - 5}px`;
89402
89394
  }
89403
89395
 
89404
89396
  this._markerDiv.style.background = "pink";
@@ -101685,8 +101677,8 @@ class MetaModel {
101685
101677
 
101686
101678
  for (let modelId in metaScene.metaModels) {
101687
101679
  const metaModel = metaScene.metaModels[modelId];
101688
- for (let i = 0, len = metaModel.metaObjects.length; i < len; i++) {
101689
- const metaObject = metaModel.metaObjects[i];
101680
+ for (let objectId in metaModel.metaObjects) {
101681
+ const metaObject = metaModel.metaObjects[objectId];
101690
101682
  metaObject.metaModels.push(metaModel);
101691
101683
  }
101692
101684
  }
@@ -127239,7 +127231,7 @@ class TreeViewPlugin extends Plugin {
127239
127231
  buildingNode = {
127240
127232
  nodeId: `${this._id}-${objectId}`,
127241
127233
  objectId: objectId,
127242
- title: (metaObject.metaModels.length === 0) ? "na" : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
127234
+ title: (metaObject.metaModels.length === 0) ? metaObjectName : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
127243
127235
  type: metaObjectType,
127244
127236
  parent: null,
127245
127237
  numEntities: 0,
@@ -127342,7 +127334,7 @@ class TreeViewPlugin extends Plugin {
127342
127334
  rootNode = {
127343
127335
  nodeId: `${this._id}-${objectId}`,
127344
127336
  objectId: objectId,
127345
- title: metaObject.metaModels.length === 0 ? "na" : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
127337
+ title: metaObject.metaModels.length === 0 ? metaObjectName : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
127346
127338
  type: metaObjectType,
127347
127339
  parent: null,
127348
127340
  numEntities: 0,
@@ -127423,7 +127415,7 @@ class TreeViewPlugin extends Plugin {
127423
127415
  const node = {
127424
127416
  nodeId: `${this._id}-${objectId}`,
127425
127417
  objectId: objectId,
127426
- title: (!parent) ? metaObject.metaModels.length === 0 ? "na" : (this._rootNames[metaObject.metaModels[0].id] || metaObjectName) : (metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType,
127418
+ title: (!parent) ? metaObject.metaModels.length === 0 ? metaObjectName : (this._rootNames[metaObject.metaModels[0].id] || metaObjectName) : (metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType,
127427
127419
  type: metaObjectType,
127428
127420
  parent: parent,
127429
127421
  numEntities: 0,