@shapediver/viewer.data-engine.material-database-engine 3.14.8 → 3.14.10
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MaterialDatabaseEngine.d.ts","sourceRoot":"","sources":["../src/MaterialDatabaseEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAErE,OAAO,EAAC,SAAS,EAAW,MAAM,qCAAqC,CAAC;AAaxE,qBAAa,sBAAsB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAC5D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAC/D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IACnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAO3B;IACP,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA2C;IAE3E,OAAO,CAAC,MAAM,CAAC,SAAS,CAAyB;IAEjD,WAAkB,QAAQ,2BAEzB;IAED;;;;OAIG;IACU,0BAA0B,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"MaterialDatabaseEngine.d.ts","sourceRoot":"","sources":["../src/MaterialDatabaseEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAErE,OAAO,EAAC,SAAS,EAAW,MAAM,qCAAqC,CAAC;AAaxE,qBAAa,sBAAsB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAC5D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAC/D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IACnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAO3B;IACP,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA2C;IAE3E,OAAO,CAAC,MAAM,CAAC,SAAS,CAAyB;IAEjD,WAAkB,QAAQ,2BAEzB;IAED;;;;OAIG;IACU,0BAA0B,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAyEvE;;;;;OAKG;IACU,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC;CA4BvE"}
|
|
@@ -43,8 +43,13 @@ class MaterialDatabaseEngine {
|
|
|
43
43
|
for (let i = 0; i < n.data.length; i++) {
|
|
44
44
|
const data = n.data[i];
|
|
45
45
|
if (data instanceof viewer_shared_types_1.GeometryData) {
|
|
46
|
-
const
|
|
47
|
-
if (
|
|
46
|
+
const name = (_a = data.material) === null || _a === void 0 ? void 0 : _a.name;
|
|
47
|
+
if (name) {
|
|
48
|
+
// if the material is not found directly, try with original node name as prefix
|
|
49
|
+
// this is can be used for instances
|
|
50
|
+
const materialName = this._materialDatabase[name]
|
|
51
|
+
? name
|
|
52
|
+
: `${node.originalName}_${name}`;
|
|
48
53
|
if (this._materialDatabase[materialName]) {
|
|
49
54
|
if (!this._materialDatabase[materialName].material) {
|
|
50
55
|
if (!materialsToCreate[materialName])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MaterialDatabaseEngine.js","sourceRoot":"","sources":["../src/MaterialDatabaseEngine.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,uGAA8E;AAC9E,iFAAwE;AACxE,+EAI4C;AAC5C,yEAKyC;AAEzC,MAAa,sBAAsB;IAAnC;QACkB,eAAU,GAAc,kCAAS,CAAC,QAAQ,CAAC;QAC3C,gBAAW,GAAe,mCAAU,CAAC,QAAQ,CAAC;QAC9C,YAAO,GAAW,+BAAM,CAAC,QAAQ,CAAC;QAClC,sBAAiB,GAO9B,EAAE,CAAC;QACU,oBAAe,GAAmB,mDAAc,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"MaterialDatabaseEngine.js","sourceRoot":"","sources":["../src/MaterialDatabaseEngine.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/viewer.data-engine.material-database-engine",
|
|
3
|
-
"version": "3.14.
|
|
3
|
+
"version": "3.14.10",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -38,13 +38,13 @@
|
|
|
38
38
|
"testEnvironment": "node"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@shapediver/viewer.data-engine.material-engine": "3.14.
|
|
42
|
-
"@shapediver/viewer.data-engine.shared-types": "3.14.
|
|
43
|
-
"@shapediver/viewer.shared.global-access-objects": "3.14.
|
|
44
|
-
"@shapediver/viewer.shared.node-tree": "3.14.
|
|
45
|
-
"@shapediver/viewer.shared.services": "3.14.
|
|
46
|
-
"@shapediver/viewer.shared.types": "3.14.
|
|
41
|
+
"@shapediver/viewer.data-engine.material-engine": "3.14.10",
|
|
42
|
+
"@shapediver/viewer.data-engine.shared-types": "3.14.10",
|
|
43
|
+
"@shapediver/viewer.shared.global-access-objects": "3.14.10",
|
|
44
|
+
"@shapediver/viewer.shared.node-tree": "3.14.10",
|
|
45
|
+
"@shapediver/viewer.shared.services": "3.14.10",
|
|
46
|
+
"@shapediver/viewer.shared.types": "3.14.10",
|
|
47
47
|
"gl-matrix": "3.3.0"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "4deb1c742adcaec12646ba87fdc2a58cd16429c3"
|
|
50
50
|
}
|