@combeenation/3d-viewer 4.2.0 → 5.0.0-alpha1
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/README.md +2 -2
- package/dist/lib-cjs/api/classes/dottedPath.js +2 -5
- package/dist/lib-cjs/api/classes/dottedPath.js.map +1 -1
- package/dist/lib-cjs/api/classes/element.d.ts +9 -0
- package/dist/lib-cjs/api/classes/element.js +114 -66
- package/dist/lib-cjs/api/classes/element.js.map +1 -1
- package/dist/lib-cjs/api/classes/event.js.map +1 -1
- package/dist/lib-cjs/api/classes/eventBroadcaster.js.map +1 -1
- package/dist/lib-cjs/api/classes/parameter.js +3 -2
- package/dist/lib-cjs/api/classes/parameter.js.map +1 -1
- package/dist/lib-cjs/api/classes/parameterObservable.js.map +1 -1
- package/dist/lib-cjs/api/classes/parameterizable.js.map +1 -1
- package/dist/lib-cjs/api/classes/placementAnimation.d.ts +1 -0
- package/dist/lib-cjs/api/classes/placementAnimation.js +2 -2
- package/dist/lib-cjs/api/classes/placementAnimation.js.map +1 -1
- package/dist/lib-cjs/api/classes/variant.js +26 -19
- package/dist/lib-cjs/api/classes/variant.js.map +1 -1
- package/dist/lib-cjs/api/classes/variantInstance.js +19 -19
- package/dist/lib-cjs/api/classes/variantInstance.js.map +1 -1
- package/dist/lib-cjs/api/classes/variantParameterizable.js.map +1 -1
- package/dist/lib-cjs/api/classes/viewer.d.ts +40 -1
- package/dist/lib-cjs/api/classes/viewer.js +144 -48
- package/dist/lib-cjs/api/classes/viewer.js.map +1 -1
- package/dist/lib-cjs/api/classes/viewerLight.js +25 -25
- package/dist/lib-cjs/api/classes/viewerLight.js.map +1 -1
- package/dist/lib-cjs/api/internal/debugViewer.js +1 -2
- package/dist/lib-cjs/api/internal/debugViewer.js.map +1 -1
- package/dist/lib-cjs/api/internal/lensRendering.js.map +1 -1
- package/dist/lib-cjs/api/internal/sceneSetup.js +25 -22
- package/dist/lib-cjs/api/internal/sceneSetup.js.map +1 -1
- package/dist/lib-cjs/api/manager/animationManager.js +24 -15
- package/dist/lib-cjs/api/manager/animationManager.js.map +1 -1
- package/dist/lib-cjs/api/manager/gltfExportManager.d.ts +40 -10
- package/dist/lib-cjs/api/manager/gltfExportManager.js +135 -20
- package/dist/lib-cjs/api/manager/gltfExportManager.js.map +1 -1
- package/dist/lib-cjs/api/manager/sceneManager.js +3 -3
- package/dist/lib-cjs/api/manager/sceneManager.js.map +1 -1
- package/dist/lib-cjs/api/manager/variantInstanceManager.js +10 -7
- package/dist/lib-cjs/api/manager/variantInstanceManager.js.map +1 -1
- package/dist/lib-cjs/api/store/specStorage.js.map +1 -1
- package/dist/lib-cjs/api/util/babylonHelper.d.ts +1 -1
- package/dist/lib-cjs/api/util/babylonHelper.js +12 -15
- package/dist/lib-cjs/api/util/babylonHelper.js.map +1 -1
- package/dist/lib-cjs/api/util/globalTypes.d.ts +41 -25
- package/dist/lib-cjs/api/util/resourceHelper.js +3 -1
- package/dist/lib-cjs/api/util/resourceHelper.js.map +1 -1
- package/dist/lib-cjs/api/util/stringHelper.d.ts +1 -1
- package/dist/lib-cjs/api/util/stringHelper.js +2 -2
- package/dist/lib-cjs/api/util/stringHelper.js.map +1 -1
- package/dist/lib-cjs/api/util/structureHelper.d.ts +9 -0
- package/dist/lib-cjs/api/util/structureHelper.js +45 -0
- package/dist/lib-cjs/api/util/structureHelper.js.map +1 -0
- package/dist/lib-cjs/index.js +1 -0
- package/dist/lib-cjs/index.js.map +1 -1
- package/package.json +11 -7
- package/src/api/classes/animationInterface.ts +4 -6
- package/src/api/classes/dottedPath.ts +179 -187
- package/src/api/classes/element.ts +665 -621
- package/src/api/classes/event.ts +310 -313
- package/src/api/classes/eventBroadcaster.ts +47 -49
- package/src/api/classes/parameter.ts +394 -397
- package/src/api/classes/parameterObservable.ts +84 -83
- package/src/api/classes/parameterizable.ts +71 -73
- package/src/api/classes/placementAnimation.ts +130 -130
- package/src/api/classes/variant.ts +806 -778
- package/src/api/classes/variantInstance.ts +60 -52
- package/src/api/classes/variantParameterizable.ts +72 -67
- package/src/api/classes/viewer.ts +592 -490
- package/src/api/classes/viewerLight.ts +301 -301
- package/src/api/internal/debugViewer.ts +61 -53
- package/src/api/internal/lensRendering.ts +2 -3
- package/src/api/internal/sceneSetup.ts +144 -137
- package/src/api/manager/animationManager.ts +122 -97
- package/src/api/manager/gltfExportManager.ts +192 -0
- package/src/api/manager/sceneManager.ts +83 -86
- package/src/api/manager/variantInstanceManager.ts +234 -224
- package/src/api/store/specStorage.ts +48 -51
- package/src/api/util/babylonHelper.ts +329 -325
- package/src/api/util/globalTypes.ts +260 -246
- package/src/api/util/resourceHelper.ts +97 -109
- package/src/api/util/stringHelper.ts +13 -16
- package/src/api/util/structureHelper.ts +43 -0
- package/src/buildinfo.json +2 -2
- package/src/commonjs.tsconfig.json +8 -11
- package/src/declaration.tsconfig.json +6 -8
- package/src/dev.ts +28 -29
- package/src/es6.tsconfig.json +8 -11
- package/src/index.ts +40 -39
- package/src/pagesconfig.json +4 -0
- package/src/tsconfig.json +30 -41
- package/src/tsconfig.types.json +8 -9
- package/src/types.d.ts +0 -1
- package/dist/lib-cjs/api/classes/elementParameterizable.d.ts +0 -14
- package/dist/lib-cjs/api/classes/elementParameterizable.js +0 -135
- package/dist/lib-cjs/api/classes/elementParameterizable.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viewerLight.js","sourceRoot":"","sources":["../../../../src/api/classes/viewerLight.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"viewerLight.js","sourceRoot":"","sources":["../../../../src/api/classes/viewerLight.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ var DebugViewer = /** @class */ (function (_super) {
|
|
|
31
31
|
event_1.Event.VARIANT_INSTANCE_DESTROYED,
|
|
32
32
|
event_1.Event.VARIANT_INSTANCE_CREATED,
|
|
33
33
|
event_1.Event.VARIANT_INSTANCE_CLONED,
|
|
34
|
-
event_1.Event.VARIANT_PARAMETER_COMMITTED
|
|
34
|
+
event_1.Event.VARIANT_PARAMETER_COMMITTED,
|
|
35
35
|
]; _b < _c.length; _b++) {
|
|
36
36
|
event_3 = _c[_b];
|
|
37
37
|
this.eventEmitter.addListener(event_3, this.instanceDebugger.bind(this));
|
|
@@ -71,7 +71,6 @@ var DebugViewer = /** @class */ (function (_super) {
|
|
|
71
71
|
}
|
|
72
72
|
debugContainer.innerHTML = JSON.stringify(instances, null, 2);
|
|
73
73
|
};
|
|
74
|
-
;
|
|
75
74
|
DebugViewer.prototype.fpsDebugger = function () {
|
|
76
75
|
var debugContainer = document.getElementById('cyledge-combeenation-3d-viewer-fps-debugger');
|
|
77
76
|
if (!debugContainer) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debugViewer.js","sourceRoot":"","sources":["../../../../src/api/internal/debugViewer.ts"],"names":[],"mappings":";;;;AAKA,4CAA2C;AAC3C,0CAAyC;AAEzC;IAAiC,uCAAM;
|
|
1
|
+
{"version":3,"file":"debugViewer.js","sourceRoot":"","sources":["../../../../src/api/internal/debugViewer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lensRendering.js","sourceRoot":"","sources":["../../../../src/api/internal/lensRendering.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,iEAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"lensRendering.js","sourceRoot":"","sources":["../../../../src/api/internal/lensRendering.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,iEAA+D;AAC/D,sHAAqH;AAE5G,sGAFA,6CAAqB,OAEA"}
|
|
@@ -88,14 +88,15 @@ var processCamera = function (scene, name, cameraSetup) {
|
|
|
88
88
|
case 'arc': return [3 /*break*/, 1];
|
|
89
89
|
}
|
|
90
90
|
return [3 /*break*/, 3];
|
|
91
|
-
case 1: return [4 /*yield*/, Promise.resolve().then(function () { return require(
|
|
91
|
+
case 1: return [4 /*yield*/, Promise.resolve().then(function () { return require(
|
|
92
|
+
/* webpackChunkName: "arc-rotate-camera" */ '@babylonjs/core/Cameras/arcRotateCamera'); })];
|
|
92
93
|
case 2:
|
|
93
94
|
arcCameraModule = _b.sent();
|
|
94
95
|
camera = new arcCameraModule.ArcRotateCamera(name, Math.PI / 4, Math.PI / 4, 2, target, scene);
|
|
95
96
|
camera.metadata = {
|
|
96
97
|
alpha: Math.PI / 4,
|
|
97
98
|
beta: Math.PI / 4,
|
|
98
|
-
radius: 2
|
|
99
|
+
radius: 2,
|
|
99
100
|
};
|
|
100
101
|
return [3 /*break*/, 3];
|
|
101
102
|
case 3:
|
|
@@ -169,20 +170,22 @@ var sceneSetup = function (engine, sceneJson) {
|
|
|
169
170
|
case 11:
|
|
170
171
|
defaultPipeline = new defaultRenderingPipeline_1.DefaultRenderingPipeline('default-rendering-pipeline', false, scene);
|
|
171
172
|
/* DISABLED: causes problems with Internet Explorer
|
|
172
|
-
|
|
173
|
-
|
|
173
|
+
defaultPipeline.imageProcessingEnabled = true;
|
|
174
|
+
*/
|
|
174
175
|
if (sceneJson.scene.globals.aa) {
|
|
175
176
|
defaultPipeline.fxaaEnabled = true; //implicitly does FxaaPostProcess()
|
|
176
177
|
}
|
|
177
178
|
// Set samples regardless of fxaa setting since we don't want to use fxaa but still increase the sample count
|
|
178
179
|
defaultPipeline.samples = 8;
|
|
179
180
|
if (!sceneJson.scene.globals['camera-settings']) return [3 /*break*/, 13];
|
|
180
|
-
if (sceneJson.scene.globals['camera-settings'].sharpen &&
|
|
181
|
+
if (sceneJson.scene.globals['camera-settings'].sharpen &&
|
|
182
|
+
sceneJson.scene.globals['camera-settings'].sharpen.enabled) {
|
|
181
183
|
defaultPipeline.sharpenEnabled = true; //implicitly does SharpenPostProcess()
|
|
182
184
|
//defaultPipeline.sharpen.colorAmount = 1;
|
|
183
185
|
//defaultPipeline.sharpen.edgeAmount = 0;
|
|
184
186
|
}
|
|
185
|
-
if (sceneJson.scene.globals['camera-settings'].bloom &&
|
|
187
|
+
if (sceneJson.scene.globals['camera-settings'].bloom &&
|
|
188
|
+
sceneJson.scene.globals['camera-settings'].bloom.enabled) {
|
|
186
189
|
defaultPipeline.bloomEnabled = true;
|
|
187
190
|
if (sceneJson.scene.globals['camera-settings'].bloom.size) {
|
|
188
191
|
defaultPipeline.bloomScale = sceneJson.scene.globals['camera-settings'].bloom.size;
|
|
@@ -206,22 +209,22 @@ var sceneSetup = function (engine, sceneJson) {
|
|
|
206
209
|
case 13:
|
|
207
210
|
// TODO: make this dynamic
|
|
208
211
|
/*
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
212
|
+
const texture = new HDRCubeTexture("/assets/small_cave_1k.hdr", scene, 256);
|
|
213
|
+
texture.gammaSpace = false;
|
|
214
|
+
scene.environmentTexture = texture;
|
|
215
|
+
// scene.environmentTexture.
|
|
216
|
+
|
|
217
|
+
const skyboxMaterial = new StandardMaterial("skyBox", scene);
|
|
218
|
+
skyboxMaterial.backFaceCulling = false;
|
|
219
|
+
skyboxMaterial.reflectionTexture = texture;
|
|
220
|
+
skyboxMaterial.reflectionTexture.coordinatesMode = Texture.SKYBOX_MODE;
|
|
221
|
+
skyboxMaterial.disableLighting = false;
|
|
222
|
+
// TODO: replace with BoxBuilder
|
|
223
|
+
const skybox = MeshBuilder.CreateBox("skyBox", {size: 1000.0}, scene);
|
|
224
|
+
skybox.isPickable = false; //never pick a skybox
|
|
225
|
+
skybox.infiniteDistance = true;
|
|
226
|
+
skybox.material = skyboxMaterial;
|
|
227
|
+
*/
|
|
225
228
|
// TODO: shadows don't work with HemishpericLight
|
|
226
229
|
return [2 /*return*/, scene];
|
|
227
230
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sceneSetup.js","sourceRoot":"","sources":["../../../../src/api/internal/sceneSetup.ts"],"names":[],"mappings":";;;;AAEA,gDAA8C;AAC9C,uEAAqE;AACrE,+DAA0D;AAC1D,iEAA4D;AAE5D,kEAAiE;AACjE,4HAA2H;AAC3H,+CAA8C;AAC9C,uCAA8C;AAC9C,kDAAiD;AAEjD;;;;GAIG;AACH,IAAM,aAAa,GAAG,
|
|
1
|
+
{"version":3,"file":"sceneSetup.js","sourceRoot":"","sources":["../../../../src/api/internal/sceneSetup.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,27 +59,36 @@ var AnimationManager = /** @class */ (function () {
|
|
|
59
59
|
var alphaAnimation = new animation_1.Animation('alphaAnimation', 'alpha', 30, animation_1.Animation.ANIMATIONTYPE_FLOAT, animation_1.Animation.ANIMATIONLOOPMODE_CONSTANT);
|
|
60
60
|
var betaAnimation = new animation_1.Animation('betaAnimation', 'beta', 30, animation_1.Animation.ANIMATIONTYPE_FLOAT, animation_1.Animation.ANIMATIONLOOPMODE_CONSTANT);
|
|
61
61
|
var radiusAnimation = new animation_1.Animation('radiusAnimation', 'radius', 30, animation_1.Animation.ANIMATIONTYPE_FLOAT, animation_1.Animation.ANIMATIONLOOPMODE_CONSTANT);
|
|
62
|
-
alphaAnimation.setKeys([
|
|
62
|
+
alphaAnimation.setKeys([
|
|
63
|
+
{
|
|
63
64
|
frame: 0,
|
|
64
|
-
value: activeCamera.alpha
|
|
65
|
-
},
|
|
65
|
+
value: activeCamera.alpha,
|
|
66
|
+
},
|
|
67
|
+
{
|
|
66
68
|
frame: 100,
|
|
67
|
-
value: targetAlpha
|
|
68
|
-
}
|
|
69
|
-
|
|
69
|
+
value: targetAlpha,
|
|
70
|
+
},
|
|
71
|
+
]);
|
|
72
|
+
betaAnimation.setKeys([
|
|
73
|
+
{
|
|
70
74
|
frame: 0,
|
|
71
|
-
value: activeCamera.beta
|
|
72
|
-
},
|
|
75
|
+
value: activeCamera.beta,
|
|
76
|
+
},
|
|
77
|
+
{
|
|
73
78
|
frame: 100,
|
|
74
|
-
value: targetBeta
|
|
75
|
-
}
|
|
76
|
-
|
|
79
|
+
value: targetBeta,
|
|
80
|
+
},
|
|
81
|
+
]);
|
|
82
|
+
radiusAnimation.setKeys([
|
|
83
|
+
{
|
|
77
84
|
frame: 0,
|
|
78
|
-
value: activeCamera.radius
|
|
79
|
-
},
|
|
85
|
+
value: activeCamera.radius,
|
|
86
|
+
},
|
|
87
|
+
{
|
|
80
88
|
frame: 100,
|
|
81
|
-
value: targetRadius
|
|
82
|
-
}
|
|
89
|
+
value: targetRadius,
|
|
90
|
+
},
|
|
91
|
+
]);
|
|
83
92
|
activeCamera.animations.push(alphaAnimation);
|
|
84
93
|
activeCamera.animations.push(betaAnimation);
|
|
85
94
|
activeCamera.animations.push(radiusAnimation);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"animationManager.js","sourceRoot":"","sources":["../../../../src/api/manager/animationManager.ts"],"names":[],"mappings":";;;;AAAA,kEAAqF;AAIrF,+CAA+C;AAC/C,mEAAmE;AACnE,uCAAmC;AACnC,oEAAmE;AAEnE,sEAAsE;
|
|
1
|
+
{"version":3,"file":"animationManager.js","sourceRoot":"","sources":["../../../../src/api/manager/animationManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,35 +1,65 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { PBRMaterial } from '@babylonjs/core/Materials/PBR/pbrMaterial';
|
|
2
2
|
import { IExportOptions } from '@babylonjs/serializers';
|
|
3
3
|
export declare class GltfExportManager {
|
|
4
|
-
protected
|
|
4
|
+
protected viewer: Viewer;
|
|
5
5
|
/**
|
|
6
6
|
* Constructor.
|
|
7
7
|
*/
|
|
8
|
-
protected constructor(
|
|
8
|
+
protected constructor(viewer: Viewer);
|
|
9
9
|
/**
|
|
10
10
|
* Creates an {@link GltfExportManager}.
|
|
11
11
|
*/
|
|
12
|
-
static create(
|
|
12
|
+
static create(viewer: Viewer): Promise<GltfExportManager>;
|
|
13
13
|
/**
|
|
14
|
-
* Exports selected nodes to a
|
|
14
|
+
* Exports selected nodes to a file.
|
|
15
|
+
* @param filename optional name of the exported .GLB file.
|
|
15
16
|
* @param exportOptions export options to be merged with default options. See {@link gltfExportOptions}.
|
|
17
|
+
* @param excluded optional list of geometry (meshes, elements, variants, variantInstances) to be excluded from export.
|
|
16
18
|
*/
|
|
17
|
-
exportGlb(exportOptions?: IExportOptions): Promise<
|
|
19
|
+
exportGlb(filename?: string, exportOptions?: IExportOptions, excluded?: ExcludedGeometry): Promise<File | undefined>;
|
|
18
20
|
/**
|
|
19
21
|
* Exports selected nodes to GLTF. This may result in more than one file, since textures are exported separately.
|
|
20
22
|
* @param filename name of the main (text-based) .GLTF file referring to separate texture files.
|
|
21
23
|
* @param exportOptions export options to be merged with default options. See {@link gltfExportOptions}.
|
|
24
|
+
* @param excluded optional list of geometry (meshes, elements, variants, variantInstances) to be excluded from export.
|
|
22
25
|
*/
|
|
23
|
-
exportGltfToFile(filename: string, exportOptions?: IExportOptions): Promise<void>;
|
|
26
|
+
exportGltfToFile(filename: string, exportOptions?: IExportOptions, excluded?: ExcludedGeometry): Promise<void>;
|
|
24
27
|
/**
|
|
25
28
|
* Exports selected nodes to GLB. This results in one binary file.
|
|
26
29
|
* @param filename name of the .GLB file.
|
|
27
30
|
* @param exportOptions export options to be merged with default options. See {@link gltfExportOptions}.
|
|
31
|
+
* @param excluded optional list of geometry (meshes, elements, variants, variantInstances) to be excluded from export
|
|
28
32
|
*/
|
|
29
|
-
exportGlbToFile(filename: string, exportOptions?: IExportOptions): Promise<void>;
|
|
33
|
+
exportGlbToFile(filename: string, exportOptions?: IExportOptions, excluded?: ExcludedGeometry): Promise<void>;
|
|
30
34
|
/**
|
|
31
35
|
* Gets predefined {@link IExportOptions } merged with given ones.
|
|
32
|
-
* @protected
|
|
33
36
|
*/
|
|
34
|
-
protected gltfExportOptions(mergeWithOptions?: IExportOptions): IExportOptions;
|
|
37
|
+
protected gltfExportOptions(mergeWithOptions?: IExportOptions, excluded?: ExcludedGeometry): IExportOptions;
|
|
38
|
+
/**
|
|
39
|
+
* Stuff to be done before exporting to GLTF
|
|
40
|
+
*/
|
|
41
|
+
protected exportPreProcess(): void;
|
|
42
|
+
/**
|
|
43
|
+
* Stuff to be done after the GLTF export
|
|
44
|
+
*/
|
|
45
|
+
protected exportPostProcess(): void;
|
|
46
|
+
/**
|
|
47
|
+
* Materials with refraction set are not exported properly.
|
|
48
|
+
* Exchange all such (relevant) materials with a more export-friendly version
|
|
49
|
+
*/
|
|
50
|
+
protected exchangeRefractionMaterials(): void;
|
|
51
|
+
/**
|
|
52
|
+
* Restore original materials with set refraction.
|
|
53
|
+
*/
|
|
54
|
+
protected restoreRefractionMaterials(): void;
|
|
55
|
+
/**
|
|
56
|
+
* Create an export-friendly replacement material for a material using refraction.
|
|
57
|
+
* @param mat Material to be replaced
|
|
58
|
+
*/
|
|
59
|
+
protected createRefractionMaterialReplacement(mat: PBRMaterial): PBRMaterial;
|
|
60
|
+
/**
|
|
61
|
+
* Inspect if a material was temporarily cloned for GLB export
|
|
62
|
+
* @param mat Material to be inspected
|
|
63
|
+
*/
|
|
64
|
+
protected isMaterialClonedForExport(mat: PBRMaterial): boolean;
|
|
35
65
|
}
|
|
@@ -2,39 +2,62 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GltfExportManager = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
+
var core_1 = require("@babylonjs/core");
|
|
6
|
+
var pbrMaterial_1 = require("@babylonjs/core/Materials/PBR/pbrMaterial");
|
|
7
|
+
var math_color_1 = require("@babylonjs/core/Maths/math.color");
|
|
8
|
+
var abstractMesh_1 = require("@babylonjs/core/Meshes/abstractMesh");
|
|
5
9
|
var serializers_1 = require("@babylonjs/serializers");
|
|
10
|
+
var structureHelper_1 = require("../util/structureHelper");
|
|
6
11
|
var lodash_es_1 = require("lodash-es");
|
|
7
12
|
var GltfExportManager = /** @class */ (function () {
|
|
8
13
|
/**
|
|
9
14
|
* Constructor.
|
|
10
15
|
*/
|
|
11
|
-
function GltfExportManager(
|
|
12
|
-
this.
|
|
16
|
+
function GltfExportManager(viewer) {
|
|
17
|
+
this.viewer = viewer;
|
|
13
18
|
}
|
|
14
19
|
/**
|
|
15
20
|
* Creates an {@link GltfExportManager}.
|
|
16
21
|
*/
|
|
17
|
-
GltfExportManager.create = function (
|
|
22
|
+
GltfExportManager.create = function (viewer) {
|
|
18
23
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
19
24
|
return tslib_1.__generator(this, function (_a) {
|
|
20
|
-
return [2 /*return*/, new GltfExportManager(
|
|
25
|
+
return [2 /*return*/, new GltfExportManager(viewer)];
|
|
21
26
|
});
|
|
22
27
|
});
|
|
23
28
|
};
|
|
24
29
|
/**
|
|
25
|
-
* Exports selected nodes to a
|
|
30
|
+
* Exports selected nodes to a file.
|
|
31
|
+
* @param filename optional name of the exported .GLB file.
|
|
26
32
|
* @param exportOptions export options to be merged with default options. See {@link gltfExportOptions}.
|
|
33
|
+
* @param excluded optional list of geometry (meshes, elements, variants, variantInstances) to be excluded from export.
|
|
27
34
|
*/
|
|
28
|
-
GltfExportManager.prototype.exportGlb = function (exportOptions) {
|
|
35
|
+
GltfExportManager.prototype.exportGlb = function (filename, exportOptions, excluded) {
|
|
36
|
+
if (filename === void 0) { filename = 'glb-export.glb'; }
|
|
29
37
|
if (exportOptions === void 0) { exportOptions = {}; }
|
|
30
38
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
31
|
-
var glbData;
|
|
39
|
+
var glbData, resBlob;
|
|
32
40
|
return tslib_1.__generator(this, function (_a) {
|
|
33
41
|
switch (_a.label) {
|
|
34
|
-
case 0:
|
|
42
|
+
case 0:
|
|
43
|
+
this.exportPreProcess();
|
|
44
|
+
return [4 /*yield*/, serializers_1.GLTF2Export.GLBAsync(this.viewer.scene, 'dummy', this.gltfExportOptions(exportOptions, excluded))];
|
|
35
45
|
case 1:
|
|
36
46
|
glbData = _a.sent();
|
|
37
|
-
|
|
47
|
+
this.exportPostProcess();
|
|
48
|
+
resBlob = glbData.glTFFiles['dummy.glb'];
|
|
49
|
+
// check if result is valid, according to the typings this could also be a string
|
|
50
|
+
if (resBlob instanceof Blob) {
|
|
51
|
+
if (!filename.endsWith('.glb')) {
|
|
52
|
+
filename += '.glb';
|
|
53
|
+
}
|
|
54
|
+
return [2 /*return*/, new File([resBlob], filename)];
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
// result was not a valid blob
|
|
58
|
+
return [2 /*return*/, undefined];
|
|
59
|
+
}
|
|
60
|
+
return [2 /*return*/];
|
|
38
61
|
}
|
|
39
62
|
});
|
|
40
63
|
});
|
|
@@ -43,17 +66,21 @@ var GltfExportManager = /** @class */ (function () {
|
|
|
43
66
|
* Exports selected nodes to GLTF. This may result in more than one file, since textures are exported separately.
|
|
44
67
|
* @param filename name of the main (text-based) .GLTF file referring to separate texture files.
|
|
45
68
|
* @param exportOptions export options to be merged with default options. See {@link gltfExportOptions}.
|
|
69
|
+
* @param excluded optional list of geometry (meshes, elements, variants, variantInstances) to be excluded from export.
|
|
46
70
|
*/
|
|
47
|
-
GltfExportManager.prototype.exportGltfToFile = function (filename, exportOptions) {
|
|
71
|
+
GltfExportManager.prototype.exportGltfToFile = function (filename, exportOptions, excluded) {
|
|
48
72
|
if (exportOptions === void 0) { exportOptions = {}; }
|
|
49
73
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
50
74
|
return tslib_1.__generator(this, function (_a) {
|
|
51
75
|
switch (_a.label) {
|
|
52
|
-
case 0:
|
|
53
|
-
|
|
54
|
-
|
|
76
|
+
case 0:
|
|
77
|
+
this.exportPreProcess();
|
|
78
|
+
return [4 /*yield*/, serializers_1.GLTF2Export.GLTFAsync(this.viewer.scene, filename, this.gltfExportOptions(exportOptions, excluded)).then(function (glb) {
|
|
79
|
+
glb.downloadFiles();
|
|
80
|
+
})];
|
|
55
81
|
case 1:
|
|
56
82
|
_a.sent();
|
|
83
|
+
this.exportPostProcess();
|
|
57
84
|
return [2 /*return*/];
|
|
58
85
|
}
|
|
59
86
|
});
|
|
@@ -63,17 +90,21 @@ var GltfExportManager = /** @class */ (function () {
|
|
|
63
90
|
* Exports selected nodes to GLB. This results in one binary file.
|
|
64
91
|
* @param filename name of the .GLB file.
|
|
65
92
|
* @param exportOptions export options to be merged with default options. See {@link gltfExportOptions}.
|
|
93
|
+
* @param excluded optional list of geometry (meshes, elements, variants, variantInstances) to be excluded from export
|
|
66
94
|
*/
|
|
67
|
-
GltfExportManager.prototype.exportGlbToFile = function (filename, exportOptions) {
|
|
95
|
+
GltfExportManager.prototype.exportGlbToFile = function (filename, exportOptions, excluded) {
|
|
68
96
|
if (exportOptions === void 0) { exportOptions = {}; }
|
|
69
97
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
70
98
|
return tslib_1.__generator(this, function (_a) {
|
|
71
99
|
switch (_a.label) {
|
|
72
|
-
case 0:
|
|
73
|
-
|
|
74
|
-
|
|
100
|
+
case 0:
|
|
101
|
+
this.exportPreProcess();
|
|
102
|
+
return [4 /*yield*/, serializers_1.GLTF2Export.GLBAsync(this.viewer.scene, filename, this.gltfExportOptions(exportOptions, excluded)).then(function (glb) {
|
|
103
|
+
glb.downloadFiles();
|
|
104
|
+
})];
|
|
75
105
|
case 1:
|
|
76
106
|
_a.sent();
|
|
107
|
+
this.exportPostProcess();
|
|
77
108
|
return [2 /*return*/];
|
|
78
109
|
}
|
|
79
110
|
});
|
|
@@ -81,9 +112,8 @@ var GltfExportManager = /** @class */ (function () {
|
|
|
81
112
|
};
|
|
82
113
|
/**
|
|
83
114
|
* Gets predefined {@link IExportOptions } merged with given ones.
|
|
84
|
-
* @protected
|
|
85
115
|
*/
|
|
86
|
-
GltfExportManager.prototype.gltfExportOptions = function (mergeWithOptions) {
|
|
116
|
+
GltfExportManager.prototype.gltfExportOptions = function (mergeWithOptions, excluded) {
|
|
87
117
|
if (mergeWithOptions === void 0) { mergeWithOptions = {}; }
|
|
88
118
|
var defaultOptions = {
|
|
89
119
|
// includeCoordinateSystemConversionNodes: true,
|
|
@@ -97,11 +127,96 @@ var GltfExportManager = /** @class */ (function () {
|
|
|
97
127
|
if (node.name === '__bounding_box__') {
|
|
98
128
|
return false;
|
|
99
129
|
}
|
|
130
|
+
if (excluded && node instanceof core_1.Mesh && structureHelper_1.isMeshIncludedInExclusionList(node, excluded)) {
|
|
131
|
+
return false;
|
|
132
|
+
}
|
|
100
133
|
return true;
|
|
101
|
-
}
|
|
134
|
+
},
|
|
102
135
|
};
|
|
103
136
|
return lodash_es_1.merge({}, defaultOptions, mergeWithOptions);
|
|
104
137
|
};
|
|
138
|
+
/**
|
|
139
|
+
* Stuff to be done before exporting to GLTF
|
|
140
|
+
*/
|
|
141
|
+
GltfExportManager.prototype.exportPreProcess = function () {
|
|
142
|
+
this.viewer.pauseRendering();
|
|
143
|
+
this.exchangeRefractionMaterials();
|
|
144
|
+
};
|
|
145
|
+
/**
|
|
146
|
+
* Stuff to be done after the GLTF export
|
|
147
|
+
*/
|
|
148
|
+
GltfExportManager.prototype.exportPostProcess = function () {
|
|
149
|
+
this.restoreRefractionMaterials();
|
|
150
|
+
this.viewer.resumeRendering();
|
|
151
|
+
};
|
|
152
|
+
/**
|
|
153
|
+
* Materials with refraction set are not exported properly.
|
|
154
|
+
* Exchange all such (relevant) materials with a more export-friendly version
|
|
155
|
+
*/
|
|
156
|
+
GltfExportManager.prototype.exchangeRefractionMaterials = function () {
|
|
157
|
+
for (var _i = 0, _a = this.viewer.scene.getNodes(); _i < _a.length; _i++) {
|
|
158
|
+
var n = _a[_i];
|
|
159
|
+
if (!(n instanceof abstractMesh_1.AbstractMesh))
|
|
160
|
+
continue;
|
|
161
|
+
if (!(n.material instanceof pbrMaterial_1.PBRMaterial))
|
|
162
|
+
continue;
|
|
163
|
+
if (!n.material.subSurface.isRefractionEnabled)
|
|
164
|
+
continue;
|
|
165
|
+
if (n.material.transparencyMode !== pbrMaterial_1.PBRMaterial.PBRMATERIAL_OPAQUE)
|
|
166
|
+
continue;
|
|
167
|
+
// if we're here, we have a node holding a material with set refraction whose transparencyMode is set to PBRMATERIAL_OPAQUE
|
|
168
|
+
n.material = this.createRefractionMaterialReplacement(n.material);
|
|
169
|
+
}
|
|
170
|
+
};
|
|
171
|
+
/**
|
|
172
|
+
* Restore original materials with set refraction.
|
|
173
|
+
*/
|
|
174
|
+
GltfExportManager.prototype.restoreRefractionMaterials = function () {
|
|
175
|
+
for (var _i = 0, _a = this.viewer.scene.getNodes(); _i < _a.length; _i++) {
|
|
176
|
+
var n = _a[_i];
|
|
177
|
+
if (!(n instanceof abstractMesh_1.AbstractMesh))
|
|
178
|
+
continue;
|
|
179
|
+
if (!(n.material instanceof pbrMaterial_1.PBRMaterial))
|
|
180
|
+
continue;
|
|
181
|
+
if (!this.isMaterialClonedForExport(n.material))
|
|
182
|
+
continue;
|
|
183
|
+
// at this point we have a pbrmaterial tagged as cloned in its metadata that's set on a mesh
|
|
184
|
+
// restore and dispose
|
|
185
|
+
var currMaterial = n.material;
|
|
186
|
+
var prevMaterial = this.viewer.scene.getMaterialByUniqueID(n.material.metadata.clonedFrom);
|
|
187
|
+
if (prevMaterial) {
|
|
188
|
+
n.material = prevMaterial; // restore previous material
|
|
189
|
+
currMaterial.dispose(false, true); // dispose of clone
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
};
|
|
193
|
+
/**
|
|
194
|
+
* Create an export-friendly replacement material for a material using refraction.
|
|
195
|
+
* @param mat Material to be replaced
|
|
196
|
+
*/
|
|
197
|
+
GltfExportManager.prototype.createRefractionMaterialReplacement = function (mat) {
|
|
198
|
+
// if we're dealing with a clone already, return it instead of cloning
|
|
199
|
+
if (this.isMaterialClonedForExport(mat))
|
|
200
|
+
return mat;
|
|
201
|
+
// change material according to https://www.notion.so/combeenation/Glas-materials-don-t-look-glasy-after-export-d5fda2c6515e4420a8772744d3e6b460
|
|
202
|
+
var clonedMaterial = mat.clone(mat.name); // clone material. clone uses same name
|
|
203
|
+
clonedMaterial.metadata = tslib_1.__assign(tslib_1.__assign({}, mat.metadata), { clonedFrom: mat.uniqueId }); // create shallow copy of metadata on clone. see https://forum.babylonjs.com/t/the-metadata-of-the-mesh-cloned-by-the-instantiatemodelstoscene-method-is-a-shallow-copy/21563
|
|
204
|
+
clonedMaterial.refractionTexture = null;
|
|
205
|
+
clonedMaterial.metallicReflectanceTexture = null; // is this the correct one for metallic roughness?
|
|
206
|
+
clonedMaterial.alpha = 0.7;
|
|
207
|
+
clonedMaterial.albedoColor = new math_color_1.Color3(0.3, 0.3, 0.3);
|
|
208
|
+
clonedMaterial.transparencyMode = pbrMaterial_1.PBRMaterial.PBRMATERIAL_ALPHABLEND;
|
|
209
|
+
clonedMaterial.metallic = 0.65;
|
|
210
|
+
clonedMaterial.roughness = 0.15;
|
|
211
|
+
return clonedMaterial;
|
|
212
|
+
};
|
|
213
|
+
/**
|
|
214
|
+
* Inspect if a material was temporarily cloned for GLB export
|
|
215
|
+
* @param mat Material to be inspected
|
|
216
|
+
*/
|
|
217
|
+
GltfExportManager.prototype.isMaterialClonedForExport = function (mat) {
|
|
218
|
+
return mat.metadata.clonedFrom;
|
|
219
|
+
};
|
|
105
220
|
return GltfExportManager;
|
|
106
221
|
}());
|
|
107
222
|
exports.GltfExportManager = GltfExportManager;
|