@shapediver/viewer.rendering-engine.rendering-engine-threejs 3.11.0 → 3.11.2

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.
@@ -1 +1 @@
1
- {"version":3,"file":"HTMLElementAnchorLoader.d.ts","sourceRoot":"","sources":["../../src/loaders/HTMLElementAnchorLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAEN,qBAAqB,EACrB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAEnD,qBAAa,uBAAwB,YAAW,OAAO;IAe1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAZ7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAKvB;IACP,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;gBAMf,gBAAgB,EAAE,eAAe;IAS9D,IAAW,SAAS,IAAI,cAAc,CAErC;IAMM,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAoC9D,IAAI,IAAI,IAAI;IAIZ,IAAI,CACV,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,qBAAqB,EAC7B,oBAAoB,EAAE,OAAO,GAC3B,IAAI;IAuBA,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IActC,cAAc,CAAC,MAAM,EAAE,OAAO;CAiBrC"}
1
+ {"version":3,"file":"HTMLElementAnchorLoader.d.ts","sourceRoot":"","sources":["../../src/loaders/HTMLElementAnchorLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAEN,qBAAqB,EACrB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAEnD,qBAAa,uBAAwB,YAAW,OAAO;IAe1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAZ7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAKvB;IACP,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;gBAMf,gBAAgB,EAAE,eAAe;IAS9D,IAAW,SAAS,IAAI,cAAc,CAErC;IAMM,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IA2C9D,IAAI,IAAI,IAAI;IAIZ,IAAI,CACV,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,qBAAqB,EAC7B,oBAAoB,EAAE,OAAO,GAC3B,IAAI;IAuBA,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IActC,cAAc,CAAC,MAAM,EAAE,OAAO;CAiBrC"}
@@ -23,11 +23,13 @@ class HTMLElementAnchorLoader {
23
23
  adjustPositions(scaleWidth, scaleHeight) {
24
24
  for (const anchorId in this._htmlElements) {
25
25
  const anchor = this._htmlElements[anchorId].anchor;
26
- const { page, container, client, hidden } = this._renderingEngine.sceneTracingManager.convert3Dto2D(gl_matrix_1.vec3.clone(anchor.location));
26
+ let node = this._htmlElements[anchorId].node;
27
+ // get the transformation from the node
28
+ const transformedAnchor = gl_matrix_1.vec3.transformMat4(gl_matrix_1.vec3.create(), anchor.location, node.worldMatrix);
29
+ const { page, container, client, hidden } = this._renderingEngine.sceneTracingManager.convert3Dto2D(transformedAnchor);
27
30
  const htmlElement = anchor.createViewerHtmlElement(this._renderingEngine.id);
28
31
  if (!htmlElement)
29
32
  continue;
30
- let node = this._htmlElements[anchorId].node;
31
33
  let visible = node.visible;
32
34
  while (node.parent) {
33
35
  node = node.parent;
@@ -1 +1 @@
1
- {"version":3,"file":"HTMLElementAnchorLoader.js","sourceRoot":"","sources":["../../src/loaders/HTMLElementAnchorLoader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"HTMLElementAnchorLoader.js","sourceRoot":"","sources":["../../src/loaders/HTMLElementAnchorLoader.ts"],"names":[],"mappings":"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"}
@@ -71,7 +71,7 @@ export declare class MaterialLoader implements ILoader {
71
71
  assignEnvironmentMapRotation(value: quat): void;
72
72
  assignPointSize(p: number): void;
73
73
  cacheSize(): number;
74
- createMaterial(type: GEOMETRY_MATERIAL_TYPE, incomingData: IMaterialAbstractData | GeometryData, materialData: IMaterialAbstractData | null, materialSettings?: MaterialSettings): THREE.Material | THREE.MeshBasicMaterial | THREE.PointsMaterial | MultiPointsMaterial | THREE.LineBasicMaterial;
74
+ createMaterial(type: GEOMETRY_MATERIAL_TYPE, incomingData: IMaterialAbstractData | GeometryData, materialData: IMaterialAbstractData | null, materialSettings?: MaterialSettings): THREE.Material | THREE.LineBasicMaterial | THREE.MeshBasicMaterial | THREE.PointsMaterial | MultiPointsMaterial;
75
75
  emptyMaterialCache(): void;
76
76
  getMaterialProperties(materialData: IMaterialAbstractData | null, type: GEOMETRY_MATERIAL_TYPE, materialSettings?: MaterialSettings): {
77
77
  properties: ThreeJsMaterialParameterTypes;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shapediver/viewer.rendering-engine.rendering-engine-threejs",
3
- "version": "3.11.0",
3
+ "version": "3.11.2",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "author": "Michael Oppitz <michael@shapediver.com>",
@@ -38,21 +38,21 @@
38
38
  "testEnvironment": "node"
39
39
  },
40
40
  "dependencies": {
41
- "@shapediver/viewer.data-engine.gltf-converter": "3.11.0",
42
- "@shapediver/viewer.data-engine.shared-types": "3.11.0",
43
- "@shapediver/viewer.data-engine.tag3d-engine": "3.11.0",
44
- "@shapediver/viewer.rendering-engine.animation-engine": "3.11.0",
45
- "@shapediver/viewer.rendering-engine.animation-frame-engine": "3.11.0",
46
- "@shapediver/viewer.rendering-engine.camera-engine": "3.11.0",
47
- "@shapediver/viewer.rendering-engine.canvas-engine": "3.11.0",
48
- "@shapediver/viewer.rendering-engine.intersection-engine": "3.11.0",
49
- "@shapediver/viewer.rendering-engine.light-engine": "3.11.0",
50
- "@shapediver/viewer.rendering-engine.rendering-engine": "3.11.0",
51
- "@shapediver/viewer.shared.global-access-objects": "3.11.0",
52
- "@shapediver/viewer.shared.math": "3.11.0",
53
- "@shapediver/viewer.shared.node-tree": "3.11.0",
54
- "@shapediver/viewer.shared.services": "3.11.0",
55
- "@shapediver/viewer.shared.types": "3.11.0",
41
+ "@shapediver/viewer.data-engine.gltf-converter": "3.11.2",
42
+ "@shapediver/viewer.data-engine.shared-types": "3.11.2",
43
+ "@shapediver/viewer.data-engine.tag3d-engine": "3.11.2",
44
+ "@shapediver/viewer.rendering-engine.animation-engine": "3.11.2",
45
+ "@shapediver/viewer.rendering-engine.animation-frame-engine": "3.11.2",
46
+ "@shapediver/viewer.rendering-engine.camera-engine": "3.11.2",
47
+ "@shapediver/viewer.rendering-engine.canvas-engine": "3.11.2",
48
+ "@shapediver/viewer.rendering-engine.intersection-engine": "3.11.2",
49
+ "@shapediver/viewer.rendering-engine.light-engine": "3.11.2",
50
+ "@shapediver/viewer.rendering-engine.rendering-engine": "3.11.2",
51
+ "@shapediver/viewer.shared.global-access-objects": "3.11.2",
52
+ "@shapediver/viewer.shared.math": "3.11.2",
53
+ "@shapediver/viewer.shared.node-tree": "3.11.2",
54
+ "@shapediver/viewer.shared.services": "3.11.2",
55
+ "@shapediver/viewer.shared.types": "3.11.2",
56
56
  "@tweenjs/tween.js": "^18.6.4",
57
57
  "@types/stats.js": "^0.17.0",
58
58
  "@types/three": "0.162.0",
@@ -61,5 +61,5 @@
61
61
  "stats.js": "^0.17.0",
62
62
  "three": "0.162.0"
63
63
  },
64
- "gitHead": "eedc295a0c4840a150e5f6f70415a5af21a01158"
64
+ "gitHead": "93a7c4b008af522d79d5ea376a5fec70071ef364"
65
65
  }