@combeenation/3d-viewer 6.4.0 → 6.5.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/api/util/sceneLoaderHelper.js +5 -3
- package/dist/lib-cjs/api/util/sceneLoaderHelper.js.map +1 -1
- 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 -1
- package/dist/lib-cjs/index.js +3 -1
- package/dist/lib-cjs/index.js.map +1 -1
- package/package.json +1 -1
- package/src/api/util/sceneLoaderHelper.ts +4 -3
- package/src/index.ts +2 -0
|
@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.createMaterialFromCbnAssets = exports.addMissingMaterialObserver = exports.addMissingMaterialMetadata = exports.getMaterialPostLoadObserver = exports.getCustomCbnBabylonLoaderPlugin = exports.missingMaterialMetadataName = void 0;
|
|
16
16
|
const babylonHelper_1 = require("./babylonHelper");
|
|
17
|
+
const resourceHelper_1 = require("./resourceHelper");
|
|
17
18
|
const material_1 = require("@babylonjs/core/Materials/material");
|
|
18
19
|
const instancedMesh_1 = require("@babylonjs/core/Meshes/instancedMesh");
|
|
19
20
|
const has_1 = __importDefault(require("lodash-es/has"));
|
|
@@ -56,10 +57,11 @@ exports.getCustomCbnBabylonLoaderPlugin = getCustomCbnBabylonLoaderPlugin;
|
|
|
56
57
|
*/
|
|
57
58
|
const getMaterialPostLoadObserver = function (concerningMesh) {
|
|
58
59
|
return () => __awaiter(this, void 0, void 0, function* () {
|
|
60
|
+
var _a;
|
|
59
61
|
const scene = concerningMesh.getScene();
|
|
60
62
|
// can't check `isEnabled` immediatly, since the enabled state of parents and childs is not synced yet
|
|
61
|
-
// postpone
|
|
62
|
-
yield
|
|
63
|
+
// postpone one cycle to ensure a correct parent-child enable relation
|
|
64
|
+
yield (0, resourceHelper_1.sleep)(0);
|
|
63
65
|
const hasBeenEnabled = concerningMesh.isEnabled(true);
|
|
64
66
|
const materialMissing = (0, has_1.default)(concerningMesh.metadata, exports.missingMaterialMetadataName);
|
|
65
67
|
if (!hasBeenEnabled || !materialMissing)
|
|
@@ -73,7 +75,7 @@ const getMaterialPostLoadObserver = function (concerningMesh) {
|
|
|
73
75
|
delete concerningMesh.metadata[exports.missingMaterialMetadataName];
|
|
74
76
|
// remove all "enable" observers that were assigned to the concerning mesh
|
|
75
77
|
// the mesh got visible and therefore the observers are not needed anymore
|
|
76
|
-
enableObserverMap[concerningMesh.id].forEach(entry => {
|
|
78
|
+
(_a = enableObserverMap[concerningMesh.id]) === null || _a === void 0 ? void 0 : _a.forEach(entry => {
|
|
77
79
|
const currNode = scene.getMeshById(entry.currNodeId);
|
|
78
80
|
currNode === null || currNode === void 0 ? void 0 : currNode.onEnabledStateChangedObservable.remove(entry.observer);
|
|
79
81
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sceneLoaderHelper.js","sourceRoot":"","sources":["../../../../src/api/util/sceneLoaderHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mDAA4G;
|
|
1
|
+
{"version":3,"file":"sceneLoaderHelper.js","sourceRoot":"","sources":["../../../../src/api/util/sceneLoaderHelper.ts"],"names":[],"mappings":"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"}
|