@combeenation/3d-viewer 21.0.1-beta1 → 21.0.1
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/internal/cbn-custom-babylon-loader-plugin.js +2 -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 +1 -1
- package/dist/lib-cjs/internal/cbn-viewer-bridge.js +2 -5
- package/dist/lib-cjs/internal/cbn-viewer-bridge.js.map +1 -1
- package/dist/lib-cjs/manager/debug-manager.js +2 -3
- package/dist/lib-cjs/manager/debug-manager.js.map +1 -1
- package/dist/lib-cjs/manager/material-manager.js +2 -3
- package/dist/lib-cjs/manager/material-manager.js.map +1 -1
- package/package.json +1 -1
- package/src/internal/cbn-custom-babylon-loader-plugin.ts +3 -5
- package/src/internal/cbn-viewer-bridge.ts +1 -3
- package/src/manager/debug-manager.ts +3 -4
- package/src/manager/material-manager.ts +3 -4
|
@@ -129,8 +129,7 @@ function _addMissingMaterialMetadata(dataParsed, container) {
|
|
|
129
129
|
const materialOnImportedMesh = (_a = importedMesh.material) === null || _a === void 0 ? void 0 : _a.id;
|
|
130
130
|
const materialOnOriginalMesh = parsedMesh === null || parsedMesh === void 0 ? void 0 : parsedMesh.materialId;
|
|
131
131
|
if (materialOnOriginalMesh && materialOnImportedMesh !== materialOnOriginalMesh) {
|
|
132
|
-
|
|
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
|
+
(_c = (_b = cbn_viewer_bridge_1.CbnViewerBridge === null || cbn_viewer_bridge_1.CbnViewerBridge === void 0 ? void 0 : cbn_viewer_bridge_1.CbnViewerBridge.Assets) === null || _b === void 0 ? void 0 : _b.assertMaterialExists) === null || _c === void 0 ? void 0 : _c.call(_b, materialOnOriginalMesh);
|
|
134
133
|
(0, metadata_helper_1.setInternalMetadataValue)(importedMesh, 'deferredMaterial', materialOnOriginalMesh);
|
|
135
134
|
}
|
|
136
135
|
});
|
|
@@ -191,8 +190,7 @@ function _createDecals(dataParsed, container) {
|
|
|
191
190
|
const decalMesh = index_1.DecalUtils.createDecalMesh(decalMeshConfig, container, false);
|
|
192
191
|
// optionally set material and tags directly
|
|
193
192
|
if (materialId) {
|
|
194
|
-
|
|
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
|
+
(_b = (_a = cbn_viewer_bridge_1.CbnViewerBridge === null || cbn_viewer_bridge_1.CbnViewerBridge === void 0 ? void 0 : cbn_viewer_bridge_1.CbnViewerBridge.Assets) === null || _a === void 0 ? void 0 : _a.assertMaterialExists) === null || _b === void 0 ? void 0 : _b.call(_a, materialId);
|
|
196
194
|
(0, metadata_helper_1.setInternalMetadataValue)(decalMesh, 'deferredMaterial', materialId);
|
|
197
195
|
}
|
|
198
196
|
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":";;;;;;;;;;;;;;AAAA,oCAWkB;AAClB,
|
|
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,8 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
|
|
5
|
-
return window.Cbn;
|
|
6
|
-
}
|
|
7
|
-
exports.getCbnViewerBridge = getCbnViewerBridge;
|
|
3
|
+
exports.CbnViewerBridge = void 0;
|
|
4
|
+
exports.CbnViewerBridge = window.Cbn;
|
|
8
5
|
//# sourceMappingURL=cbn-viewer-bridge.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cbn-viewer-bridge.js","sourceRoot":"","sources":["../../../src/internal/cbn-viewer-bridge.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"cbn-viewer-bridge.js","sourceRoot":"","sources":["../../../src/internal/cbn-viewer-bridge.ts"],"names":[],"mappings":";;;AA8Ba,QAAA,eAAe,GAAI,MAA6C,CAAC,GAAG,CAAC"}
|
|
@@ -71,12 +71,11 @@ class DebugManager {
|
|
|
71
71
|
showInspector(options) {
|
|
72
72
|
var _a, _b, _c, _d;
|
|
73
73
|
return __awaiter(this, void 0, void 0, function* () {
|
|
74
|
-
const cbnWindowBridge = (0, cbn_viewer_bridge_1.getCbnViewerBridge)();
|
|
75
74
|
if (process.env.NODE_ENV === 'development') {
|
|
76
75
|
const inspModule = yield Promise.resolve().then(() => __importStar(require(/* webpackChunkName: "inspector"*/ '@babylonjs/inspector')));
|
|
77
76
|
const parentEl = (_a = this._parentDomElementForInspector) !== null && _a !== void 0 ? _a :
|
|
78
77
|
// fallback to legacy `window.Cbn` call to support "old" cfgrs (pre Editor V2)
|
|
79
|
-
(_d = (_c = (_b =
|
|
78
|
+
(_d = (_c = (_b = cbn_viewer_bridge_1.CbnViewerBridge === null || cbn_viewer_bridge_1.CbnViewerBridge === void 0 ? void 0 : cbn_viewer_bridge_1.CbnViewerBridge.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);
|
|
80
79
|
if (!options && parentEl) {
|
|
81
80
|
// special case for usage in Combeenation configurator:
|
|
82
81
|
// if no options are set the inspector will be rendered into the parent element of the configurator
|
|
@@ -94,7 +93,7 @@ class DebugManager {
|
|
|
94
93
|
}
|
|
95
94
|
else {
|
|
96
95
|
// inspector not available, set according warning message in console
|
|
97
|
-
if (
|
|
96
|
+
if (cbn_viewer_bridge_1.CbnViewerBridge) {
|
|
98
97
|
console.warn(`Inspector not loaded.
|
|
99
98
|
The inspector can only be used in development builds (e.g. during development with watch mode, in the configurator preview, ...)
|
|
100
99
|
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,
|
|
1
|
+
{"version":3,"file":"debug-manager.js","sourceRoot":"","sources":["../../../src/manager/debug-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -184,11 +184,10 @@ class MaterialManager {
|
|
|
184
184
|
this._materialDefinitions[materialId] = definition;
|
|
185
185
|
return definition;
|
|
186
186
|
}
|
|
187
|
-
|
|
188
|
-
if (!definition && ((_a = cbnWindowBridge === null || cbnWindowBridge === void 0 ? void 0 : cbnWindowBridge.Assets) === null || _a === void 0 ? void 0 : _a.getMaterial)) {
|
|
187
|
+
if (!definition && ((_a = cbn_viewer_bridge_1.CbnViewerBridge === null || cbn_viewer_bridge_1.CbnViewerBridge === void 0 ? void 0 : cbn_viewer_bridge_1.CbnViewerBridge.Assets) === null || _a === void 0 ? void 0 : _a.getMaterial)) {
|
|
189
188
|
// fallback to legacy `Cbn.Assets.getMaterial` call to support "old" cfgrs (pre Editor V2)
|
|
190
189
|
// don't store the result in material defintions, as this code is just here for backwards compatibility`
|
|
191
|
-
definition =
|
|
190
|
+
definition = cbn_viewer_bridge_1.CbnViewerBridge.Assets.getMaterial(materialId);
|
|
192
191
|
}
|
|
193
192
|
if (!definition) {
|
|
194
193
|
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,
|
|
1
|
+
{"version":3,"file":"material-manager.js","sourceRoot":"","sources":["../../../src/manager/material-manager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
ViewerError,
|
|
11
11
|
ViewerErrorIds,
|
|
12
12
|
} from '../index';
|
|
13
|
-
import {
|
|
13
|
+
import { CbnViewerBridge } from './cbn-viewer-bridge';
|
|
14
14
|
import { setInternalMetadataValue } from './metadata-helper';
|
|
15
15
|
import { deleteAllTags, getTagsAsStrArr, setTagsAsString } from './tags-helper';
|
|
16
16
|
import { isArray, isString } from 'lodash-es';
|
|
@@ -166,8 +166,7 @@ function _addMissingMaterialMetadata(dataParsed: unknown, container: AssetContai
|
|
|
166
166
|
const materialOnOriginalMesh = parsedMesh?.materialId;
|
|
167
167
|
|
|
168
168
|
if (materialOnOriginalMesh && materialOnImportedMesh !== materialOnOriginalMesh) {
|
|
169
|
-
|
|
170
|
-
cbnWindowBridge?.Assets?.assertMaterialExists?.(materialOnOriginalMesh);
|
|
169
|
+
CbnViewerBridge?.Assets?.assertMaterialExists?.(materialOnOriginalMesh);
|
|
171
170
|
setInternalMetadataValue(importedMesh, 'deferredMaterial', materialOnOriginalMesh);
|
|
172
171
|
}
|
|
173
172
|
});
|
|
@@ -232,8 +231,7 @@ function _createDecals(dataParsed: unknown, container: AssetContainer): void {
|
|
|
232
231
|
|
|
233
232
|
// optionally set material and tags directly
|
|
234
233
|
if (materialId) {
|
|
235
|
-
|
|
236
|
-
cbnWindowBridge?.Assets?.assertMaterialExists?.(materialId);
|
|
234
|
+
CbnViewerBridge?.Assets?.assertMaterialExists?.(materialId);
|
|
237
235
|
setInternalMetadataValue(decalMesh, 'deferredMaterial', materialId);
|
|
238
236
|
}
|
|
239
237
|
|
|
@@ -28,6 +28,4 @@ interface CbnViewerBridge {
|
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
export
|
|
32
|
-
return (window as Window & { Cbn?: CbnViewerBridge }).Cbn;
|
|
33
|
-
}
|
|
31
|
+
export const CbnViewerBridge = (window as Window & { Cbn?: CbnViewerBridge }).Cbn;
|
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
Viewer,
|
|
16
16
|
ViewerEvent,
|
|
17
17
|
} from '../index';
|
|
18
|
-
import {
|
|
18
|
+
import { CbnViewerBridge } from '../internal/cbn-viewer-bridge';
|
|
19
19
|
import { nodeHasLeftHandedScaling } from '../internal/math-helper';
|
|
20
20
|
|
|
21
21
|
/**
|
|
@@ -57,14 +57,13 @@ export class DebugManager {
|
|
|
57
57
|
* @returns Signalizes if inspector could be loaded
|
|
58
58
|
*/
|
|
59
59
|
public async showInspector(options?: IInspectorOptions): Promise<boolean> {
|
|
60
|
-
const cbnWindowBridge = getCbnViewerBridge();
|
|
61
60
|
if (process.env.NODE_ENV === 'development') {
|
|
62
61
|
const inspModule = await import(/* webpackChunkName: "inspector"*/ '@babylonjs/inspector');
|
|
63
62
|
|
|
64
63
|
const parentEl =
|
|
65
64
|
this._parentDomElementForInspector ??
|
|
66
65
|
// fallback to legacy `window.Cbn` call to support "old" cfgrs (pre Editor V2)
|
|
67
|
-
|
|
66
|
+
CbnViewerBridge?.utils?.Viewer3dHelper?.getCfgrParentDomElementForInspector?.();
|
|
68
67
|
|
|
69
68
|
if (!options && parentEl) {
|
|
70
69
|
// special case for usage in Combeenation configurator:
|
|
@@ -83,7 +82,7 @@ export class DebugManager {
|
|
|
83
82
|
return true;
|
|
84
83
|
} else {
|
|
85
84
|
// inspector not available, set according warning message in console
|
|
86
|
-
if (
|
|
85
|
+
if (CbnViewerBridge) {
|
|
87
86
|
console.warn(`Inspector not loaded.
|
|
88
87
|
The inspector can only be used in development builds (e.g. during development with watch mode, in the configurator preview, ...)
|
|
89
88
|
but not in production (e.g. production build of Custom JS, published configurator, ...).`);
|
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
ViewerErrorIds,
|
|
10
10
|
ViewerEvent,
|
|
11
11
|
} from '../index';
|
|
12
|
-
import {
|
|
12
|
+
import { CbnViewerBridge } from '../internal/cbn-viewer-bridge';
|
|
13
13
|
import * as CloningHelper from '../internal/cloning-helper';
|
|
14
14
|
import {
|
|
15
15
|
clearInternalMetadataValue,
|
|
@@ -201,11 +201,10 @@ export class MaterialManager {
|
|
|
201
201
|
return definition;
|
|
202
202
|
}
|
|
203
203
|
|
|
204
|
-
|
|
205
|
-
if (!definition && cbnWindowBridge?.Assets?.getMaterial) {
|
|
204
|
+
if (!definition && CbnViewerBridge?.Assets?.getMaterial) {
|
|
206
205
|
// fallback to legacy `Cbn.Assets.getMaterial` call to support "old" cfgrs (pre Editor V2)
|
|
207
206
|
// don't store the result in material defintions, as this code is just here for backwards compatibility`
|
|
208
|
-
definition =
|
|
207
|
+
definition = CbnViewerBridge.Assets.getMaterial(materialId) as MaterialDefinition | undefined;
|
|
209
208
|
}
|
|
210
209
|
|
|
211
210
|
if (!definition) {
|