@combeenation/3d-viewer 9.1.1 → 9.2.0-beta1
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.
- package/dist/lib-cjs/api/manager/gltfExportManager.d.ts +1 -5
- package/dist/lib-cjs/api/manager/gltfExportManager.js +3 -25
- package/dist/lib-cjs/api/manager/gltfExportManager.js.map +1 -1
- package/dist/lib-cjs/api/util/geometryHelper.d.ts +7 -0
- package/dist/lib-cjs/api/util/geometryHelper.js +112 -0
- package/dist/lib-cjs/api/util/geometryHelper.js.map +1 -0
- package/dist/lib-cjs/api/util/structureHelper.js +6 -1
- package/dist/lib-cjs/api/util/structureHelper.js.map +1 -1
- package/dist/lib-cjs/buildinfo.json +1 -1
- package/dist/lib-cjs/commonjs.tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/api/manager/gltfExportManager.ts +4 -27
- package/src/api/util/geometryHelper.ts +136 -0
- package/src/api/util/structureHelper.ts +5 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Viewer } from '../classes/viewer';
|
|
2
2
|
import { PBRMaterial } from '@babylonjs/core/Materials/PBR/pbrMaterial';
|
|
3
|
+
import { Scene } from '@babylonjs/core/scene';
|
|
3
4
|
import { IExportOptions } from '@babylonjs/serializers/glTF/2.0';
|
|
4
5
|
declare type MetadataMap = {
|
|
5
6
|
[key: string]: any;
|
|
@@ -97,10 +98,5 @@ export declare class GltfExportManager {
|
|
|
97
98
|
* Duplicate names lead to problems in AR on iOS devices.
|
|
98
99
|
*/
|
|
99
100
|
protected setUniqueMeshNames(scene: Scene): void;
|
|
100
|
-
/**
|
|
101
|
-
* Stores the effect of all mesh transformations in their geometry and reset the transformation afterwards.
|
|
102
|
-
* In this way negative scalings which lead to problems in AR on iOS devices can be eliminated.
|
|
103
|
-
*/
|
|
104
|
-
protected bakeTransformations(scene: Scene): void;
|
|
105
101
|
}
|
|
106
102
|
export {};
|
|
@@ -44,6 +44,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
44
44
|
};
|
|
45
45
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
46
46
|
exports.GltfExportManager = void 0;
|
|
47
|
+
const geometryHelper_1 = require("..//util/geometryHelper");
|
|
47
48
|
const viewer_1 = require("../classes/viewer");
|
|
48
49
|
const babylonHelper_1 = require("../util/babylonHelper");
|
|
49
50
|
const structureHelper_1 = require("../util/structureHelper");
|
|
@@ -51,9 +52,7 @@ const engine_1 = require("@babylonjs/core/Engines/engine");
|
|
|
51
52
|
const sceneLoader_1 = require("@babylonjs/core/Loading/sceneLoader");
|
|
52
53
|
const pbrMaterial_1 = require("@babylonjs/core/Materials/PBR/pbrMaterial");
|
|
53
54
|
const math_color_1 = require("@babylonjs/core/Maths/math.color");
|
|
54
|
-
const math_vector_1 = require("@babylonjs/core/Maths/math.vector");
|
|
55
55
|
const abstractMesh_1 = require("@babylonjs/core/Meshes/abstractMesh");
|
|
56
|
-
const mesh_1 = require("@babylonjs/core/Meshes/mesh");
|
|
57
56
|
const transformNode_1 = require("@babylonjs/core/Meshes/transformNode");
|
|
58
57
|
const sceneSerializer_1 = require("@babylonjs/core/Misc/sceneSerializer");
|
|
59
58
|
const _2_0_1 = require("@babylonjs/serializers/glTF/2.0");
|
|
@@ -180,7 +179,8 @@ class GltfExportManager {
|
|
|
180
179
|
}
|
|
181
180
|
if (optimizeForAR) {
|
|
182
181
|
this.setUniqueMeshNames(copiedScene);
|
|
183
|
-
|
|
182
|
+
// get rid of negative scalings and morph targets, since iOS can't handle it in the QuickLook app
|
|
183
|
+
(0, geometryHelper_1.bakeGeometryOfAllMeshes)(copiedScene);
|
|
184
184
|
}
|
|
185
185
|
return { scene: copiedScene, sceneCopied: true };
|
|
186
186
|
});
|
|
@@ -302,28 +302,6 @@ class GltfExportManager {
|
|
|
302
302
|
currMesh.name = `${currMesh.name}_${currMesh.uniqueId}`;
|
|
303
303
|
});
|
|
304
304
|
}
|
|
305
|
-
/**
|
|
306
|
-
* Stores the effect of all mesh transformations in their geometry and reset the transformation afterwards.
|
|
307
|
-
* In this way negative scalings which lead to problems in AR on iOS devices can be eliminated.
|
|
308
|
-
*/
|
|
309
|
-
bakeTransformations(scene) {
|
|
310
|
-
scene.meshes.forEach(mesh => {
|
|
311
|
-
if (mesh instanceof mesh_1.Mesh && mesh.geometry) {
|
|
312
|
-
// geometries can be shared across multiple meshes, first make them unique to avoid side-effects
|
|
313
|
-
mesh.makeGeometryUnique();
|
|
314
|
-
// this is the core functionality for storing the transformation data in the mesh geometry
|
|
315
|
-
mesh.bakeCurrentTransformIntoVertices();
|
|
316
|
-
}
|
|
317
|
-
});
|
|
318
|
-
// some nodes (mostly transform nodes), are not affected by the baking algorithm since they have no geometry
|
|
319
|
-
// => reset their transformation manually
|
|
320
|
-
const allNodes = scene.getNodes().filter(node => node instanceof transformNode_1.TransformNode);
|
|
321
|
-
allNodes.forEach(node => {
|
|
322
|
-
node.position = new math_vector_1.Vector3(0, 0, 0);
|
|
323
|
-
node.rotation = new math_vector_1.Vector3(0, 0, 0);
|
|
324
|
-
node.scaling = new math_vector_1.Vector3(1, 1, 1);
|
|
325
|
-
});
|
|
326
|
-
}
|
|
327
305
|
}
|
|
328
306
|
exports.GltfExportManager = GltfExportManager;
|
|
329
307
|
GltfExportManager._CLONED_FROM_MAT_METADATA_PROPERTY = 'clonedFrom';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gltfExportManager.js","sourceRoot":"","sources":["../../../../src/api/manager/gltfExportManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA2C;AAC3C,yDAAuD;AACvD,6DAAwE;AACxE,2DAAwD;AACxD,qEAAkE;AAClE,2EAAwE;AACxE,iEAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"gltfExportManager.js","sourceRoot":"","sources":["../../../../src/api/manager/gltfExportManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Removes morph targets and sets transformation values back to their default values.
|
|
3
|
+
* The effects from morph targets and tranformation values will be "baked" in the geometry, so that the final appearance
|
|
4
|
+
* of the meshes stay the same.
|
|
5
|
+
*/
|
|
6
|
+
declare const bakeGeometryOfAllMeshes: (scene: Scene) => void;
|
|
7
|
+
export { bakeGeometryOfAllMeshes };
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.bakeGeometryOfAllMeshes = void 0;
|
|
4
|
+
const buffer_1 = require("@babylonjs/core/Buffers/buffer");
|
|
5
|
+
const math_vector_1 = require("@babylonjs/core/Maths/math.vector");
|
|
6
|
+
const instancedMesh_1 = require("@babylonjs/core/Meshes/instancedMesh");
|
|
7
|
+
const mesh_1 = require("@babylonjs/core/Meshes/mesh");
|
|
8
|
+
const transformNode_1 = require("@babylonjs/core/Meshes/transformNode");
|
|
9
|
+
/**
|
|
10
|
+
* Removes morph targets and sets transformation values back to their default values.
|
|
11
|
+
* The effects from morph targets and tranformation values will be "baked" in the geometry, so that the final appearance
|
|
12
|
+
* of the meshes stay the same.
|
|
13
|
+
*/
|
|
14
|
+
const bakeGeometryOfAllMeshes = function (scene) {
|
|
15
|
+
// instanced meshes have to be converted, since they share the geometry of the source mesh, which would lead to issues
|
|
16
|
+
// when baking the transformation values
|
|
17
|
+
scene.meshes.forEach(mesh => {
|
|
18
|
+
if (mesh instanceof instancedMesh_1.InstancedMesh) {
|
|
19
|
+
convertInstancedMeshToMesh(mesh);
|
|
20
|
+
}
|
|
21
|
+
});
|
|
22
|
+
// do the geometry baking for all meshes in the scene
|
|
23
|
+
scene.meshes.forEach(mesh => {
|
|
24
|
+
if (mesh instanceof mesh_1.Mesh) {
|
|
25
|
+
bakeGeometryOfMesh(mesh);
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
// some nodes (mostly transform nodes), are not affected by the baking algorithm since they have no geometry
|
|
29
|
+
// => reset their transformation manually
|
|
30
|
+
const allNodes = scene.getNodes().filter(node => node instanceof transformNode_1.TransformNode);
|
|
31
|
+
allNodes.forEach(node => {
|
|
32
|
+
resetTransformation(node);
|
|
33
|
+
});
|
|
34
|
+
};
|
|
35
|
+
exports.bakeGeometryOfAllMeshes = bakeGeometryOfAllMeshes;
|
|
36
|
+
const convertInstancedMeshToMesh = function (instancedMesh) {
|
|
37
|
+
// first create a clone of the source mesh
|
|
38
|
+
const newMesh = instancedMesh.sourceMesh.clone(`${instancedMesh.name}`, instancedMesh.parent);
|
|
39
|
+
// apply the transformation data
|
|
40
|
+
newMesh.position = instancedMesh.position;
|
|
41
|
+
newMesh.rotation = instancedMesh.rotation;
|
|
42
|
+
newMesh.rotationQuaternion = instancedMesh.rotationQuaternion;
|
|
43
|
+
newMesh.scaling = instancedMesh.scaling;
|
|
44
|
+
// also sync the enabled state from the original instanced mesh
|
|
45
|
+
newMesh.setEnabled(instancedMesh.isEnabled(false));
|
|
46
|
+
// re-assign children of the original mesh, since that one won't be used anymore
|
|
47
|
+
instancedMesh.getChildren(undefined).forEach(childNode => (childNode.parent = newMesh));
|
|
48
|
+
// finally delete the original instanced mesh
|
|
49
|
+
instancedMesh.dispose();
|
|
50
|
+
};
|
|
51
|
+
const bakeGeometryOfMesh = function (mesh) {
|
|
52
|
+
if (!mesh.geometry) {
|
|
53
|
+
// no geometry available, nothing to do
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
// geometries can be shared across multiple meshes, first make them unique to avoid side-effects
|
|
57
|
+
mesh.makeGeometryUnique();
|
|
58
|
+
const morphTargetManager = mesh.morphTargetManager;
|
|
59
|
+
const geometry = mesh.geometry;
|
|
60
|
+
if (morphTargetManager === null || morphTargetManager === void 0 ? void 0 : morphTargetManager.numTargets) {
|
|
61
|
+
// apply morph target vertices data to mesh geometry
|
|
62
|
+
// mostly only the "PositionKind" is implemented
|
|
63
|
+
bakeMorphTargetManagerIntoVertices(buffer_1.VertexBuffer.PositionKind, morphTargetManager, geometry);
|
|
64
|
+
bakeMorphTargetManagerIntoVertices(buffer_1.VertexBuffer.NormalKind, morphTargetManager, geometry);
|
|
65
|
+
bakeMorphTargetManagerIntoVertices(buffer_1.VertexBuffer.TangentKind, morphTargetManager, geometry);
|
|
66
|
+
bakeMorphTargetManagerIntoVertices(buffer_1.VertexBuffer.UVKind, morphTargetManager, geometry);
|
|
67
|
+
// remove morph target manager with all it's morph targets
|
|
68
|
+
mesh.morphTargetManager = null;
|
|
69
|
+
}
|
|
70
|
+
// bake the transformation data in the mesh geometry, fortunately there is already a help function from Babylon.js
|
|
71
|
+
mesh.bakeCurrentTransformIntoVertices();
|
|
72
|
+
};
|
|
73
|
+
const bakeMorphTargetManagerIntoVertices = function (kind, morphTargetManager, geometry) {
|
|
74
|
+
const origVerticesData = geometry.getVerticesData(kind);
|
|
75
|
+
if (!origVerticesData) {
|
|
76
|
+
// no vertices data for this kind availabe on the mesh geometry
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
let verticesData = [...origVerticesData];
|
|
80
|
+
for (let i = 0; i < morphTargetManager.numTargets; i++) {
|
|
81
|
+
const target = morphTargetManager.getTarget(i);
|
|
82
|
+
const targetVerticesData = getVerticesDataFromMorphTarget(kind, target);
|
|
83
|
+
if (targetVerticesData) {
|
|
84
|
+
// vertices data of this kind are implemented on the morph target
|
|
85
|
+
// add the influence of this morph target to the vertices data
|
|
86
|
+
// formula is taken from: https://doc.babylonjs.com/features/featuresDeepDive/mesh/morphTargets#basics
|
|
87
|
+
verticesData = verticesData.map((oldVal, idx) => oldVal + (targetVerticesData[idx] - origVerticesData[idx]) * target.influence);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
// apply the updated vertices data
|
|
91
|
+
geometry.setVerticesData(kind, verticesData);
|
|
92
|
+
};
|
|
93
|
+
const getVerticesDataFromMorphTarget = function (kind, morphTarget) {
|
|
94
|
+
switch (kind) {
|
|
95
|
+
case 'position':
|
|
96
|
+
return morphTarget.getPositions();
|
|
97
|
+
case 'normal':
|
|
98
|
+
return morphTarget.getNormals();
|
|
99
|
+
case 'tangent':
|
|
100
|
+
return morphTarget.getTangents();
|
|
101
|
+
case 'uv':
|
|
102
|
+
return morphTarget.getUVs();
|
|
103
|
+
}
|
|
104
|
+
return null;
|
|
105
|
+
};
|
|
106
|
+
const resetTransformation = function (node) {
|
|
107
|
+
node.position = new math_vector_1.Vector3(0, 0, 0);
|
|
108
|
+
node.rotation = new math_vector_1.Vector3(0, 0, 0);
|
|
109
|
+
node.rotationQuaternion = null;
|
|
110
|
+
node.scaling = new math_vector_1.Vector3(1, 1, 1);
|
|
111
|
+
};
|
|
112
|
+
//# sourceMappingURL=geometryHelper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"geometryHelper.js","sourceRoot":"","sources":["../../../../src/api/util/geometryHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,12 @@ const tags_1 = require("@babylonjs/core/Misc/tags");
|
|
|
15
15
|
*/
|
|
16
16
|
const isNodeIncludedInExclusionList = function (node, list) {
|
|
17
17
|
const checkNode = (inputNode, nodeToCheck) => {
|
|
18
|
-
|
|
18
|
+
var _a, _b;
|
|
19
|
+
// return inputNode.uniqueId === nodeToCheck.uniqueId;
|
|
20
|
+
// check name instead of unique id, since the unique id changes when copying the scene, which is the case in the
|
|
21
|
+
// GLB export
|
|
22
|
+
const nodeName = (_b = (_a = nodeToCheck.metadata) === null || _a === void 0 ? void 0 : _a[gltfExportManager_1.GltfExportManager.NAME_BEFORE_EXPORT_METADATA_PROPERTY]) !== null && _b !== void 0 ? _b : nodeToCheck.name;
|
|
23
|
+
return inputNode.name === nodeName;
|
|
19
24
|
};
|
|
20
25
|
const checkElement = (inputEl, nodeToCheck) => {
|
|
21
26
|
return inputEl.nodesFlat.some(m => checkNode(m, nodeToCheck));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"structureHelper.js","sourceRoot":"","sources":["../../../../src/api/util/structureHelper.ts"],"names":[],"mappings":";;;AAAA,gDAA6C;AAC7C,gDAA6C;AAC7C,gEAA6D;AAC7D,oEAAiE;AACjE,wEAAqE;AACrE,oDAAiD;AAEjD;;;;;GAKG;AACH,MAAM,6BAA6B,GAAG,UAAU,IAAmB,EAAE,IAA0B;IAC7F,MAAM,SAAS,GAAG,CAAC,SAAwB,EAAE,WAA0B,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"structureHelper.js","sourceRoot":"","sources":["../../../../src/api/util/structureHelper.ts"],"names":[],"mappings":"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"}
|