@combeenation/3d-viewer 15.0.0 → 15.1.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/index.d.ts +1 -1
- package/dist/lib-cjs/index.js +1 -1
- package/dist/lib-cjs/index.js.map +1 -1
- package/dist/lib-cjs/internal/cbn-custom-babylon-loader-plugin.js +0 -24
- package/dist/lib-cjs/internal/cbn-custom-babylon-loader-plugin.js.map +1 -1
- package/dist/lib-cjs/internal/cloning-helper.d.ts +4 -4
- package/dist/lib-cjs/internal/cloning-helper.js +22 -7
- package/dist/lib-cjs/internal/cloning-helper.js.map +1 -1
- package/dist/lib-cjs/manager/material-manager.d.ts +22 -1
- package/dist/lib-cjs/manager/material-manager.js +68 -0
- package/dist/lib-cjs/manager/material-manager.js.map +1 -1
- package/dist/lib-cjs/manager/model-manager.d.ts +4 -2
- package/dist/lib-cjs/manager/model-manager.js +7 -1
- package/dist/lib-cjs/manager/model-manager.js.map +1 -1
- package/dist/lib-cjs/manager/parameter-manager.d.ts +22 -8
- package/dist/lib-cjs/manager/parameter-manager.js +22 -4
- package/dist/lib-cjs/manager/parameter-manager.js.map +1 -1
- package/dist/lib-cjs/viewer-error.d.ts +2 -0
- package/dist/lib-cjs/viewer-error.js +2 -0
- package/dist/lib-cjs/viewer-error.js.map +1 -1
- package/package.json +11 -11
- package/src/index.ts +1 -1
- package/src/internal/cbn-custom-babylon-loader-plugin.ts +1 -30
- package/src/internal/cloning-helper.ts +29 -5
- package/src/manager/material-manager.ts +62 -0
- package/src/manager/model-manager.ts +11 -5
- package/src/manager/parameter-manager.ts +32 -10
- package/src/viewer-error.ts +2 -0
package/dist/lib-cjs/index.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/// <reference path="../../src/global-types.d.ts" />
|
|
2
2
|
import '@babylonjs/loaders/glTF/2.0/Extensions';
|
|
3
3
|
import '@babylonjs/serializers/glTF/2.0/Extensions';
|
|
4
|
-
export * from '@babylonjs/core/abstractScene';
|
|
5
4
|
export * from '@babylonjs/core/Animations';
|
|
6
5
|
export * from '@babylonjs/core/assetContainer';
|
|
6
|
+
export * from '@babylonjs/core/IAssetContainer';
|
|
7
7
|
export * from '@babylonjs/core/Buffers';
|
|
8
8
|
export * from '@babylonjs/core/Cameras/arcRotateCamera';
|
|
9
9
|
export * from '@babylonjs/core/Cameras/camera';
|
package/dist/lib-cjs/index.js
CHANGED
|
@@ -25,9 +25,9 @@ require("@babylonjs/serializers/glTF/2.0/Extensions");
|
|
|
25
25
|
// to make single imports from "@babylonjs/..."
|
|
26
26
|
// When using Babylon.js modules inside the viewer repo make sure to import from the viewer root as well.
|
|
27
27
|
// E.g. `import { BaseTexture, Material, Node } from '../index';`
|
|
28
|
-
__exportStar(require("@babylonjs/core/abstractScene"), exports);
|
|
29
28
|
__exportStar(require("@babylonjs/core/Animations"), exports);
|
|
30
29
|
__exportStar(require("@babylonjs/core/assetContainer"), exports);
|
|
30
|
+
__exportStar(require("@babylonjs/core/IAssetContainer"), exports);
|
|
31
31
|
__exportStar(require("@babylonjs/core/Buffers"), exports);
|
|
32
32
|
__exportStar(require("@babylonjs/core/Cameras/arcRotateCamera"), exports);
|
|
33
33
|
__exportStar(require("@babylonjs/core/Cameras/camera"), 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,
|
|
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,wDAAsC;AACtC,uDAAqC;AACrC,iFAA+D;AAC/D,wDAAsC;AACtC,wDAAsC;AACtC,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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.registerCustomCbnBabylonLoaderPlugin = void 0;
|
|
4
4
|
const index_1 = require("../index");
|
|
5
|
-
const cloning_helper_1 = require("./cloning-helper");
|
|
6
5
|
const metadata_helper_1 = require("./metadata-helper");
|
|
7
6
|
const tags_helper_1 = require("./tags-helper");
|
|
8
7
|
const lodash_es_1 = require("lodash-es");
|
|
@@ -26,19 +25,10 @@ function registerCustomCbnBabylonLoaderPlugin() {
|
|
|
26
25
|
importMesh: previousLoaderPlugin.importMesh,
|
|
27
26
|
load: previousLoaderPlugin.load,
|
|
28
27
|
loadAssetContainer: function (scene, data, rootUrl, onError) {
|
|
29
|
-
// temporarily remove all morph target managers from scene before loading the model to avoid clashes with existing
|
|
30
|
-
// unique ids => see CB-9928
|
|
31
|
-
// NOTE: morph target managers still exist on the dedicated mesh when getting removed from the scene, only
|
|
32
|
-
// `scene.getMorphTargetManagerById` is affected, which is used internally in the `loadAssetContainer` function
|
|
33
|
-
const curMorphTargetManagers = scene.morphTargetManagers;
|
|
34
|
-
scene.morphTargetManagers = [];
|
|
35
28
|
const dataParsed = JSON.parse(data);
|
|
36
29
|
const importedContainer = previousLoaderPlugin.loadAssetContainer(scene, data, rootUrl);
|
|
37
30
|
_addMissingMaterialMetadata(dataParsed, importedContainer);
|
|
38
31
|
_reconstructTagsForInstancedMeshes(dataParsed, importedContainer);
|
|
39
|
-
_unifyMorphTargetManagerIds(importedContainer, scene);
|
|
40
|
-
// restore existing morph target managers
|
|
41
|
-
scene.morphTargetManagers.push(...curMorphTargetManagers);
|
|
42
32
|
return importedContainer;
|
|
43
33
|
},
|
|
44
34
|
};
|
|
@@ -115,18 +105,4 @@ function _reconstructTagsForInstancedMeshes(dataParsed, container) {
|
|
|
115
105
|
}
|
|
116
106
|
});
|
|
117
107
|
}
|
|
118
|
-
/**
|
|
119
|
-
* Morph target managers from different assets may receive the same id, which leads to erroneous morph target
|
|
120
|
-
* assignments. We can't change the id, but we can create a clone which then creates a new unique id.
|
|
121
|
-
*/
|
|
122
|
-
function _unifyMorphTargetManagerIds(container, scene) {
|
|
123
|
-
[...container.morphTargetManagers].forEach(sourceMTM => {
|
|
124
|
-
const clonedMTM = (0, cloning_helper_1.cloneMorphTargetManager)(sourceMTM, container);
|
|
125
|
-
// clone function adds morph target manager to scene right, which we don't want here as we are only loading the
|
|
126
|
-
// asset container
|
|
127
|
-
scene.removeMorphTargetManager(clonedMTM);
|
|
128
|
-
// original morph target manager with bad id is not needed anymore and can be disposed
|
|
129
|
-
sourceMTM.dispose();
|
|
130
|
-
});
|
|
131
|
-
}
|
|
132
108
|
//# sourceMappingURL=cbn-custom-babylon-loader-plugin.js.map
|
|
@@ -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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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AssetContainer,
|
|
1
|
+
import { AssetContainer, Material, NodeNamingStrategy, Scene, TagNamingStrategy } from '../index';
|
|
2
2
|
/**
|
|
3
3
|
* Clones the node hierarchy of the asset container with some special treatment that differs from Babylon.js default
|
|
4
4
|
* cloning behaviour, such as:
|
|
@@ -13,7 +13,7 @@ export declare function cloneModelAssetContainer(sourceAssetContainer: AssetCont
|
|
|
13
13
|
tagNamingStrategy?: TagNamingStrategy;
|
|
14
14
|
}, scene: Scene): AssetContainer;
|
|
15
15
|
/**
|
|
16
|
-
*
|
|
17
|
-
*
|
|
16
|
+
* Clones the desired material.\
|
|
17
|
+
* This basically just calls the default `clone` function of Babylon.js and applies the tag mapping
|
|
18
18
|
*/
|
|
19
|
-
export declare function
|
|
19
|
+
export declare function cloneMaterial(material: Material, newMaterialId: string, tagNamingStrategy?: TagNamingStrategy): Material;
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.cloneMaterial = exports.cloneModelAssetContainer = void 0;
|
|
4
4
|
const index_1 = require("../index");
|
|
5
5
|
const metadata_helper_1 = require("./metadata-helper");
|
|
6
6
|
const tags_helper_1 = require("./tags-helper");
|
|
7
|
-
const _defaultNodeNamingStrategy = (node,
|
|
8
|
-
return `${node.name}.${
|
|
7
|
+
const _defaultNodeNamingStrategy = (node, clonedObjectId) => {
|
|
8
|
+
return `${node.name}.${clonedObjectId}`;
|
|
9
9
|
};
|
|
10
|
-
const _defaultTagNamingStrategy = (tag,
|
|
10
|
+
const _defaultTagNamingStrategy = (tag, clonedObjectId) => {
|
|
11
11
|
// don't rename tags by default
|
|
12
12
|
return tag;
|
|
13
13
|
};
|
|
@@ -42,7 +42,7 @@ function cloneModelAssetContainer(sourceAssetContainer, newModelName, renaming,
|
|
|
42
42
|
// morph target manager is not cloned per default, therefore morph targets would affect original and cloned model at
|
|
43
43
|
// the same time, which we don't want
|
|
44
44
|
sourceAssetContainer.morphTargetManagers.forEach(sourceMTM => {
|
|
45
|
-
|
|
45
|
+
_cloneMorphTargetManager(sourceMTM, targetAssetContainer);
|
|
46
46
|
});
|
|
47
47
|
_clearCloningMetadata(sourceAssetContainer);
|
|
48
48
|
_clearCloningMetadata(targetAssetContainer);
|
|
@@ -51,11 +51,27 @@ function cloneModelAssetContainer(sourceAssetContainer, newModelName, renaming,
|
|
|
51
51
|
return targetAssetContainer;
|
|
52
52
|
}
|
|
53
53
|
exports.cloneModelAssetContainer = cloneModelAssetContainer;
|
|
54
|
+
/**
|
|
55
|
+
* Clones the desired material.\
|
|
56
|
+
* This basically just calls the default `clone` function of Babylon.js and applies the tag mapping
|
|
57
|
+
*/
|
|
58
|
+
function cloneMaterial(material, newMaterialId, tagNamingStrategy) {
|
|
59
|
+
tagNamingStrategy = tagNamingStrategy !== null && tagNamingStrategy !== void 0 ? tagNamingStrategy : _defaultTagNamingStrategy;
|
|
60
|
+
const clone = material.clone(newMaterialId);
|
|
61
|
+
if (!clone) {
|
|
62
|
+
throw new Error(`Cloning material "${material.id}" failed`);
|
|
63
|
+
}
|
|
64
|
+
const sourceTags = (0, tags_helper_1.getTags)(material);
|
|
65
|
+
const mappedTags = sourceTags.map(tag => tagNamingStrategy(tag, clone.id));
|
|
66
|
+
(0, tags_helper_1.setTags)(clone, mappedTags);
|
|
67
|
+
return clone;
|
|
68
|
+
}
|
|
69
|
+
exports.cloneMaterial = cloneMaterial;
|
|
54
70
|
/**
|
|
55
71
|
* Helper function for cloning a morph target manager and updating all the mesh assignments.
|
|
56
72
|
* Meshes need to be already available in the target asset container.
|
|
57
73
|
*/
|
|
58
|
-
function
|
|
74
|
+
function _cloneMorphTargetManager(sourceMTM, targetAssetContainer) {
|
|
59
75
|
const clonedMTM = sourceMTM.clone();
|
|
60
76
|
clonedMTM._parentContainer = targetAssetContainer;
|
|
61
77
|
targetAssetContainer.morphTargetManagers.push(clonedMTM);
|
|
@@ -66,7 +82,6 @@ function cloneMorphTargetManager(sourceMTM, targetAssetContainer) {
|
|
|
66
82
|
});
|
|
67
83
|
return clonedMTM;
|
|
68
84
|
}
|
|
69
|
-
exports.cloneMorphTargetManager = cloneMorphTargetManager;
|
|
70
85
|
/**
|
|
71
86
|
* The actual geometry cloning function.
|
|
72
87
|
* Calls "clone" function of dedicated Node type and recourses into children to clone the whole node tree.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloning-helper.js","sourceRoot":"","sources":["../../../src/internal/cloning-helper.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"cloning-helper.js","sourceRoot":"","sources":["../../../src/internal/cloning-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
import { AbstractMesh, Material, Viewer } from '../index';
|
|
1
|
+
import { AbstractMesh, Material, TagNamingStrategy, Viewer } from '../index';
|
|
2
|
+
export declare type MaterialCloneOptions = {
|
|
3
|
+
tagNamingStrategy?: TagNamingStrategy;
|
|
4
|
+
};
|
|
2
5
|
/**
|
|
3
6
|
* Manager for material related tasks
|
|
4
7
|
*/
|
|
@@ -9,6 +12,9 @@ export declare class MaterialManager {
|
|
|
9
12
|
* @internal
|
|
10
13
|
*/
|
|
11
14
|
static readonly CBN_FALLBACK_MATERIAL_NAME = "$fallback";
|
|
15
|
+
protected _clonedMaterials: {
|
|
16
|
+
[name: string]: Material;
|
|
17
|
+
};
|
|
12
18
|
protected _createMaterialPromises: {
|
|
13
19
|
[materialId: string]: Promise<Material | null>;
|
|
14
20
|
};
|
|
@@ -31,5 +37,20 @@ export declare class MaterialManager {
|
|
|
31
37
|
* Use {@link setMaterialOnMesh} instead if the material should be applied on the mesh immediately.
|
|
32
38
|
*/
|
|
33
39
|
getOrCreateMaterial(materialId: string, mesh?: AbstractMesh): Promise<Material>;
|
|
40
|
+
/**
|
|
41
|
+
* Creates a clone of a material.\
|
|
42
|
+
* The clones tags will be adjusted according to the "tagNamingStrategy" option.
|
|
43
|
+
* Predefined material parameters will be applied to the material right away.
|
|
44
|
+
*/
|
|
45
|
+
cloneMaterial(materialId: string, newMaterialId: string, options?: MaterialCloneOptions): Promise<Material>;
|
|
46
|
+
/**
|
|
47
|
+
* Removes a cloned material from the scene and from the internal material clone storage.\
|
|
48
|
+
* Also remove all parameter entries from this material.
|
|
49
|
+
*/
|
|
50
|
+
deleteClonedMaterial(materialId: string): void;
|
|
51
|
+
/**
|
|
52
|
+
* Removes all cloned materials from the scene and the internal material clone storage
|
|
53
|
+
*/
|
|
54
|
+
deleteAllClonedMaterials(): void;
|
|
34
55
|
protected _createMaterial(materialId: string, mesh?: AbstractMesh): Promise<Material>;
|
|
35
56
|
}
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
26
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
27
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -11,6 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
35
|
exports.MaterialManager = void 0;
|
|
13
36
|
const index_1 = require("../index");
|
|
37
|
+
const CloningHelper = __importStar(require("../internal/cloning-helper"));
|
|
14
38
|
const metadata_helper_1 = require("../internal/metadata-helper");
|
|
15
39
|
/**
|
|
16
40
|
* Manager for material related tasks
|
|
@@ -19,6 +43,7 @@ class MaterialManager {
|
|
|
19
43
|
/** @internal */
|
|
20
44
|
constructor(viewer) {
|
|
21
45
|
this.viewer = viewer;
|
|
46
|
+
this._clonedMaterials = {};
|
|
22
47
|
this._createMaterialPromises = {};
|
|
23
48
|
}
|
|
24
49
|
/**
|
|
@@ -78,6 +103,49 @@ class MaterialManager {
|
|
|
78
103
|
return chosenMaterial;
|
|
79
104
|
});
|
|
80
105
|
}
|
|
106
|
+
/**
|
|
107
|
+
* Creates a clone of a material.\
|
|
108
|
+
* The clones tags will be adjusted according to the "tagNamingStrategy" option.
|
|
109
|
+
* Predefined material parameters will be applied to the material right away.
|
|
110
|
+
*/
|
|
111
|
+
cloneMaterial(materialId, newMaterialId, options) {
|
|
112
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
113
|
+
const existingMaterial = this._clonedMaterials[newMaterialId];
|
|
114
|
+
if (existingMaterial) {
|
|
115
|
+
throw new index_1.ViewerError({
|
|
116
|
+
id: index_1.ViewerErrorIds.MaterialAlreadyExists,
|
|
117
|
+
message: `Can't create clone as material "${newMaterialId}" already exists`,
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
const sourceMaterial = yield this.getOrCreateMaterial(materialId);
|
|
121
|
+
const clonedMaterial = CloningHelper.cloneMaterial(sourceMaterial, newMaterialId, options === null || options === void 0 ? void 0 : options.tagNamingStrategy);
|
|
122
|
+
yield this.viewer.parameterManager.applyParameterValuesToMaterial(clonedMaterial);
|
|
123
|
+
this._clonedMaterials[newMaterialId] = clonedMaterial;
|
|
124
|
+
return clonedMaterial;
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
/**
|
|
128
|
+
* Removes a cloned material from the scene and from the internal material clone storage.\
|
|
129
|
+
* Also remove all parameter entries from this material.
|
|
130
|
+
*/
|
|
131
|
+
deleteClonedMaterial(materialId) {
|
|
132
|
+
const material = this._clonedMaterials[materialId];
|
|
133
|
+
if (!material) {
|
|
134
|
+
throw new index_1.ViewerError({
|
|
135
|
+
id: index_1.ViewerErrorIds.NotAClonedMaterial,
|
|
136
|
+
message: `Can't delete material "${materialId}" as there is no cloned material with that id`,
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
this.viewer.parameterManager.removeParameterEntriesOfMaterial(material);
|
|
140
|
+
material.dispose(true, true);
|
|
141
|
+
delete this._clonedMaterials[materialId];
|
|
142
|
+
}
|
|
143
|
+
/**
|
|
144
|
+
* Removes all cloned materials from the scene and the internal material clone storage
|
|
145
|
+
*/
|
|
146
|
+
deleteAllClonedMaterials() {
|
|
147
|
+
Object.keys(this._clonedMaterials).forEach(materialId => this.deleteClonedMaterial(materialId));
|
|
148
|
+
}
|
|
81
149
|
_createMaterial(materialId, mesh) {
|
|
82
150
|
var _a;
|
|
83
151
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"material-manager.js","sourceRoot":"","sources":["../../../src/manager/material-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"material-manager.js","sourceRoot":"","sources":["../../../src/manager/material-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,15 +93,17 @@ export declare class ModelManager {
|
|
|
93
93
|
*
|
|
94
94
|
* @param show show model immediately after cloning
|
|
95
95
|
* @param options additional options for the cloning procedure, like renaming algorithms
|
|
96
|
+
* @returns asset container for further processing of the clone
|
|
96
97
|
*/
|
|
97
|
-
cloneModel(name: string, newModelName: string, show?: boolean, options?: ModelCloneOptions): Promise<
|
|
98
|
+
cloneModel(name: string, newModelName: string, show?: boolean, options?: ModelCloneOptions): Promise<AssetContainer>;
|
|
98
99
|
/**
|
|
99
100
|
* Removes a cloned model from the scene and from the internal model storage.\
|
|
101
|
+
* Also removes parameter entries from all nodes of the model.\
|
|
100
102
|
* Deleted clones can not be shown again.
|
|
101
103
|
*/
|
|
102
104
|
deleteClonedModel(name: string): void;
|
|
103
105
|
/**
|
|
104
|
-
* Removes all cloned models from the scene and the internal model storage
|
|
106
|
+
* Removes all cloned models from the scene and the internal model storage
|
|
105
107
|
*/
|
|
106
108
|
deleteAllClonedModels(): void;
|
|
107
109
|
/**
|
|
@@ -181,6 +181,7 @@ class ModelManager {
|
|
|
181
181
|
*
|
|
182
182
|
* @param show show model immediately after cloning
|
|
183
183
|
* @param options additional options for the cloning procedure, like renaming algorithms
|
|
184
|
+
* @returns asset container for further processing of the clone
|
|
184
185
|
*/
|
|
185
186
|
cloneModel(name, newModelName, show = true, options) {
|
|
186
187
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -218,10 +219,12 @@ class ModelManager {
|
|
|
218
219
|
if (show) {
|
|
219
220
|
yield this._showModel(clonedModel);
|
|
220
221
|
}
|
|
222
|
+
return clonedModel.assetContainer;
|
|
221
223
|
});
|
|
222
224
|
}
|
|
223
225
|
/**
|
|
224
226
|
* Removes a cloned model from the scene and from the internal model storage.\
|
|
227
|
+
* Also removes parameter entries from all nodes of the model.\
|
|
225
228
|
* Deleted clones can not be shown again.
|
|
226
229
|
*/
|
|
227
230
|
deleteClonedModel(name) {
|
|
@@ -238,11 +241,14 @@ class ModelManager {
|
|
|
238
241
|
message: `Can't delete model "${name}" as model is not a clone`,
|
|
239
242
|
});
|
|
240
243
|
}
|
|
244
|
+
// parameter entries of deleted model can get in the way when recreating a clone with the same node names
|
|
245
|
+
// that's why it's benefitial to wipe the parameter entries of the model as well after removing it
|
|
246
|
+
this.viewer.parameterManager.removeParameterEntriesOfModel(model.assetContainer);
|
|
241
247
|
model.assetContainer.dispose();
|
|
242
248
|
delete this._modelAssets[name];
|
|
243
249
|
}
|
|
244
250
|
/**
|
|
245
|
-
* Removes all cloned models from the scene and the internal model storage
|
|
251
|
+
* Removes all cloned models from the scene and the internal model storage
|
|
246
252
|
*/
|
|
247
253
|
deleteAllClonedModels() {
|
|
248
254
|
const clonedModelNames = Object.values(this._modelAssets)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-manager.js","sourceRoot":"","sources":["../../../src/manager/model-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAWkB;AAClB,+DAAsE;AACtE,iEAAuE;AACvE,yCAAoC;AAqCpC;;;;GAIG;AACH,MAAa,YAAY;
|
|
1
|
+
{"version":3,"file":"model-manager.js","sourceRoot":"","sources":["../../../src/manager/model-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Color3, IAssetContainer, Material, PBRMaterial, TransformNode, Vector3, Viewer } from '../index';
|
|
2
2
|
import { BuiltInTextureParameterKeys, ParameterTextureChannelsKeys } from '../internal/texture-parameter-helper';
|
|
3
3
|
/**
|
|
4
4
|
* Parameters with a built in observer implementation
|
|
@@ -161,18 +161,32 @@ export declare class ParameterManager {
|
|
|
161
161
|
printAllParameters(): void;
|
|
162
162
|
/**
|
|
163
163
|
* Applies all existing parameter entries to a certain "model", as defined in the {@link ModelManager}.\
|
|
164
|
-
* This can be
|
|
164
|
+
* This can be useful when updating the model before showing it in the scene.
|
|
165
165
|
*
|
|
166
166
|
* @internal
|
|
167
167
|
*/
|
|
168
|
-
applyAllParameterValuesToModel(model:
|
|
168
|
+
applyAllParameterValuesToModel(model: IAssetContainer): Promise<void>;
|
|
169
|
+
/**
|
|
170
|
+
* Removes existing parameter entries of all nodes of a model.\
|
|
171
|
+
* This can be useful to clean up the parameter state when removing a (cloned) model.
|
|
172
|
+
*
|
|
173
|
+
* @internal
|
|
174
|
+
*/
|
|
175
|
+
removeParameterEntriesOfModel(model: IAssetContainer): void;
|
|
169
176
|
/**
|
|
170
177
|
* Applies all parameter values which are targeting a material.\
|
|
171
|
-
* This can be
|
|
178
|
+
* This can be useful when updating a material definition before creating it.
|
|
172
179
|
*
|
|
173
180
|
* @internal
|
|
174
181
|
*/
|
|
175
182
|
applyParameterValuesToMaterial(material: Material): Promise<void>;
|
|
183
|
+
/**
|
|
184
|
+
* Removes all parameter entries of a certain material.\
|
|
185
|
+
* This can be useful to clean up the parameter state when removing a (cloned) material.
|
|
186
|
+
*
|
|
187
|
+
* @internal
|
|
188
|
+
*/
|
|
189
|
+
removeParameterEntriesOfMaterial(material: Material): void;
|
|
176
190
|
/**
|
|
177
191
|
* Applies subset of texture parameter values which are targeting a certain texture channel in a material.\
|
|
178
192
|
* This can be useful when updating texture settings (e.g. uScale) before the texture is actually created.
|
|
@@ -212,16 +226,16 @@ export declare class ParameterManager {
|
|
|
212
226
|
* materials to which the parameter values should be applied to).\
|
|
213
227
|
* Defaults to `viewer.scene`.
|
|
214
228
|
*/
|
|
215
|
-
protected _applyParameterValues(parameterEntries: ParameterEntry[], assetContainer?:
|
|
229
|
+
protected _applyParameterValues(parameterEntries: ParameterEntry[], assetContainer?: IAssetContainer): Promise<void>;
|
|
216
230
|
/**
|
|
217
231
|
* Call parameter observer of desired parameter
|
|
218
232
|
*
|
|
219
233
|
* @param assetContainer Optionally add an "asset container", which actually represents a model in the
|
|
220
234
|
* {@link ModelManager}. Viewer scene is used if left empty.
|
|
221
235
|
*/
|
|
222
|
-
protected _applyParameterValue(subject: ParameterSubject, parameterName: ParameterName, assetContainer?:
|
|
223
|
-
protected _getAffectedMaterials(subject: ParameterSubject, assetContainer?:
|
|
224
|
-
protected _getAffectedNodes(subject: ParameterSubject, assetContainer?:
|
|
236
|
+
protected _applyParameterValue(subject: ParameterSubject, parameterName: ParameterName, assetContainer?: IAssetContainer): Promise<void>;
|
|
237
|
+
protected _getAffectedMaterials(subject: ParameterSubject, assetContainer?: IAssetContainer): Material[];
|
|
238
|
+
protected _getAffectedNodes(subject: ParameterSubject, assetContainer?: IAssetContainer): TransformNode[];
|
|
225
239
|
protected _getEntry(subject: ParameterSubject, parameterName: ParameterName): ParameterEntry | undefined;
|
|
226
240
|
protected _getEntriesOfSubject(subject: ParameterSubject): ParameterEntry[];
|
|
227
241
|
}
|
|
@@ -236,19 +236,28 @@ class ParameterManager {
|
|
|
236
236
|
}
|
|
237
237
|
/**
|
|
238
238
|
* Applies all existing parameter entries to a certain "model", as defined in the {@link ModelManager}.\
|
|
239
|
-
* This can be
|
|
239
|
+
* This can be useful when updating the model before showing it in the scene.
|
|
240
240
|
*
|
|
241
241
|
* @internal
|
|
242
242
|
*/
|
|
243
243
|
applyAllParameterValuesToModel(model) {
|
|
244
244
|
return __awaiter(this, void 0, void 0, function* () {
|
|
245
|
-
|
|
246
|
-
yield this._applyParameterValues(parameterEntriesToApply, model);
|
|
245
|
+
yield this._applyParameterValues(this._parameterEntries, model);
|
|
247
246
|
});
|
|
248
247
|
}
|
|
248
|
+
/**
|
|
249
|
+
* Removes existing parameter entries of all nodes of a model.\
|
|
250
|
+
* This can be useful to clean up the parameter state when removing a (cloned) model.
|
|
251
|
+
*
|
|
252
|
+
* @internal
|
|
253
|
+
*/
|
|
254
|
+
removeParameterEntriesOfModel(model) {
|
|
255
|
+
const allNodeNames = [...model.meshes, ...model.transformNodes].map(node => node.name);
|
|
256
|
+
this._parameterEntries = this._parameterEntries.filter(entry => { var _a; return !allNodeNames.includes((_a = entry.subject.nodeName) !== null && _a !== void 0 ? _a : ''); });
|
|
257
|
+
}
|
|
249
258
|
/**
|
|
250
259
|
* Applies all parameter values which are targeting a material.\
|
|
251
|
-
* This can be
|
|
260
|
+
* This can be useful when updating a material definition before creating it.
|
|
252
261
|
*
|
|
253
262
|
* @internal
|
|
254
263
|
*/
|
|
@@ -265,6 +274,15 @@ class ParameterManager {
|
|
|
265
274
|
yield this._applyParameterValues(parameterEntriesToApply);
|
|
266
275
|
});
|
|
267
276
|
}
|
|
277
|
+
/**
|
|
278
|
+
* Removes all parameter entries of a certain material.\
|
|
279
|
+
* This can be useful to clean up the parameter state when removing a (cloned) material.
|
|
280
|
+
*
|
|
281
|
+
* @internal
|
|
282
|
+
*/
|
|
283
|
+
removeParameterEntriesOfMaterial(material) {
|
|
284
|
+
this._parameterEntries = this._parameterEntries.filter(entry => entry.subject.materialName !== material.id);
|
|
285
|
+
}
|
|
268
286
|
/**
|
|
269
287
|
* Applies subset of texture parameter values which are targeting a certain texture channel in a material.\
|
|
270
288
|
* This can be useful when updating texture settings (e.g. uScale) before the texture is actually created.
|