@combeenation/3d-viewer 21.0.0-beta2 → 21.0.1-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 +0 -1
- package/dist/lib-cjs/index.js +0 -1
- package/dist/lib-cjs/index.js.map +1 -1
- package/dist/lib-cjs/internal/cbn-custom-babylon-loader-plugin.js +7 -4
- package/dist/lib-cjs/internal/cbn-custom-babylon-loader-plugin.js.map +1 -1
- package/dist/lib-cjs/internal/cbn-viewer-bridge.d.ts +30 -0
- package/dist/lib-cjs/internal/cbn-viewer-bridge.js +8 -0
- package/dist/lib-cjs/internal/cbn-viewer-bridge.js.map +1 -0
- package/dist/lib-cjs/manager/debug-manager.d.ts +1 -1
- package/dist/lib-cjs/manager/debug-manager.js +6 -4
- package/dist/lib-cjs/manager/debug-manager.js.map +1 -1
- package/dist/lib-cjs/manager/material-manager.js +8 -4
- package/dist/lib-cjs/manager/material-manager.js.map +1 -1
- package/dist/lib-cjs/viewer.d.ts +7 -1
- package/dist/lib-cjs/viewer.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +0 -1
- package/src/internal/cbn-custom-babylon-loader-plugin.ts +5 -2
- package/src/internal/cbn-viewer-bridge.ts +33 -0
- package/src/manager/debug-manager.ts +5 -3
- package/src/manager/material-manager.ts +8 -3
- package/src/viewer.ts +7 -1
- package/dist/lib-cjs/global-types.d.ts +0 -35
- package/dist/lib-cjs/global-types.js +0 -3
- package/dist/lib-cjs/global-types.js.map +0 -1
- package/src/global-types.ts +0 -39
package/dist/lib-cjs/index.d.ts
CHANGED
|
@@ -49,7 +49,6 @@ export * from '@babylonjs/core/Materials/Background';
|
|
|
49
49
|
export * from '@babylonjs/core/Materials/Node';
|
|
50
50
|
export * from './viewer';
|
|
51
51
|
export * from './viewer-error';
|
|
52
|
-
export * from './global-types';
|
|
53
52
|
export * from './manager/camera-manager';
|
|
54
53
|
export * from './manager/dimension-line-manager';
|
|
55
54
|
export * from './manager/debug-manager';
|
package/dist/lib-cjs/index.js
CHANGED
|
@@ -82,7 +82,6 @@ __exportStar(require("@babylonjs/core/Materials/Node"), exports);
|
|
|
82
82
|
// all viewer modules that are not located in "internal" should be exported from here
|
|
83
83
|
__exportStar(require("./viewer"), exports);
|
|
84
84
|
__exportStar(require("./viewer-error"), exports);
|
|
85
|
-
__exportStar(require("./global-types"), exports);
|
|
86
85
|
__exportStar(require("./manager/camera-manager"), exports);
|
|
87
86
|
__exportStar(require("./manager/dimension-line-manager"), exports);
|
|
88
87
|
__exportStar(require("./manager/debug-manager"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,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,kFAAgE;AAChE,qEAAmD;AACnD,qEAAmD;AACnD,yDAAuC;AACvC,0DAAwC;AACxC,qEAAmD;AACnD,gEAA8C;AAC9C,6EAA2D;AAC3D,qEAAmD;AACnD,wDAAsC;AACtC,sEAAoD;AACpD,kEAAgD;AAChD,uEAAqD;AACrD,mEAAiD;AACjD,8DAA4C;AAC5C,qEAAmD;AACnD,uEAAqD;AACrD,kEAAgD;AAChD,iFAA+D;AAC/D,uEAAqD;AACrD,4DAA0C;AAC1C,wDAAsC;AACtC,uDAAqC;AACrC,gFAA8D;AAC9D,iFAA+D;AAC/D,wDAAsC;AACtC,wDAAsC;AACtC,2EAAyD;AACzD,uEAAqD;AACrD,yEAAuD;AACvD,iFAA+D;AAC/D,6DAA2C;AAE3C,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,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,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,kFAAgE;AAChE,qEAAmD;AACnD,qEAAmD;AACnD,yDAAuC;AACvC,0DAAwC;AACxC,qEAAmD;AACnD,gEAA8C;AAC9C,6EAA2D;AAC3D,qEAAmD;AACnD,wDAAsC;AACtC,sEAAoD;AACpD,kEAAgD;AAChD,uEAAqD;AACrD,mEAAiD;AACjD,8DAA4C;AAC5C,qEAAmD;AACnD,uEAAqD;AACrD,kEAAgD;AAChD,iFAA+D;AAC/D,uEAAqD;AACrD,4DAA0C;AAC1C,wDAAsC;AACtC,uDAAqC;AACrC,gFAA8D;AAC9D,iFAA+D;AAC/D,wDAAsC;AACtC,wDAAsC;AACtC,2EAAyD;AACzD,uEAAqD;AACrD,yEAAuD;AACvD,iFAA+D;AAC/D,6DAA2C;AAE3C,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,mEAAiD;AACjD,0DAAwC;AACxC,0DAAwC;AACxC,2DAAyC;AACzC,gEAA8C;AAC9C,6DAA2C;AAC3C,0DAAwC;AACxC,8DAA4C;AAC5C,0DAAwC;AACxC,4DAA0C;AAC1C,sDAAoC;AACpC,uDAAqC"}
|
|
@@ -13,6 +13,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.registerCustomCbnBabylonLoaderPlugin = exports.ExtendedAssetContainer = void 0;
|
|
15
15
|
const index_1 = require("../index");
|
|
16
|
+
const cbn_viewer_bridge_1 = require("./cbn-viewer-bridge");
|
|
16
17
|
const metadata_helper_1 = require("./metadata-helper");
|
|
17
18
|
const tags_helper_1 = require("./tags-helper");
|
|
18
19
|
const lodash_es_1 = require("lodash-es");
|
|
@@ -123,12 +124,13 @@ function _addMissingMaterialMetadata(dataParsed, container) {
|
|
|
123
124
|
return;
|
|
124
125
|
const validatedMeshes = dataParsed.meshes.filter(_isMeshData);
|
|
125
126
|
container.meshes.forEach(importedMesh => {
|
|
126
|
-
var _a, _b, _c
|
|
127
|
+
var _a, _b, _c;
|
|
127
128
|
const parsedMesh = validatedMeshes.find(mesh => mesh.name === importedMesh.name);
|
|
128
129
|
const materialOnImportedMesh = (_a = importedMesh.material) === null || _a === void 0 ? void 0 : _a.id;
|
|
129
130
|
const materialOnOriginalMesh = parsedMesh === null || parsedMesh === void 0 ? void 0 : parsedMesh.materialId;
|
|
130
131
|
if (materialOnOriginalMesh && materialOnImportedMesh !== materialOnOriginalMesh) {
|
|
131
|
-
|
|
132
|
+
const cbnWindowBridge = (0, cbn_viewer_bridge_1.getCbnViewerBridge)();
|
|
133
|
+
(_c = (_b = cbnWindowBridge === null || cbnWindowBridge === void 0 ? void 0 : cbnWindowBridge.Assets) === null || _b === void 0 ? void 0 : _b.assertMaterialExists) === null || _c === void 0 ? void 0 : _c.call(_b, materialOnOriginalMesh);
|
|
132
134
|
(0, metadata_helper_1.setInternalMetadataValue)(importedMesh, 'deferredMaterial', materialOnOriginalMesh);
|
|
133
135
|
}
|
|
134
136
|
});
|
|
@@ -184,12 +186,13 @@ function _createDecals(dataParsed, container) {
|
|
|
184
186
|
return;
|
|
185
187
|
const validatedDecals = dataParsed.cbnData.decals.filter(_isDecalConfiguration);
|
|
186
188
|
validatedDecals.forEach(decalConfig => {
|
|
187
|
-
var _a, _b
|
|
189
|
+
var _a, _b;
|
|
188
190
|
const { materialId, tags } = decalConfig, decalMeshConfig = __rest(decalConfig, ["materialId", "tags"]);
|
|
189
191
|
const decalMesh = index_1.DecalUtils.createDecalMesh(decalMeshConfig, container, false);
|
|
190
192
|
// optionally set material and tags directly
|
|
191
193
|
if (materialId) {
|
|
192
|
-
|
|
194
|
+
const cbnWindowBridge = (0, cbn_viewer_bridge_1.getCbnViewerBridge)();
|
|
195
|
+
(_b = (_a = cbnWindowBridge === null || cbnWindowBridge === void 0 ? void 0 : cbnWindowBridge.Assets) === null || _a === void 0 ? void 0 : _a.assertMaterialExists) === null || _b === void 0 ? void 0 : _b.call(_a, materialId);
|
|
193
196
|
(0, metadata_helper_1.setInternalMetadataValue)(decalMesh, 'deferredMaterial', materialId);
|
|
194
197
|
}
|
|
195
198
|
if (tags) {
|
|
@@ -1 +1 @@
|
|
|
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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
|
|
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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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Augmentation of the global `window` object used in "old" configurators (pre Editor V2)
|
|
3
|
+
*/
|
|
4
|
+
interface CbnViewerBridge {
|
|
5
|
+
Assets?: {
|
|
6
|
+
/**
|
|
7
|
+
* Retrieve material definition from configurator
|
|
8
|
+
*
|
|
9
|
+
* @return Undefined if no definition for the given material name exists, otherwise an "JSON object" which
|
|
10
|
+
* can be passed to `BABYLON.Material.Parse` to create a runtime material object.
|
|
11
|
+
*/
|
|
12
|
+
getMaterial?(materialId: string): object | undefined;
|
|
13
|
+
/**
|
|
14
|
+
* Checks if a definition for a given material name exists in the configurator and issues a warning if not
|
|
15
|
+
*/
|
|
16
|
+
assertMaterialExists?(materialId: string): boolean;
|
|
17
|
+
};
|
|
18
|
+
utils?: {
|
|
19
|
+
Viewer3dHelper?: {
|
|
20
|
+
/**
|
|
21
|
+
* Returns parent DOM element of a Combeenation configurator, which can be used as root for the
|
|
22
|
+
* inspector.\
|
|
23
|
+
* Also adjusts styling of some configurator parent sub elements to fix the inspector layout.
|
|
24
|
+
*/
|
|
25
|
+
getCfgrParentDomElementForInspector?(): HTMLElement | undefined;
|
|
26
|
+
};
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
export declare function getCbnViewerBridge(): CbnViewerBridge | undefined;
|
|
30
|
+
export {};
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getCbnViewerBridge = void 0;
|
|
4
|
+
function getCbnViewerBridge() {
|
|
5
|
+
return window.Cbn;
|
|
6
|
+
}
|
|
7
|
+
exports.getCbnViewerBridge = getCbnViewerBridge;
|
|
8
|
+
//# sourceMappingURL=cbn-viewer-bridge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cbn-viewer-bridge.js","sourceRoot":"","sources":["../../../src/internal/cbn-viewer-bridge.ts"],"names":[],"mappings":";;;AA8BA,SAAgB,kBAAkB;IAChC,OAAQ,MAA6C,CAAC,GAAG,CAAC;AAC5D,CAAC;AAFD,gDAEC"}
|
|
@@ -22,7 +22,7 @@ export declare class DebugManager {
|
|
|
22
22
|
*/
|
|
23
23
|
registerParentDomElementForInspector(el: HTMLElement): void;
|
|
24
24
|
/**
|
|
25
|
-
* Enables the Babylon.js [Inspector](https://doc.babylonjs.com/legacy/inspector
|
|
25
|
+
* Enables the Babylon.js [Inspector](https://doc.babylonjs.com/legacy/inspector).\
|
|
26
26
|
* Due to the additional size of the inspector, this function is only available in "development" builds!
|
|
27
27
|
*
|
|
28
28
|
* @returns Signalizes if inspector could be loaded
|
|
@@ -34,6 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
35
|
exports.DebugManager = void 0;
|
|
36
36
|
const index_1 = require("../index");
|
|
37
|
+
const cbn_viewer_bridge_1 = require("../internal/cbn-viewer-bridge");
|
|
37
38
|
const math_helper_1 = require("../internal/math-helper");
|
|
38
39
|
/**
|
|
39
40
|
* Manager for debugging functionalities
|
|
@@ -62,19 +63,20 @@ class DebugManager {
|
|
|
62
63
|
this._parentDomElementForInspector = el;
|
|
63
64
|
}
|
|
64
65
|
/**
|
|
65
|
-
* Enables the Babylon.js [Inspector](https://doc.babylonjs.com/legacy/inspector
|
|
66
|
+
* Enables the Babylon.js [Inspector](https://doc.babylonjs.com/legacy/inspector).\
|
|
66
67
|
* Due to the additional size of the inspector, this function is only available in "development" builds!
|
|
67
68
|
*
|
|
68
69
|
* @returns Signalizes if inspector could be loaded
|
|
69
70
|
*/
|
|
70
71
|
showInspector(options) {
|
|
71
|
-
var _a, _b, _c, _d
|
|
72
|
+
var _a, _b, _c, _d;
|
|
72
73
|
return __awaiter(this, void 0, void 0, function* () {
|
|
74
|
+
const cbnWindowBridge = (0, cbn_viewer_bridge_1.getCbnViewerBridge)();
|
|
73
75
|
if (process.env.NODE_ENV === 'development') {
|
|
74
76
|
const inspModule = yield Promise.resolve().then(() => __importStar(require(/* webpackChunkName: "inspector"*/ '@babylonjs/inspector')));
|
|
75
77
|
const parentEl = (_a = this._parentDomElementForInspector) !== null && _a !== void 0 ? _a :
|
|
76
78
|
// fallback to legacy `window.Cbn` call to support "old" cfgrs (pre Editor V2)
|
|
77
|
-
(
|
|
79
|
+
(_d = (_c = (_b = cbnWindowBridge === null || cbnWindowBridge === void 0 ? void 0 : cbnWindowBridge.utils) === null || _b === void 0 ? void 0 : _b.Viewer3dHelper) === null || _c === void 0 ? void 0 : _c.getCfgrParentDomElementForInspector) === null || _d === void 0 ? void 0 : _d.call(_c);
|
|
78
80
|
if (!options && parentEl) {
|
|
79
81
|
// special case for usage in Combeenation configurator:
|
|
80
82
|
// if no options are set the inspector will be rendered into the parent element of the configurator
|
|
@@ -92,7 +94,7 @@ class DebugManager {
|
|
|
92
94
|
}
|
|
93
95
|
else {
|
|
94
96
|
// inspector not available, set according warning message in console
|
|
95
|
-
if (
|
|
97
|
+
if (cbnWindowBridge) {
|
|
96
98
|
console.warn(`Inspector not loaded.
|
|
97
99
|
The inspector can only be used in development builds (e.g. during development with watch mode, in the configurator preview, ...)
|
|
98
100
|
but not in production (e.g. production build of Custom JS, published configurator, ...).`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-manager.js","sourceRoot":"","sources":["../../../src/manager/debug-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAgBkB;AAClB,yDAAmE;AAEnE;;GAEG;AACH,MAAa,YAAY;IAOvB,gBAAgB;IAChB,YAA6B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QALjC,gBAAW,GAAsB,IAAI,CAAC;QACtC,oCAA+B,GAAY,KAAK,CAAC;QACjD,kCAA6B,GAAuB,IAAI,CAAC;IAGrB,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;;;;OAIG;IACI,oCAAoC,CAAC,EAAe;QACzD,IAAI,CAAC,6BAA6B,GAAG,EAAE,CAAC;IAC1C,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,MAAM,QAAQ,GACZ,MAAA,IAAI,CAAC,6BAA6B;gBAClC,8EAA8E;gBAC9E,MAAA,MAAA,MAAA,
|
|
1
|
+
{"version":3,"file":"debug-manager.js","sourceRoot":"","sources":["../../../src/manager/debug-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
35
|
exports.MaterialManager = void 0;
|
|
36
36
|
const index_1 = require("../index");
|
|
37
|
+
const cbn_viewer_bridge_1 = require("../internal/cbn-viewer-bridge");
|
|
37
38
|
const CloningHelper = __importStar(require("../internal/cloning-helper"));
|
|
38
39
|
const metadata_helper_1 = require("../internal/metadata-helper");
|
|
39
40
|
/**
|
|
@@ -55,7 +56,7 @@ class MaterialManager {
|
|
|
55
56
|
for (const materialId in materialDefinitions) {
|
|
56
57
|
if (this._materialDefinitions[materialId]) {
|
|
57
58
|
console.warn(`Material "${materialId}" is already registered.`);
|
|
58
|
-
|
|
59
|
+
continue;
|
|
59
60
|
}
|
|
60
61
|
this._materialDefinitions[materialId] = materialDefinitions[materialId];
|
|
61
62
|
}
|
|
@@ -175,16 +176,19 @@ class MaterialManager {
|
|
|
175
176
|
* @internal
|
|
176
177
|
*/
|
|
177
178
|
getMaterialDefinition(materialId) {
|
|
178
|
-
var _a
|
|
179
|
+
var _a;
|
|
179
180
|
return __awaiter(this, void 0, void 0, function* () {
|
|
180
181
|
let definition = this._materialDefinitions[materialId];
|
|
181
182
|
if (!definition && this._getMaterialDefinitionCallback) {
|
|
182
183
|
definition = yield this._getMaterialDefinitionCallback(materialId);
|
|
183
184
|
this._materialDefinitions[materialId] = definition;
|
|
185
|
+
return definition;
|
|
184
186
|
}
|
|
185
|
-
|
|
187
|
+
const cbnWindowBridge = (0, cbn_viewer_bridge_1.getCbnViewerBridge)();
|
|
188
|
+
if (!definition && ((_a = cbnWindowBridge === null || cbnWindowBridge === void 0 ? void 0 : cbnWindowBridge.Assets) === null || _a === void 0 ? void 0 : _a.getMaterial)) {
|
|
186
189
|
// fallback to legacy `Cbn.Assets.getMaterial` call to support "old" cfgrs (pre Editor V2)
|
|
187
|
-
|
|
190
|
+
// don't store the result in material defintions, as this code is just here for backwards compatibility`
|
|
191
|
+
definition = cbnWindowBridge.Assets.getMaterial(materialId);
|
|
188
192
|
}
|
|
189
193
|
if (!definition) {
|
|
190
194
|
console.warn(`Material definition for "${materialId}" couldn't be found. Material might not be registered or Material Asset from Combeenation server does not exist or is not connected to the configurator.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"material-manager.js","sourceRoot":"","sources":["../../../src/manager/material-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAUkB;AAClB,0EAA4D;AAC5D,iEAIqC;AAarC;;GAEG;AACH,MAAa,eAAe;IAY1B,gBAAgB;IAChB,YAA6B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QANjC,yBAAoB,GAAiD,EAAE,CAAC;QACxE,qBAAgB,GAAiC,EAAE,CAAC;QACpD,4BAAuB,GAAuD,EAAE,CAAC;IAI7C,CAAC;IAE/C;;;OAGG;IACI,iBAAiB,CAAC,mBAAiE;QACxF,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE;YAC5C,IAAI,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE;gBACzC,OAAO,CAAC,IAAI,CAAC,aAAa,UAAU,0BAA0B,CAAC,CAAC;gBAChE,
|
|
1
|
+
{"version":3,"file":"material-manager.js","sourceRoot":"","sources":["../../../src/manager/material-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/lib-cjs/viewer.d.ts
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import * as Index from './index';
|
|
2
|
-
import { AbstractEngine, CameraManager, DebugManager,
|
|
2
|
+
import { AbstractEngine, CameraManager, DebugManager, DefaultSceneSettings, DimensionLineManager, EngineOptions, EventManager, ExportManager, HtmlAnchorManager, MaterialManager, ModelManager, NodeParameterSubject, ParameterManager, Scene, SceneManager, TagParameterSubject, TextureManager, TransformNode, ViewerUtils } from './index';
|
|
3
|
+
/**
|
|
4
|
+
* Enhancement of TypeScript's default `Partial` typing, which only creates shallow partials
|
|
5
|
+
*/
|
|
6
|
+
export declare type DeepPartial<T> = {
|
|
7
|
+
[K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
|
|
8
|
+
};
|
|
3
9
|
/**
|
|
4
10
|
* Use this type to select nodes directly or via node or tag name.\
|
|
5
11
|
* This pattern is used for excluding nodes from autofocus, GLB export, etc.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viewer.js","sourceRoot":"","sources":["../../src/viewer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAAyC;AACzC,+CAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"viewer.js","sourceRoot":"","sources":["../../src/viewer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -69,7 +69,6 @@ export * from '@babylonjs/core/Materials/Node';
|
|
|
69
69
|
// all viewer modules that are not located in "internal" should be exported from here
|
|
70
70
|
export * from './viewer';
|
|
71
71
|
export * from './viewer-error';
|
|
72
|
-
export * from './global-types';
|
|
73
72
|
export * from './manager/camera-manager';
|
|
74
73
|
export * from './manager/dimension-line-manager';
|
|
75
74
|
export * from './manager/debug-manager';
|
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
ViewerError,
|
|
11
11
|
ViewerErrorIds,
|
|
12
12
|
} from '../index';
|
|
13
|
+
import { getCbnViewerBridge } from './cbn-viewer-bridge';
|
|
13
14
|
import { setInternalMetadataValue } from './metadata-helper';
|
|
14
15
|
import { deleteAllTags, getTagsAsStrArr, setTagsAsString } from './tags-helper';
|
|
15
16
|
import { isArray, isString } from 'lodash-es';
|
|
@@ -165,7 +166,8 @@ function _addMissingMaterialMetadata(dataParsed: unknown, container: AssetContai
|
|
|
165
166
|
const materialOnOriginalMesh = parsedMesh?.materialId;
|
|
166
167
|
|
|
167
168
|
if (materialOnOriginalMesh && materialOnImportedMesh !== materialOnOriginalMesh) {
|
|
168
|
-
|
|
169
|
+
const cbnWindowBridge = getCbnViewerBridge();
|
|
170
|
+
cbnWindowBridge?.Assets?.assertMaterialExists?.(materialOnOriginalMesh);
|
|
169
171
|
setInternalMetadataValue(importedMesh, 'deferredMaterial', materialOnOriginalMesh);
|
|
170
172
|
}
|
|
171
173
|
});
|
|
@@ -230,7 +232,8 @@ function _createDecals(dataParsed: unknown, container: AssetContainer): void {
|
|
|
230
232
|
|
|
231
233
|
// optionally set material and tags directly
|
|
232
234
|
if (materialId) {
|
|
233
|
-
|
|
235
|
+
const cbnWindowBridge = getCbnViewerBridge();
|
|
236
|
+
cbnWindowBridge?.Assets?.assertMaterialExists?.(materialId);
|
|
234
237
|
setInternalMetadataValue(decalMesh, 'deferredMaterial', materialId);
|
|
235
238
|
}
|
|
236
239
|
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Augmentation of the global `window` object used in "old" configurators (pre Editor V2)
|
|
3
|
+
*/
|
|
4
|
+
interface CbnViewerBridge {
|
|
5
|
+
Assets?: {
|
|
6
|
+
/**
|
|
7
|
+
* Retrieve material definition from configurator
|
|
8
|
+
*
|
|
9
|
+
* @return Undefined if no definition for the given material name exists, otherwise an "JSON object" which
|
|
10
|
+
* can be passed to `BABYLON.Material.Parse` to create a runtime material object.
|
|
11
|
+
*/
|
|
12
|
+
getMaterial?(materialId: string): object | undefined;
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Checks if a definition for a given material name exists in the configurator and issues a warning if not
|
|
16
|
+
*/
|
|
17
|
+
assertMaterialExists?(materialId: string): boolean;
|
|
18
|
+
};
|
|
19
|
+
utils?: {
|
|
20
|
+
Viewer3dHelper?: {
|
|
21
|
+
/**
|
|
22
|
+
* Returns parent DOM element of a Combeenation configurator, which can be used as root for the
|
|
23
|
+
* inspector.\
|
|
24
|
+
* Also adjusts styling of some configurator parent sub elements to fix the inspector layout.
|
|
25
|
+
*/
|
|
26
|
+
getCfgrParentDomElementForInspector?(): HTMLElement | undefined;
|
|
27
|
+
};
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export function getCbnViewerBridge(): CbnViewerBridge | undefined {
|
|
32
|
+
return (window as Window & { Cbn?: CbnViewerBridge }).Cbn;
|
|
33
|
+
}
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
Viewer,
|
|
16
16
|
ViewerEvent,
|
|
17
17
|
} from '../index';
|
|
18
|
+
import { getCbnViewerBridge } from '../internal/cbn-viewer-bridge';
|
|
18
19
|
import { nodeHasLeftHandedScaling } from '../internal/math-helper';
|
|
19
20
|
|
|
20
21
|
/**
|
|
@@ -50,19 +51,20 @@ export class DebugManager {
|
|
|
50
51
|
}
|
|
51
52
|
|
|
52
53
|
/**
|
|
53
|
-
* Enables the Babylon.js [Inspector](https://doc.babylonjs.com/legacy/inspector
|
|
54
|
+
* Enables the Babylon.js [Inspector](https://doc.babylonjs.com/legacy/inspector).\
|
|
54
55
|
* Due to the additional size of the inspector, this function is only available in "development" builds!
|
|
55
56
|
*
|
|
56
57
|
* @returns Signalizes if inspector could be loaded
|
|
57
58
|
*/
|
|
58
59
|
public async showInspector(options?: IInspectorOptions): Promise<boolean> {
|
|
60
|
+
const cbnWindowBridge = getCbnViewerBridge();
|
|
59
61
|
if (process.env.NODE_ENV === 'development') {
|
|
60
62
|
const inspModule = await import(/* webpackChunkName: "inspector"*/ '@babylonjs/inspector');
|
|
61
63
|
|
|
62
64
|
const parentEl =
|
|
63
65
|
this._parentDomElementForInspector ??
|
|
64
66
|
// fallback to legacy `window.Cbn` call to support "old" cfgrs (pre Editor V2)
|
|
65
|
-
|
|
67
|
+
cbnWindowBridge?.utils?.Viewer3dHelper?.getCfgrParentDomElementForInspector?.();
|
|
66
68
|
|
|
67
69
|
if (!options && parentEl) {
|
|
68
70
|
// special case for usage in Combeenation configurator:
|
|
@@ -81,7 +83,7 @@ export class DebugManager {
|
|
|
81
83
|
return true;
|
|
82
84
|
} else {
|
|
83
85
|
// inspector not available, set according warning message in console
|
|
84
|
-
if (
|
|
86
|
+
if (cbnWindowBridge) {
|
|
85
87
|
console.warn(`Inspector not loaded.
|
|
86
88
|
The inspector can only be used in development builds (e.g. during development with watch mode, in the configurator preview, ...)
|
|
87
89
|
but not in production (e.g. production build of Custom JS, published configurator, ...).`);
|
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
ViewerErrorIds,
|
|
10
10
|
ViewerEvent,
|
|
11
11
|
} from '../index';
|
|
12
|
+
import { getCbnViewerBridge } from '../internal/cbn-viewer-bridge';
|
|
12
13
|
import * as CloningHelper from '../internal/cloning-helper';
|
|
13
14
|
import {
|
|
14
15
|
clearInternalMetadataValue,
|
|
@@ -53,7 +54,7 @@ export class MaterialManager {
|
|
|
53
54
|
for (const materialId in materialDefinitions) {
|
|
54
55
|
if (this._materialDefinitions[materialId]) {
|
|
55
56
|
console.warn(`Material "${materialId}" is already registered.`);
|
|
56
|
-
|
|
57
|
+
continue;
|
|
57
58
|
}
|
|
58
59
|
|
|
59
60
|
this._materialDefinitions[materialId] = materialDefinitions[materialId];
|
|
@@ -196,11 +197,15 @@ export class MaterialManager {
|
|
|
196
197
|
if (!definition && this._getMaterialDefinitionCallback) {
|
|
197
198
|
definition = await this._getMaterialDefinitionCallback(materialId);
|
|
198
199
|
this._materialDefinitions[materialId] = definition;
|
|
200
|
+
|
|
201
|
+
return definition;
|
|
199
202
|
}
|
|
200
203
|
|
|
201
|
-
|
|
204
|
+
const cbnWindowBridge = getCbnViewerBridge();
|
|
205
|
+
if (!definition && cbnWindowBridge?.Assets?.getMaterial) {
|
|
202
206
|
// fallback to legacy `Cbn.Assets.getMaterial` call to support "old" cfgrs (pre Editor V2)
|
|
203
|
-
|
|
207
|
+
// don't store the result in material defintions, as this code is just here for backwards compatibility`
|
|
208
|
+
definition = cbnWindowBridge.Assets.getMaterial(materialId) as MaterialDefinition | undefined;
|
|
204
209
|
}
|
|
205
210
|
|
|
206
211
|
if (!definition) {
|
package/src/viewer.ts
CHANGED
|
@@ -4,7 +4,6 @@ import {
|
|
|
4
4
|
AbstractEngine,
|
|
5
5
|
CameraManager,
|
|
6
6
|
DebugManager,
|
|
7
|
-
DeepPartial,
|
|
8
7
|
DefaultSceneSettings,
|
|
9
8
|
DimensionLineManager,
|
|
10
9
|
Engine,
|
|
@@ -28,6 +27,13 @@ import { registerCustomCbnBabylonLoaderPlugin } from './internal/cbn-custom-baby
|
|
|
28
27
|
import { getIsScaledDownDevice } from './internal/device-helper';
|
|
29
28
|
import { cloneDeep, merge } from 'lodash-es';
|
|
30
29
|
|
|
30
|
+
/**
|
|
31
|
+
* Enhancement of TypeScript's default `Partial` typing, which only creates shallow partials
|
|
32
|
+
*/
|
|
33
|
+
export type DeepPartial<T> = {
|
|
34
|
+
[K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
|
|
35
|
+
};
|
|
36
|
+
|
|
31
37
|
/**
|
|
32
38
|
* Use this type to select nodes directly or via node or tag name.\
|
|
33
39
|
* This pattern is used for excluding nodes from autofocus, GLB export, etc.
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Enhancement of TypeScript's default `Partial` typing, which only creates shallow partials
|
|
3
|
-
*/
|
|
4
|
-
export declare type DeepPartial<T> = {
|
|
5
|
-
[K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
|
|
6
|
-
};
|
|
7
|
-
declare global {
|
|
8
|
-
interface Window {
|
|
9
|
-
Cbn: undefined | {
|
|
10
|
-
Assets?: {
|
|
11
|
-
/**
|
|
12
|
-
* Retrieve material definition from configurator
|
|
13
|
-
*
|
|
14
|
-
* @return Undefined if no definition for the given material name exists, otherwise an "JSON object" which
|
|
15
|
-
* can be passed to `BABYLON.Material.Parse` to create a runtime material object.
|
|
16
|
-
*/
|
|
17
|
-
getMaterial?(materialId: string): object | undefined;
|
|
18
|
-
/**
|
|
19
|
-
* Checks if a definition for a given material name exists in the configurator and issues a warning if not
|
|
20
|
-
*/
|
|
21
|
-
assertMaterialExists?(materialId: string): boolean;
|
|
22
|
-
};
|
|
23
|
-
utils?: {
|
|
24
|
-
Viewer3dHelper?: {
|
|
25
|
-
/**
|
|
26
|
-
* Returns parent DOM element of a Combeenation configurator, which can be used as root for the
|
|
27
|
-
* inspector.\
|
|
28
|
-
* Also adjusts styling of some configurator parent sub elements to fix the inspector layout.
|
|
29
|
-
*/
|
|
30
|
-
getCfgrParentDomElementForInspector?(): HTMLElement | undefined;
|
|
31
|
-
};
|
|
32
|
-
};
|
|
33
|
-
};
|
|
34
|
-
}
|
|
35
|
-
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"global-types.js","sourceRoot":"","sources":["../../src/global-types.ts"],"names":[],"mappings":""}
|
package/src/global-types.ts
DELETED
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Enhancement of TypeScript's default `Partial` typing, which only creates shallow partials
|
|
3
|
-
*/
|
|
4
|
-
export type DeepPartial<T> = {
|
|
5
|
-
[K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
|
|
6
|
-
};
|
|
7
|
-
|
|
8
|
-
declare global {
|
|
9
|
-
interface Window {
|
|
10
|
-
Cbn:
|
|
11
|
-
| undefined /* window.Cbn is only available when viewer runs inside Combeenation configurator */
|
|
12
|
-
| {
|
|
13
|
-
Assets?: {
|
|
14
|
-
/**
|
|
15
|
-
* Retrieve material definition from configurator
|
|
16
|
-
*
|
|
17
|
-
* @return Undefined if no definition for the given material name exists, otherwise an "JSON object" which
|
|
18
|
-
* can be passed to `BABYLON.Material.Parse` to create a runtime material object.
|
|
19
|
-
*/
|
|
20
|
-
getMaterial?(materialId: string): object | undefined;
|
|
21
|
-
|
|
22
|
-
/**
|
|
23
|
-
* Checks if a definition for a given material name exists in the configurator and issues a warning if not
|
|
24
|
-
*/
|
|
25
|
-
assertMaterialExists?(materialId: string): boolean;
|
|
26
|
-
};
|
|
27
|
-
utils?: {
|
|
28
|
-
Viewer3dHelper?: {
|
|
29
|
-
/**
|
|
30
|
-
* Returns parent DOM element of a Combeenation configurator, which can be used as root for the
|
|
31
|
-
* inspector.\
|
|
32
|
-
* Also adjusts styling of some configurator parent sub elements to fix the inspector layout.
|
|
33
|
-
*/
|
|
34
|
-
getCfgrParentDomElementForInspector?(): HTMLElement | undefined;
|
|
35
|
-
};
|
|
36
|
-
};
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
}
|