@combeenation/3d-viewer 21.0.0-beta2 → 21.0.0
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/manager/debug-manager.d.ts +1 -1
- package/dist/lib-cjs/manager/debug-manager.js +1 -1
- package/dist/lib-cjs/manager/material-manager.js +3 -1
- package/dist/lib-cjs/manager/material-manager.js.map +1 -1
- package/package.json +1 -1
- package/src/manager/debug-manager.ts +1 -1
- package/src/manager/material-manager.ts +4 -1
|
@@ -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
|
|
@@ -62,7 +62,7 @@ class DebugManager {
|
|
|
62
62
|
this._parentDomElementForInspector = el;
|
|
63
63
|
}
|
|
64
64
|
/**
|
|
65
|
-
* Enables the Babylon.js [Inspector](https://doc.babylonjs.com/legacy/inspector
|
|
65
|
+
* Enables the Babylon.js [Inspector](https://doc.babylonjs.com/legacy/inspector).\
|
|
66
66
|
* Due to the additional size of the inspector, this function is only available in "development" builds!
|
|
67
67
|
*
|
|
68
68
|
* @returns Signalizes if inspector could be loaded
|
|
@@ -55,7 +55,7 @@ class MaterialManager {
|
|
|
55
55
|
for (const materialId in materialDefinitions) {
|
|
56
56
|
if (this._materialDefinitions[materialId]) {
|
|
57
57
|
console.warn(`Material "${materialId}" is already registered.`);
|
|
58
|
-
|
|
58
|
+
continue;
|
|
59
59
|
}
|
|
60
60
|
this._materialDefinitions[materialId] = materialDefinitions[materialId];
|
|
61
61
|
}
|
|
@@ -181,9 +181,11 @@ class MaterialManager {
|
|
|
181
181
|
if (!definition && this._getMaterialDefinitionCallback) {
|
|
182
182
|
definition = yield this._getMaterialDefinitionCallback(materialId);
|
|
183
183
|
this._materialDefinitions[materialId] = definition;
|
|
184
|
+
return definition;
|
|
184
185
|
}
|
|
185
186
|
if (!definition && ((_b = (_a = window.Cbn) === null || _a === void 0 ? void 0 : _a.Assets) === null || _b === void 0 ? void 0 : _b.getMaterial)) {
|
|
186
187
|
// fallback to legacy `Cbn.Assets.getMaterial` call to support "old" cfgrs (pre Editor V2)
|
|
188
|
+
// don't store the result in material defintions, as this code is just here for backwards compatibility`
|
|
187
189
|
definition = window.Cbn.Assets.getMaterial(materialId);
|
|
188
190
|
}
|
|
189
191
|
if (!definition) {
|
|
@@ -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/package.json
CHANGED
|
@@ -50,7 +50,7 @@ export class DebugManager {
|
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
/**
|
|
53
|
-
* Enables the Babylon.js [Inspector](https://doc.babylonjs.com/legacy/inspector
|
|
53
|
+
* Enables the Babylon.js [Inspector](https://doc.babylonjs.com/legacy/inspector).\
|
|
54
54
|
* Due to the additional size of the inspector, this function is only available in "development" builds!
|
|
55
55
|
*
|
|
56
56
|
* @returns Signalizes if inspector could be loaded
|
|
@@ -53,7 +53,7 @@ export class MaterialManager {
|
|
|
53
53
|
for (const materialId in materialDefinitions) {
|
|
54
54
|
if (this._materialDefinitions[materialId]) {
|
|
55
55
|
console.warn(`Material "${materialId}" is already registered.`);
|
|
56
|
-
|
|
56
|
+
continue;
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
this._materialDefinitions[materialId] = materialDefinitions[materialId];
|
|
@@ -196,10 +196,13 @@ export class MaterialManager {
|
|
|
196
196
|
if (!definition && this._getMaterialDefinitionCallback) {
|
|
197
197
|
definition = await this._getMaterialDefinitionCallback(materialId);
|
|
198
198
|
this._materialDefinitions[materialId] = definition;
|
|
199
|
+
|
|
200
|
+
return definition;
|
|
199
201
|
}
|
|
200
202
|
|
|
201
203
|
if (!definition && window.Cbn?.Assets?.getMaterial) {
|
|
202
204
|
// fallback to legacy `Cbn.Assets.getMaterial` call to support "old" cfgrs (pre Editor V2)
|
|
205
|
+
// don't store the result in material defintions, as this code is just here for backwards compatibility`
|
|
203
206
|
definition = window.Cbn.Assets.getMaterial(materialId) as MaterialDefinition | undefined;
|
|
204
207
|
}
|
|
205
208
|
|