@combeenation/3d-viewer 17.1.0 → 18.0.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/buildinfo.json +1 -1
- package/dist/lib-cjs/commonjs.tsconfig.tsbuildinfo +1 -1
- package/dist/lib-cjs/index.d.ts +2 -0
- package/dist/lib-cjs/index.js +2 -0
- package/dist/lib-cjs/index.js.map +1 -1
- package/dist/lib-cjs/internal/asset-helper.d.ts +32 -0
- package/dist/lib-cjs/internal/asset-helper.js +105 -0
- package/dist/lib-cjs/internal/asset-helper.js.map +1 -0
- package/dist/lib-cjs/internal/cbn-custom-babylon-loader-plugin.d.ts +18 -0
- package/dist/lib-cjs/internal/cbn-custom-babylon-loader-plugin.js +22 -3
- package/dist/lib-cjs/internal/cbn-custom-babylon-loader-plugin.js.map +1 -1
- package/dist/lib-cjs/internal/texture-parameter-helper.js +26 -7
- package/dist/lib-cjs/internal/texture-parameter-helper.js.map +1 -1
- package/dist/lib-cjs/manager/camera-manager.js +4 -2
- package/dist/lib-cjs/manager/camera-manager.js.map +1 -1
- package/dist/lib-cjs/manager/debug-manager.js +1 -1
- package/dist/lib-cjs/manager/debug-manager.js.map +1 -1
- package/dist/lib-cjs/manager/model-manager.d.ts +11 -33
- package/dist/lib-cjs/manager/model-manager.js +47 -106
- package/dist/lib-cjs/manager/model-manager.js.map +1 -1
- package/dist/lib-cjs/manager/parameter-manager.d.ts +16 -11
- package/dist/lib-cjs/manager/parameter-manager.js +78 -69
- package/dist/lib-cjs/manager/parameter-manager.js.map +1 -1
- package/dist/lib-cjs/manager/scene-manager.d.ts +111 -5
- package/dist/lib-cjs/manager/scene-manager.js +269 -10
- package/dist/lib-cjs/manager/scene-manager.js.map +1 -1
- package/dist/lib-cjs/viewer-error.d.ts +1 -0
- package/dist/lib-cjs/viewer-error.js +1 -0
- package/dist/lib-cjs/viewer-error.js.map +1 -1
- package/dist/lib-cjs/viewer.d.ts +4 -13
- package/dist/lib-cjs/viewer.js +3 -37
- package/dist/lib-cjs/viewer.js.map +1 -1
- package/package.json +21 -12
- package/src/index.ts +2 -0
- package/src/internal/asset-helper.ts +115 -0
- package/src/internal/cbn-custom-babylon-loader-plugin.ts +30 -3
- package/src/internal/texture-parameter-helper.ts +25 -8
- package/src/manager/camera-manager.ts +4 -2
- package/src/manager/debug-manager.ts +1 -1
- package/src/manager/model-manager.ts +55 -137
- package/src/manager/parameter-manager.ts +93 -74
- package/src/manager/scene-manager.ts +366 -10
- package/src/viewer-error.ts +1 -0
- package/src/viewer.ts +13 -55
- package/src/dev.ts +0 -47
package/dist/lib-cjs/index.d.ts
CHANGED
|
@@ -10,7 +10,9 @@ export * from '@babylonjs/core/Cameras/camera';
|
|
|
10
10
|
export * from '@babylonjs/core/Culling';
|
|
11
11
|
export * from '@babylonjs/core/Debug/axesViewer';
|
|
12
12
|
export * from '@babylonjs/core/Debug/debugLayer';
|
|
13
|
+
export * from '@babylonjs/core/Engines/abstractEngine';
|
|
13
14
|
export * from '@babylonjs/core/Engines/engine';
|
|
15
|
+
export * from '@babylonjs/core/Engines/nullEngine';
|
|
14
16
|
export * from '@babylonjs/core/Engines/thinEngine';
|
|
15
17
|
export * from '@babylonjs/core/Lights';
|
|
16
18
|
export * from '@babylonjs/core/Loading';
|
package/dist/lib-cjs/index.js
CHANGED
|
@@ -34,7 +34,9 @@ __exportStar(require("@babylonjs/core/Cameras/camera"), exports);
|
|
|
34
34
|
__exportStar(require("@babylonjs/core/Culling"), exports);
|
|
35
35
|
__exportStar(require("@babylonjs/core/Debug/axesViewer"), exports);
|
|
36
36
|
__exportStar(require("@babylonjs/core/Debug/debugLayer"), exports);
|
|
37
|
+
__exportStar(require("@babylonjs/core/Engines/abstractEngine"), exports);
|
|
37
38
|
__exportStar(require("@babylonjs/core/Engines/engine"), exports);
|
|
39
|
+
__exportStar(require("@babylonjs/core/Engines/nullEngine"), exports);
|
|
38
40
|
__exportStar(require("@babylonjs/core/Engines/thinEngine"), exports);
|
|
39
41
|
__exportStar(require("@babylonjs/core/Lights"), exports);
|
|
40
42
|
__exportStar(require("@babylonjs/core/Loading"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAA0C;AAC1C,wBAAwB;AACxB,qDAAqD;AACrD,kDAAgD;AAChD,sDAAoD;AAEpD,qBAAqB;AACrB,2DAA2D;AAC3D,wHAAwH;AACxH,+CAA+C;AAC/C,yGAAyG;AACzG,iEAAiE;AACjE,6DAA2C;AAC3C,iEAA+C;AAC/C,kEAAgD;AAChD,0DAAwC;AACxC,0EAAwD;AACxD,iEAA+C;AAC/C,0DAAwC;AACxC,mEAAiD;AACjD,mEAAiD;AACjD,iEAA+C;AAC/C,qEAAmD;AACnD,yDAAuC;AACvC,0DAAwC;AACxC,qEAAmD;AACnD,gEAA8C;AAC9C,6EAA2D;AAC3D,qEAAmD;AACnD,wDAAsC;AACtC,sEAAoD;AACpD,kEAAgD;AAChD,uEAAqD;AACrD,8DAA4C;AAC5C,qEAAmD;AACnD,uEAAqD;AACrD,iFAA+D;AAC/D,uEAAqD;AACrD,4DAA0C;AAC1C,wDAAsC;AACtC,uDAAqC;AACrC,iFAA+D;AAC/D,wDAAsC;AACtC,wDAAsC;AACtC,2EAAyD;AACzD,uEAAqD;AACrD,yEAAuD;AACvD,iFAA+D;AAE/D,gCAAgC;AAChC,sHAAsH;AACtH,UAAU;AACV,2DAA2D;AAC3D,6DAA2C;AAC3C,qCAAqC;AACrC,uEAAqD;AACrD,sDAAsD;AACtD,uEAAqD;AACrD,gDAAgD;AAChD,iEAA+C;AAE/C,iBAAiB;AACjB,qFAAqF;AACrF,2CAAyB;AACzB,iDAA+B;AAC/B,2DAAyC;AACzC,0DAAwC;AACxC,0DAAwC;AACxC,gEAA8C;AAC9C,6DAA2C;AAC3C,0DAAwC;AACxC,8DAA4C;AAC5C,0DAAwC;AACxC,4DAA0C;AAC1C,yDAAuC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAA0C;AAC1C,wBAAwB;AACxB,qDAAqD;AACrD,kDAAgD;AAChD,sDAAoD;AAEpD,qBAAqB;AACrB,2DAA2D;AAC3D,wHAAwH;AACxH,+CAA+C;AAC/C,yGAAyG;AACzG,iEAAiE;AACjE,6DAA2C;AAC3C,iEAA+C;AAC/C,kEAAgD;AAChD,0DAAwC;AACxC,0EAAwD;AACxD,iEAA+C;AAC/C,0DAAwC;AACxC,mEAAiD;AACjD,mEAAiD;AACjD,yEAAuD;AACvD,iEAA+C;AAC/C,qEAAmD;AACnD,qEAAmD;AACnD,yDAAuC;AACvC,0DAAwC;AACxC,qEAAmD;AACnD,gEAA8C;AAC9C,6EAA2D;AAC3D,qEAAmD;AACnD,wDAAsC;AACtC,sEAAoD;AACpD,kEAAgD;AAChD,uEAAqD;AACrD,8DAA4C;AAC5C,qEAAmD;AACnD,uEAAqD;AACrD,iFAA+D;AAC/D,uEAAqD;AACrD,4DAA0C;AAC1C,wDAAsC;AACtC,uDAAqC;AACrC,iFAA+D;AAC/D,wDAAsC;AACtC,wDAAsC;AACtC,2EAAyD;AACzD,uEAAqD;AACrD,yEAAuD;AACvD,iFAA+D;AAE/D,gCAAgC;AAChC,sHAAsH;AACtH,UAAU;AACV,2DAA2D;AAC3D,6DAA2C;AAC3C,qCAAqC;AACrC,uEAAqD;AACrD,sDAAsD;AACtD,uEAAqD;AACrD,gDAAgD;AAChD,iEAA+C;AAE/C,iBAAiB;AACjB,qFAAqF;AACrF,2CAAyB;AACzB,iDAA+B;AAC/B,2DAAyC;AACzC,0DAAwC;AACxC,0DAAwC;AACxC,gEAA8C;AAC9C,6DAA2C;AAC3C,0DAAwC;AACxC,8DAA4C;AAC5C,0DAAwC;AACxC,4DAA0C;AAC1C,yDAAuC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { AssetContainer, SceneAssetSettings, Viewer } from '..';
|
|
2
|
+
import { CbnBabylonFileData } from './cbn-custom-babylon-loader-plugin';
|
|
3
|
+
export declare type AssetState = 'notLoaded' | 'loading' | 'loaded' | 'inScene';
|
|
4
|
+
/**
|
|
5
|
+
* Common base asset for model and scene asset
|
|
6
|
+
*/
|
|
7
|
+
export declare type BaseAsset = {
|
|
8
|
+
name: string;
|
|
9
|
+
url: string;
|
|
10
|
+
state: AssetState;
|
|
11
|
+
assetContainer: AssetContainer;
|
|
12
|
+
};
|
|
13
|
+
/**
|
|
14
|
+
* Help function for loading asset as asset container, with some special tweaks and fixes that we need in our CBN
|
|
15
|
+
* environment:
|
|
16
|
+
* - reconstruct current environment texture and intensity, as it get overwritten by Babylon.js basic loading function
|
|
17
|
+
* - explicitely define plugin extension for gzipped babylon files
|
|
18
|
+
* - extract and return cbn custom data from babylon file
|
|
19
|
+
* - crop materials from asset containers and add them to scene directly, as we treat materials as a global entity,
|
|
20
|
+
* which can be used from all models alike
|
|
21
|
+
*
|
|
22
|
+
* This function is used by model and scene asset alike.
|
|
23
|
+
*/
|
|
24
|
+
export declare function loadAsset(asset: BaseAsset, viewer: Viewer): Promise<{
|
|
25
|
+
cbnData?: CbnBabylonFileData;
|
|
26
|
+
sceneSettingsData?: SceneAssetSettings;
|
|
27
|
+
}>;
|
|
28
|
+
/**
|
|
29
|
+
* Help function for applying parameter values and "deferred" material to asset (model or scene asset), before using it
|
|
30
|
+
* in the scene
|
|
31
|
+
*/
|
|
32
|
+
export declare function prepareAssetForScene(asset: BaseAsset, viewer: Viewer): Promise<void>;
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.prepareAssetForScene = exports.loadAsset = void 0;
|
|
13
|
+
const __1 = require("..");
|
|
14
|
+
const metadata_helper_1 = require("./metadata-helper");
|
|
15
|
+
/**
|
|
16
|
+
* Help function for loading asset as asset container, with some special tweaks and fixes that we need in our CBN
|
|
17
|
+
* environment:
|
|
18
|
+
* - reconstruct current environment texture and intensity, as it get overwritten by Babylon.js basic loading function
|
|
19
|
+
* - explicitely define plugin extension for gzipped babylon files
|
|
20
|
+
* - extract and return cbn custom data from babylon file
|
|
21
|
+
* - crop materials from asset containers and add them to scene directly, as we treat materials as a global entity,
|
|
22
|
+
* which can be used from all models alike
|
|
23
|
+
*
|
|
24
|
+
* This function is used by model and scene asset alike.
|
|
25
|
+
*/
|
|
26
|
+
function loadAsset(asset, viewer) {
|
|
27
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
28
|
+
asset.state = 'loading';
|
|
29
|
+
const curEnvTexture = viewer.scene.environmentTexture;
|
|
30
|
+
const curEnvIntensity = viewer.scene.environmentIntensity;
|
|
31
|
+
// CB-9240: Babylon.js doesn't recognize gzipped babylon files (`.babylon.gz`) as such, leading to a warning
|
|
32
|
+
// message, therefore we overwrite the plugin extension actively for such files
|
|
33
|
+
let pluginExtension;
|
|
34
|
+
try {
|
|
35
|
+
// URL constructor can throw for "valid" URL, which happened to be the case for the test asset environment where
|
|
36
|
+
// the urls are relative (starting with ".")
|
|
37
|
+
const urlObj = new URL(asset.url);
|
|
38
|
+
if (urlObj.pathname.endsWith('.babylon.gz')) {
|
|
39
|
+
pluginExtension = '.babylon';
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
catch (e) { }
|
|
43
|
+
let extendedAssetContainer;
|
|
44
|
+
try {
|
|
45
|
+
extendedAssetContainer = (yield __1.SceneLoader.LoadAssetContainerAsync('', asset.url, viewer.scene, undefined, pluginExtension));
|
|
46
|
+
}
|
|
47
|
+
catch (e) {
|
|
48
|
+
throw new __1.ViewerError({
|
|
49
|
+
id: __1.ViewerErrorIds.AssetLoadingFailed,
|
|
50
|
+
message: e.message,
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
const { cbnData, sceneSettingsData } = extendedAssetContainer;
|
|
54
|
+
delete extendedAssetContainer.cbnData;
|
|
55
|
+
delete extendedAssetContainer.sceneSettingsData;
|
|
56
|
+
// from here it's a basic asset container again
|
|
57
|
+
const assetContainer = extendedAssetContainer;
|
|
58
|
+
// materials should be a "global" thing and not assigned to an asset container
|
|
59
|
+
// this is not relevant for model assets in most of the cases, since materials are cropped from babylon models on the
|
|
60
|
+
// CBN server anyway
|
|
61
|
+
assetContainer.materials.forEach(material => {
|
|
62
|
+
viewer.scene.addMaterial(material);
|
|
63
|
+
material._parentContainer = null;
|
|
64
|
+
viewer.parameterManager.applyParameterValuesToMaterial(material);
|
|
65
|
+
});
|
|
66
|
+
assetContainer.materials = [];
|
|
67
|
+
// environment texture and intensity has been overwritten by load asset container function
|
|
68
|
+
viewer.scene.environmentTexture = curEnvTexture;
|
|
69
|
+
viewer.scene.environmentIntensity = curEnvIntensity;
|
|
70
|
+
asset.assetContainer = assetContainer;
|
|
71
|
+
asset.state = 'loaded';
|
|
72
|
+
return { cbnData, sceneSettingsData };
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
exports.loadAsset = loadAsset;
|
|
76
|
+
/**
|
|
77
|
+
* Help function for applying parameter values and "deferred" material to asset (model or scene asset), before using it
|
|
78
|
+
* in the scene
|
|
79
|
+
*/
|
|
80
|
+
function prepareAssetForScene(asset, viewer) {
|
|
81
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
82
|
+
yield viewer.parameterManager.applyAllParameterValuesToModel(asset.assetContainer);
|
|
83
|
+
// parameter manager did his job, now apply the deferred materials to all meshes that are not explicitely hidden by
|
|
84
|
+
// the parameter manager
|
|
85
|
+
yield _applyDeferredMaterialsForAllVisibleMeshes(asset, viewer);
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
exports.prepareAssetForScene = prepareAssetForScene;
|
|
89
|
+
/**
|
|
90
|
+
* Creates and assigns each "deferred" material to the corresponding mesh, if the mesh is visible.
|
|
91
|
+
* Model should be ready to use immediately after this function has done it's job.
|
|
92
|
+
*/
|
|
93
|
+
function _applyDeferredMaterialsForAllVisibleMeshes(asset, viewer) {
|
|
94
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
95
|
+
const setMaterialProms = asset.assetContainer.meshes.map((mesh) => __awaiter(this, void 0, void 0, function* () {
|
|
96
|
+
const deferredMaterial = (0, metadata_helper_1.getInternalMetadataValue)(mesh, 'deferredMaterial');
|
|
97
|
+
const visible = viewer.parameterManager.getNestedVisibilityParameterValueOfNode(mesh);
|
|
98
|
+
if (deferredMaterial && visible) {
|
|
99
|
+
yield viewer.materialManager.setMaterialOnMesh(deferredMaterial, mesh);
|
|
100
|
+
}
|
|
101
|
+
}));
|
|
102
|
+
yield Promise.all(setMaterialProms);
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
//# sourceMappingURL=asset-helper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"asset-helper.js","sourceRoot":"","sources":["../../../src/internal/asset-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0BAA0G;AAE1G,uDAA6D;AAc7D;;;;;;;;;;GAUG;AACH,SAAsB,SAAS,CAC7B,KAAgB,EAChB,MAAc;;QAEd,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC;QACxB,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC;QACtD,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC;QAE1D,4GAA4G;QAC5G,+EAA+E;QAC/E,IAAI,eAAe,CAAC;QACpB,IAAI;YACF,gHAAgH;YAChH,4CAA4C;YAC5C,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClC,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;gBAC3C,eAAe,GAAG,UAAU,CAAC;aAC9B;SACF;QAAC,OAAO,CAAC,EAAE,GAAE;QAEd,IAAI,sBAAsB,CAAC;QAC3B,IAAI;YACF,sBAAsB,GAAG,CAAC,MAAM,eAAW,CAAC,uBAAuB,CACjE,EAAE,EACF,KAAK,CAAC,GAAG,EACT,MAAM,CAAC,KAAK,EACZ,SAAS,EACT,eAAe,CAChB,CAA2B,CAAC;SAC9B;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,eAAW,CAAC;gBACpB,EAAE,EAAE,kBAAc,CAAC,kBAAkB;gBACrC,OAAO,EAAG,CAAW,CAAC,OAAO;aAC9B,CAAC,CAAC;SACJ;QAED,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,sBAAsB,CAAC;QAC9D,OAAO,sBAAsB,CAAC,OAAO,CAAC;QACtC,OAAO,sBAAsB,CAAC,iBAAiB,CAAC;QAEhD,+CAA+C;QAC/C,MAAM,cAAc,GAAG,sBAAwC,CAAC;QAEhE,8EAA8E;QAC9E,qHAAqH;QACrH,oBAAoB;QACpB,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACnC,QAAQ,CAAC,gBAAgB,GAAG,IAAI,CAAC;YACjC,MAAM,CAAC,gBAAgB,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QACH,cAAc,CAAC,SAAS,GAAG,EAAE,CAAC;QAE9B,0FAA0F;QAC1F,MAAM,CAAC,KAAK,CAAC,kBAAkB,GAAG,aAAa,CAAC;QAChD,MAAM,CAAC,KAAK,CAAC,oBAAoB,GAAG,eAAe,CAAC;QAEpD,KAAK,CAAC,cAAc,GAAG,cAAc,CAAC;QACtC,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC;QAEvB,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;IACxC,CAAC;CAAA;AA7DD,8BA6DC;AAED;;;GAGG;AACH,SAAsB,oBAAoB,CAAC,KAAgB,EAAE,MAAc;;QACzE,MAAM,MAAM,CAAC,gBAAgB,CAAC,8BAA8B,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACnF,mHAAmH;QACnH,wBAAwB;QACxB,MAAM,0CAA0C,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAClE,CAAC;CAAA;AALD,oDAKC;AAED;;;GAGG;AACH,SAAe,0CAA0C,CAAC,KAAgB,EAAE,MAAc;;QACxF,MAAM,gBAAgB,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAM,IAAI,EAAC,EAAE;YACpE,MAAM,gBAAgB,GAAG,IAAA,0CAAwB,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;YAC5E,MAAM,OAAO,GAAG,MAAM,CAAC,gBAAgB,CAAC,uCAAuC,CAAC,IAAI,CAAC,CAAC;YACtF,IAAI,gBAAgB,IAAI,OAAO,EAAE;gBAC/B,MAAM,MAAM,CAAC,eAAe,CAAC,iBAAiB,CAAC,gBAA0B,EAAE,IAAI,CAAC,CAAC;aAClF;QACH,CAAC,CAAA,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACtC,CAAC;CAAA"}
|
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
import { AssetContainer, ParsedDecalConfiguration, SceneAssetSettings } from '../index';
|
|
2
|
+
/**
|
|
3
|
+
* Contains cbn custom data, like decals or scene settings.
|
|
4
|
+
* This is just a temporary type, as the `loadAssetContainer` function only returns an asset container, which can be
|
|
5
|
+
* altered by our file loader plugin.
|
|
6
|
+
* After loading the model, `cbnData` is cropped and a pure asset container is available for further processing.
|
|
7
|
+
* @internal
|
|
8
|
+
*/
|
|
9
|
+
export declare class ExtendedAssetContainer extends AssetContainer {
|
|
10
|
+
cbnData?: CbnBabylonFileData;
|
|
11
|
+
sceneSettingsData?: SceneAssetSettings;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* @internal
|
|
15
|
+
*/
|
|
16
|
+
export declare type CbnBabylonFileData = {
|
|
17
|
+
decals?: ParsedDecalConfiguration[];
|
|
18
|
+
};
|
|
1
19
|
/**
|
|
2
20
|
* Create and return a custom loader plugin to be registered with SceneLoader, that allows
|
|
3
21
|
* us to run our own code against the input data before using the standard procedure to
|
|
@@ -11,11 +11,21 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
11
11
|
return t;
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
exports.registerCustomCbnBabylonLoaderPlugin = void 0;
|
|
14
|
+
exports.registerCustomCbnBabylonLoaderPlugin = exports.ExtendedAssetContainer = void 0;
|
|
15
15
|
const index_1 = require("../index");
|
|
16
16
|
const metadata_helper_1 = require("./metadata-helper");
|
|
17
17
|
const tags_helper_1 = require("./tags-helper");
|
|
18
18
|
const lodash_es_1 = require("lodash-es");
|
|
19
|
+
/**
|
|
20
|
+
* Contains cbn custom data, like decals or scene settings.
|
|
21
|
+
* This is just a temporary type, as the `loadAssetContainer` function only returns an asset container, which can be
|
|
22
|
+
* altered by our file loader plugin.
|
|
23
|
+
* After loading the model, `cbnData` is cropped and a pure asset container is available for further processing.
|
|
24
|
+
* @internal
|
|
25
|
+
*/
|
|
26
|
+
class ExtendedAssetContainer extends index_1.AssetContainer {
|
|
27
|
+
}
|
|
28
|
+
exports.ExtendedAssetContainer = ExtendedAssetContainer;
|
|
19
29
|
let customLoader;
|
|
20
30
|
/**
|
|
21
31
|
* Create and return a custom loader plugin to be registered with SceneLoader, that allows
|
|
@@ -45,7 +55,11 @@ function registerCustomCbnBabylonLoaderPlugin() {
|
|
|
45
55
|
load: previousLoaderPlugin.load,
|
|
46
56
|
loadAssetContainer: (scene, data, rootUrl, onError) => {
|
|
47
57
|
const dataParsed = JSON.parse(data);
|
|
48
|
-
|
|
58
|
+
// root url parameter is left empty for the following reasons:
|
|
59
|
+
// - cube texture creation (for environment) breaks, as Babylon.js tries to prefix absolute paths (e.g. from
|
|
60
|
+
// Babylon.js server) with the root url
|
|
61
|
+
// - we always have absolute paths anyway => links to 3d model, material & textures assets
|
|
62
|
+
const importedContainer = previousLoaderPlugin.loadAssetContainer(scene, data, '');
|
|
49
63
|
_addMissingMaterialMetadata(dataParsed, importedContainer);
|
|
50
64
|
_reconstructTagsForInstancedMeshes(dataParsed, importedContainer);
|
|
51
65
|
try {
|
|
@@ -57,9 +71,14 @@ function registerCustomCbnBabylonLoaderPlugin() {
|
|
|
57
71
|
// When forwarding the message in the `onError` callback at least the message can be preserved
|
|
58
72
|
onError === null || onError === void 0 ? void 0 : onError(e.message);
|
|
59
73
|
}
|
|
60
|
-
// add `cbnData` to output asset container, so that this information can be
|
|
74
|
+
// add `cbnData` to output asset container, so that this information can be stored as metadata for the model
|
|
75
|
+
// same with `sceneSettingsData`, which is used in the scene asset
|
|
61
76
|
const extendedContainer = importedContainer;
|
|
62
77
|
extendedContainer.cbnData = dataParsed.cbnData;
|
|
78
|
+
extendedContainer.sceneSettingsData = {
|
|
79
|
+
environmentIntensity: dataParsed.environmentIntensity,
|
|
80
|
+
clearColor: dataParsed.clearColor && index_1.Color4.FromArray(dataParsed.clearColor),
|
|
81
|
+
};
|
|
63
82
|
return extendedContainer;
|
|
64
83
|
},
|
|
65
84
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cbn-custom-babylon-loader-plugin.js","sourceRoot":"","sources":["../../../src/internal/cbn-custom-babylon-loader-plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"cbn-custom-babylon-loader-plugin.js","sourceRoot":"","sources":["../../../src/internal/cbn-custom-babylon-loader-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,16 +79,21 @@ function createBuiltInTextureParameter(parameterManager, scene) {
|
|
|
79
79
|
const pbrMaterial = _assertAndConvertPBRMaterial(material, channel, exports.BuiltInTextureParameter.image);
|
|
80
80
|
const texture = _getTextureFromParameterChannel(pbrMaterial, channel);
|
|
81
81
|
if (texture) {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
82
|
+
if (url) {
|
|
83
|
+
// create a clone of the texture, in this way we can load the image before assigning it to the material
|
|
84
|
+
// channel
|
|
85
|
+
const clonedTexture = texture.clone();
|
|
86
|
+
// update texture and await loading time right away
|
|
87
|
+
yield new Promise(resolve => clonedTexture.updateURL(url, undefined, resolve));
|
|
88
|
+
_assignTextureParameterChannel(clonedTexture, pbrMaterial, channel);
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
_removeFromTextureParameterChannel(pbrMaterial, channel);
|
|
92
|
+
}
|
|
88
93
|
// dispose old texture
|
|
89
94
|
texture.dispose();
|
|
90
95
|
}
|
|
91
|
-
else {
|
|
96
|
+
else if (url) {
|
|
92
97
|
// no texture, or wrong type => create texture from scratch
|
|
93
98
|
// first we check if some settings were provided in the material definition
|
|
94
99
|
const addMatSettings = yield ((_a = window.Cbn) === null || _a === void 0 ? void 0 : _a.Assets.getMaterial(pbrMaterial.id));
|
|
@@ -273,6 +278,20 @@ function _assignTextureParameterChannel(texture, pbrMaterial, channel) {
|
|
|
273
278
|
pbrMaterial[channel] = texture;
|
|
274
279
|
}
|
|
275
280
|
}
|
|
281
|
+
/**
|
|
282
|
+
* Remove runtime texture from dedicated channel in the PBR material
|
|
283
|
+
*/
|
|
284
|
+
function _removeFromTextureParameterChannel(pbrMaterial, channel) {
|
|
285
|
+
if (channel === 'metallicRoughnessTexture') {
|
|
286
|
+
pbrMaterial.metallicTexture = null;
|
|
287
|
+
}
|
|
288
|
+
else if (channel === 'detailmapTexture') {
|
|
289
|
+
pbrMaterial.detailMap.texture = null;
|
|
290
|
+
}
|
|
291
|
+
else {
|
|
292
|
+
pbrMaterial[channel] = null;
|
|
293
|
+
}
|
|
294
|
+
}
|
|
276
295
|
/**
|
|
277
296
|
* Similar to `_getTextureFromParameterChannel`, whereas the input is a plain JSON object instead of a runtime material
|
|
278
297
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"texture-parameter-helper.js","sourceRoot":"","sources":["../../../src/internal/texture-parameter-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0BAAqG;AACrG,oEAAkF;AAClF,6CAA2C;AAC3C,oDAA2B;AAE3B;;;;;;;;GAQG;AAEU,QAAA,uBAAuB,GAAG;IACrC,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;CACf,CAAC;AAGW,QAAA,wBAAwB,GAAG;IACtC,aAAa,EAAE,eAAe;IAC9B,wBAAwB,EAAE,0BAA0B;IACpD,WAAW,EAAE,aAAa;IAC1B,eAAe,EAAE,iBAAiB;IAClC,cAAc,EAAE,gBAAgB;IAChC,cAAc,EAAE,gBAAgB;IAChC,eAAe,EAAE,iBAAiB;IAClC,gBAAgB,EAAE,kBAAkB;CACrC,CAAC;AAGF,SAAgB,6BAA6B,CAAC,gBAAkC,EAAE,KAAY;IAC5F,6CAA6C;IAC5C,MAAM,CAAC,MAAM,CAAC,gCAAwB,CAAoC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAC5F,gBAAgB,CAAC,oBAAoB,CACnC,GAAG,OAAO,IAAI,+BAAuB,CAAC,KAAK,EAAE,EAC7C,CAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;;YAChC,MAAM,KAAK,GAAG,oCAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACrD,IAAI,GAAG,GAAG,KAAK,CAAC;YAEhB,MAAM,UAAU,GAAG,IAAA,gBAAK,EAAC,KAAK,CAAC,CAAC;YAChC,IAAI,UAAU,EAAE;gBACd,oGAAoG;gBACpG,yFAAyF;gBACzF,mFAAmF;gBACnF,oGAAoG;gBACpG,mCAAmC;gBACnC,MAAM,qBAAqB,GAAG,MAAM,IAAA,wBAAW,EAAC,KAAK,CAAC,CAAC;gBACvD,sGAAsG;gBACtG,GAAG,GAAG,4BAA4B,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC;aAClE;iBAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAC7D,wEAAwE;gBACxE,sDAAsD;gBACtD,MAAM,IAAI,eAAW,CAAC;oBACpB,EAAE,EAAE,kBAAc,CAAC,qBAAqB;oBACxC,OAAO,EAAE,kGAAkG,KAAK,EAAE;iBACnH,CAAC,CAAC;aACJ;YAED,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,WAAW,GAAG,4BAA4B,CAAC,QAAQ,EAAE,OAAO,EAAE,+BAAuB,CAAC,KAAK,CAAC,CAAC;gBACnG,MAAM,OAAO,GAAG,+BAA+B,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBAEtE,IAAI,OAAO,EAAE;oBACX,uGAAuG;
|
|
1
|
+
{"version":3,"file":"texture-parameter-helper.js","sourceRoot":"","sources":["../../../src/internal/texture-parameter-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ class CameraManager {
|
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
36
|
// get bounding box of all visible meshes, this is the base for the autofocus algorithm
|
|
37
|
-
const boundingInfo = this.viewer.calculateBoundingInfo(settings === null || settings === void 0 ? void 0 : settings.exclude);
|
|
37
|
+
const boundingInfo = this.viewer.sceneManager.calculateBoundingInfo(settings === null || settings === void 0 ? void 0 : settings.exclude);
|
|
38
38
|
// optionally show bounding sphere for debugging purpose
|
|
39
39
|
this.viewer.eventManager.fireEvent(index_1.ViewerEvent.AutofocusStart, boundingInfo.boundingSphere);
|
|
40
40
|
const distance = this._getAutofocusZoomingDistance(boundingInfo.boundingSphere, activeCamera);
|
|
@@ -129,7 +129,9 @@ class CameraManager {
|
|
|
129
129
|
var _a, _b;
|
|
130
130
|
return __awaiter(this, void 0, void 0, function* () {
|
|
131
131
|
const screenshotCam = (_a = this.viewer.scene.activeCamera) === null || _a === void 0 ? void 0 : _a.clone(CameraManager._SCREENSHOT_CAMERA_NAME);
|
|
132
|
-
const boundingInfo = (settings === null || settings === void 0 ? void 0 : settings.autofocusScene)
|
|
132
|
+
const boundingInfo = (settings === null || settings === void 0 ? void 0 : settings.autofocusScene)
|
|
133
|
+
? this.viewer.sceneManager.calculateBoundingInfo(settings.exclude)
|
|
134
|
+
: undefined;
|
|
133
135
|
if ((settings === null || settings === void 0 ? void 0 : settings.alpha) !== undefined) {
|
|
134
136
|
screenshotCam.alpha = settings.alpha;
|
|
135
137
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"camera-manager.js","sourceRoot":"","sources":["../../../src/manager/camera-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAakB;AAClB,iEAA6D;AA6E7D;;GAEG;AACH,MAAa,aAAa;IAsBxB,gBAAgB;IAChB,YAA6B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAE/C;;OAEG;IACU,qBAAqB,CAAC,QAA4B;;;YAC7D,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC;YAEpD,IAAI,CAAC,CAAC,YAAY,YAAY,uBAAe,CAAC,EAAE;gBAC9C,MAAM,IAAI,mBAAW,CAAC;oBACpB,EAAE,EAAE,sBAAc,CAAC,iBAAiB;oBACpC,OAAO,EAAE,wEAAwE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,EAAE,GAAG;iBACjH,CAAC,CAAC;aACJ;YAED,uFAAuF;YACvF,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"camera-manager.js","sourceRoot":"","sources":["../../../src/manager/camera-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -104,7 +104,7 @@ The inspector can only be used in development builds.`);
|
|
|
104
104
|
showCoordinateSystem(node, size) {
|
|
105
105
|
// calculate the default size of not provided
|
|
106
106
|
if (!size) {
|
|
107
|
-
const sceneBoundingInfo = this.viewer.calculateBoundingInfo();
|
|
107
|
+
const sceneBoundingInfo = this.viewer.sceneManager.calculateBoundingInfo();
|
|
108
108
|
const radius = sceneBoundingInfo.boundingSphere.radius;
|
|
109
109
|
// takes a third of the radius from scene boundingsphere
|
|
110
110
|
size = radius * (1 / 3);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-manager.js","sourceRoot":"","sources":["../../../src/manager/debug-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAgBkB;AAElB;;GAEG;AACH,MAAa,YAAY;IAMvB,gBAAgB;IAChB,YAA6B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAJjC,gBAAW,GAAsB,IAAI,CAAC;QACtC,oCAA+B,GAAY,KAAK,CAAC;IAGb,CAAC;IAE/C;;;OAGG;IACI,8BAA8B;QACnC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,mBAAW,CAAC,cAAc,EAAE,cAAc,CAAC,EAAE,CAChF,IAAI,CAAC,+BAA+B,CAAC,cAAc,CAAC,CACrD,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACU,aAAa,CAAC,OAA2B;;YACpD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE;gBAC1C,MAAM,UAAU,GAAG,wDAAa,kCAAkC,CAAC,sBAAsB,GAAC,CAAC;gBAE3F,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE;oBAC1B,uDAAuD;oBACvD,mGAAmG;oBACnG,mFAAmF;oBACnF,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,mCAAmC,EAAE,CAAC;oBAC3F,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;iBAC5E;qBAAM;oBACL,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC,CAAC;iBAC7D;gBAED,sFAAsF;gBACtF,0DAA0D;gBAC1D,wDAAa,8CAA8C,CAAC,wBAAwB,GAAC,CAAC;gBACtF,wDAAa,8CAA8C,CAAC,iCAAiC,GAAC,CAAC;gBAE/F,OAAO,IAAI,CAAC;aACb;iBAAM;gBACL,oEAAoE;gBACpE,IAAI,MAAM,CAAC,GAAG,EAAE;oBACd,OAAO,CAAC,IAAI,CAAC;;yFAEoE,CAAC,CAAC;iBACpF;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC;sDACiC,CAAC,CAAC;iBACjD;gBAED,OAAO,KAAK,CAAC;aACd;QACH,CAAC;KAAA;IAEM,aAAa;;QAClB,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,0CAAE,IAAI,EAAE,CAAC;IACvC,CAAC;IAED;;;;OAIG;IACI,oBAAoB,CAAC,IAAoB,EAAE,IAAa;QAC7D,6CAA6C;QAC7C,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"debug-manager.js","sourceRoot":"","sources":["../../../src/manager/debug-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAgBkB;AAElB;;GAEG;AACH,MAAa,YAAY;IAMvB,gBAAgB;IAChB,YAA6B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAJjC,gBAAW,GAAsB,IAAI,CAAC;QACtC,oCAA+B,GAAY,KAAK,CAAC;IAGb,CAAC;IAE/C;;;OAGG;IACI,8BAA8B;QACnC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,mBAAW,CAAC,cAAc,EAAE,cAAc,CAAC,EAAE,CAChF,IAAI,CAAC,+BAA+B,CAAC,cAAc,CAAC,CACrD,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACU,aAAa,CAAC,OAA2B;;YACpD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE;gBAC1C,MAAM,UAAU,GAAG,wDAAa,kCAAkC,CAAC,sBAAsB,GAAC,CAAC;gBAE3F,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE;oBAC1B,uDAAuD;oBACvD,mGAAmG;oBACnG,mFAAmF;oBACnF,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,mCAAmC,EAAE,CAAC;oBAC3F,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;iBAC5E;qBAAM;oBACL,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC,CAAC;iBAC7D;gBAED,sFAAsF;gBACtF,0DAA0D;gBAC1D,wDAAa,8CAA8C,CAAC,wBAAwB,GAAC,CAAC;gBACtF,wDAAa,8CAA8C,CAAC,iCAAiC,GAAC,CAAC;gBAE/F,OAAO,IAAI,CAAC;aACb;iBAAM;gBACL,oEAAoE;gBACpE,IAAI,MAAM,CAAC,GAAG,EAAE;oBACd,OAAO,CAAC,IAAI,CAAC;;yFAEoE,CAAC,CAAC;iBACpF;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC;sDACiC,CAAC,CAAC;iBACjD;gBAED,OAAO,KAAK,CAAC;aACd;QACH,CAAC;KAAA;IAEM,aAAa;;QAClB,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,0CAAE,IAAI,EAAE,CAAC;IACvC,CAAC;IAED;;;;OAIG;IACI,oBAAoB,CAAC,IAAoB,EAAE,IAAa;QAC7D,6CAA6C;QAC7C,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,qBAAqB,EAAE,CAAC;YAC3E,MAAM,MAAM,GAAG,iBAAiB,CAAC,cAAc,CAAC,MAAM,CAAC;YAEvD,wDAAwD;YACxD,IAAI,GAAG,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;SACzB;QAED,gEAAgE;QAChE,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAE5B,yFAAyF;QACzF,+BAA+B;QAC/B,MAAM,iBAAiB,GAAG,4BAAoB,CAAC,mBAAmB,CAAC,iBAAiB,CAAC;QACrF,mDAAmD;QACnD,oGAAoG;QACpG,MAAM,MAAM,GAAG,YAAY,CAAC,mCAAmC,EAAE,CAAC;QAClE,IAAI,CAAC,WAAW,GAAG,IAAI,kBAAU,CAAC,iBAAiB,EAAE,IAAI,GAAG,MAAM,CAAC,CAAC;QAEpE,IAAI,IAAI,EAAE;YACR,4EAA4E;YAC5E,gHAAgH;YAChH,MAAM,cAAc,GAAG,IAAI,cAAM,EAAE,CAAC;YACpC,IAAI,CAAC,0BAA0B,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAEjE,MAAM,KAAK,GAAG,eAAO,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe;YAC9E,MAAM,KAAK,GAAG,eAAO,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB;YAC/E,MAAM,KAAK,GAAG,eAAO,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe;YAE/E,2CAA2C;YAC3C,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,EAAE;gBAC9B,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,EAAE;gBAC9B,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,EAAE;gBAC9B,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;aACxB;YAED,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SACrE;QAED,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC7D,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC7D,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC/D,CAAC;IAEM,oBAAoB;;QACzB,MAAA,IAAI,CAAC,WAAW,0CAAE,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACI,8BAA8B;QACnC,IAAI,CAAC,+BAA+B,GAAG,IAAI,CAAC;IAC9C,CAAC;IAEM,8BAA8B;QACnC,IAAI,CAAC,+BAA+B,GAAG,KAAK,CAAC;QAC7C,IAAI,CAAC,iCAAiC,EAAE,CAAC;IAC3C,CAAC;IAED;;OAEG;IACO,MAAM,CAAC,mCAAmC;QAClD,2DAA2D;QAC3D,MAAM,cAAc,GAAG,GAAG,CAAC;QAC3B,MAAM,UAAU,GAAG,KAAK,CAAC;QACzB,MAAM,WAAW,GAAG,CAAC,CAAC;QAEtB,+CAA+C;QAC/C,wFAAwF;QACxF,4CAA4C;QAC5C,oFAAoF;QACpF,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,cAAc,GAAG,UAAU,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC;QAErE,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;OAGG;IACO,MAAM,CAAC,kBAAkB,CAAC,SAAiB,EAAE,QAAuB;QAC5E,gDAAgD;QAChD,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,iEAAiE;QACvF,MAAM,SAAS,GAAG,IAAI,CAAC;QACvB,MAAM,aAAa,GAAG,GAAG,CAAC;QAE1B,yEAAyE;QACzE,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,QAAQ,CAAC,QAA4B,CAAC;QAC3D,MAAM,KAAK,GAAG,YAAY,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAEnE,YAAY,CAAC,aAAa,GAAG,KAAK,CAAC;QAEnC,MAAM,iBAAiB,GAAG,4BAAoB,CAAC,mBAAmB,CAAC,iBAAiB,CAAC;QACrF,MAAM,UAAU,GAAG,mBAAW,CAAC,WAAW,CAAC,GAAG,SAAS,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,iBAAiB,CAAC,CAAC;QACzG,UAAU,CAAC,MAAM,GAAG,QAAQ,CAAC;QAC7B,UAAU,CAAC,QAAQ,GAAG,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;QACvD,6FAA6F;QAC7F,UAAU,CAAC,aAAa,GAAG,YAAI,CAAC,iBAAiB,CAAC;QAElD,qBAAqB;QACrB,MAAM,WAAW,GAAG,IAAI,iBAAS,EAAE,CAAC;QACpC,WAAW,CAAC,IAAI,GAAG,SAAS,CAAC;QAC7B,WAAW,CAAC,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QACxC,WAAW,CAAC,QAAQ,GAAG,MAAM,CAAC;QAC9B,WAAW,CAAC,UAAU,GAAG,OAAO,CAAC;QACjC,WAAW,CAAC,UAAU,GAAG,MAAM,CAAC;QAEhC,MAAM,YAAY,GAAG,8BAAsB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACtE,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IACO,+BAA+B,CAAC,cAA8B;QACtE,IAAI,CAAC,IAAI,CAAC,+BAA+B,EAAE;YACzC,OAAO;SACR;QAED,IAAI,CAAC,iCAAiC,EAAE,CAAC;QAEzC,MAAM,iBAAiB,GAAG,4BAAoB,CAAC,mBAAmB,CAAC,iBAAiB,CAAC;QACrF,IAAI,gBAAgB,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;QAC9F,IAAI,CAAC,gBAAgB,EAAE;YACrB,gBAAgB,GAAG,IAAI,wBAAgB,CAAC,YAAY,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;YAC9F,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC;YAClC,gBAAgB,CAAC,KAAK,GAAG,GAAG,CAAC;YAC5B,gBAAqC,CAAC,aAAa,GAAG,IAAI,cAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SAC5E;QAED,MAAM,MAAM,GAAG,mBAAW,CAAC,YAAY,CACrC,YAAY,CAAC,oBAAoB,EACjC,EAAE,QAAQ,EAAE,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,EACvC,iBAAiB,CAClB,CAAC;QACF,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC;QACxC,MAAM,CAAC,QAAQ,GAAG,gBAAgB,CAAC;QACnC,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC;IAC5B,CAAC;IAES,iCAAiC;QACzC,MAAM,iBAAiB,GAAG,4BAAoB,CAAC,mBAAmB,CAAC,iBAAiB,CAAC;QACrF,MAAM,cAAc,GAAG,iBAAiB,CAAC,aAAa,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;QAC1F,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,EAAE,CAAC;IAC5B,CAAC;;AAhOH,oCAiOC;AAhOkB,iCAAoB,GAAG,qBAAqB,CAAC"}
|
|
@@ -1,18 +1,5 @@
|
|
|
1
1
|
import { AssetContainer, DecalConfiguration, TransformNode, Viewer } from '../index';
|
|
2
|
-
|
|
3
|
-
* Contains cbn custom data, like decals.
|
|
4
|
-
* This is just a temporary type, as the `loadAssetContainer` function only returns an asset container, which can be
|
|
5
|
-
* altered by our file loader plugin.
|
|
6
|
-
* After loading the model, `cbnData` is cropped and a pure asset container is available for further processing.
|
|
7
|
-
*
|
|
8
|
-
* @internal
|
|
9
|
-
*/
|
|
10
|
-
export declare class ExtendedAssetContainer extends AssetContainer {
|
|
11
|
-
cbnData?: CbnBabylonFileData;
|
|
12
|
-
}
|
|
13
|
-
declare type CbnBabylonFileData = {
|
|
14
|
-
decals?: ParsedDecalConfiguration[];
|
|
15
|
-
};
|
|
2
|
+
import { BaseAsset } from '../internal/asset-helper';
|
|
16
3
|
export declare type ParsedDecalConfiguration = DecalConfiguration & {
|
|
17
4
|
materialId?: string;
|
|
18
5
|
tags?: string;
|
|
@@ -45,17 +32,12 @@ export declare type ModelCloneOptions = {
|
|
|
45
32
|
nodeNamingStrategy?: NodeNamingStrategy;
|
|
46
33
|
tagNamingStrategy?: TagNamingStrategy;
|
|
47
34
|
};
|
|
48
|
-
declare type
|
|
49
|
-
|
|
50
|
-
url: string;
|
|
51
|
-
state: ModelAssetState;
|
|
52
|
-
assetContainer: AssetContainer;
|
|
53
|
-
cbnBabylonFileData?: CbnBabylonFileData;
|
|
35
|
+
declare type ModelAsset = BaseAsset & {
|
|
36
|
+
decals?: ParsedDecalConfiguration[];
|
|
54
37
|
isClone: boolean;
|
|
55
38
|
sourceModelName?: string;
|
|
56
39
|
visibilityCallId?: number;
|
|
57
40
|
};
|
|
58
|
-
declare type ModelAssetState = 'notLoaded' | 'loading' | 'loaded' | 'inScene';
|
|
59
41
|
/**
|
|
60
42
|
* Manager for handling 3d models.\
|
|
61
43
|
* Responsible for loading models and handling their visibility.\
|
|
@@ -69,9 +51,9 @@ export declare class ModelManager {
|
|
|
69
51
|
*/
|
|
70
52
|
static readonly CBN_FALLBACK_MODEL_ASSET_NAME = "$fallback";
|
|
71
53
|
protected _modelAssets: {
|
|
72
|
-
[name: string]:
|
|
54
|
+
[name: string]: ModelAsset;
|
|
73
55
|
};
|
|
74
|
-
protected _fallbackModelAsset:
|
|
56
|
+
protected _fallbackModelAsset: ModelAsset;
|
|
75
57
|
protected _loadModelPromises: {
|
|
76
58
|
[modelName: string]: Promise<void>;
|
|
77
59
|
};
|
|
@@ -84,6 +66,7 @@ export declare class ModelManager {
|
|
|
84
66
|
* This function converts slash to dot notation, so that models can be target with slash and dot notation alike.
|
|
85
67
|
*/
|
|
86
68
|
protected static _replaceSlashes(inputStr: string): string;
|
|
69
|
+
/** @internal */
|
|
87
70
|
constructor(viewer: Viewer);
|
|
88
71
|
/**
|
|
89
72
|
* Creates content for the fallback model, which is actually just a black cube.
|
|
@@ -150,17 +133,17 @@ export declare class ModelManager {
|
|
|
150
133
|
/**
|
|
151
134
|
* Get model by name
|
|
152
135
|
*/
|
|
153
|
-
protected _getModel(name: string):
|
|
136
|
+
protected _getModel(name: string): ModelAsset | undefined;
|
|
154
137
|
/**
|
|
155
138
|
* Load model into scene, but don't show it immediately
|
|
156
139
|
*/
|
|
157
|
-
protected _loadModel(model:
|
|
140
|
+
protected _loadModel(model: ModelAsset): Promise<void>;
|
|
158
141
|
/**
|
|
159
142
|
* Apply parameter to the model in the asset container.
|
|
160
143
|
* This is typically done before the model is added to the scene to avoid changes on the visible model, which ensures
|
|
161
144
|
* a smooth model switch behaviour.
|
|
162
145
|
*/
|
|
163
|
-
protected _prepareModelForScene(model:
|
|
146
|
+
protected _prepareModelForScene(model: ModelAsset): Promise<void>;
|
|
164
147
|
/**
|
|
165
148
|
* Add assets of asset container to scene, do the scene preparation if required.
|
|
166
149
|
* CAUTION: model is expected to be in the correct loading state already.
|
|
@@ -168,15 +151,10 @@ export declare class ModelManager {
|
|
|
168
151
|
* @param skipPreparation optionally skip applying parameter values to model before showing it
|
|
169
152
|
* (see {@link _prepareModelForScene})
|
|
170
153
|
*/
|
|
171
|
-
protected _showModel(model:
|
|
154
|
+
protected _showModel(model: ModelAsset, skipPreparation?: boolean): Promise<void>;
|
|
172
155
|
/**
|
|
173
156
|
* Remove assets of asset container from scene
|
|
174
157
|
*/
|
|
175
|
-
protected _hideModel(model:
|
|
176
|
-
/**
|
|
177
|
-
* Creates and assigns each "deferred" material to the corresponding mesh, if the mesh is visible.
|
|
178
|
-
* Model should be ready to use immediately after this function has done it's job.
|
|
179
|
-
*/
|
|
180
|
-
protected _applyDeferredMaterialsForAllVisibleMeshes(model: Model): Promise<void>;
|
|
158
|
+
protected _hideModel(model: ModelAsset): void;
|
|
181
159
|
}
|
|
182
160
|
export {};
|