@shapediver/viewer.data-engine.material-database-engine 3.15.12 → 3.16.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.
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"MaterialDatabaseEngine.d.ts","sourceRoot":"","sources":["../src/MaterialDatabaseEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAErE,OAAO,EAEN,SAAS,EAET,MAAM,qCAAqC,CAAC;AAY7C,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;IAgFvE;;;;;OAKG;IACU,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC;CA4BvE"}
|
|
@@ -13,7 +13,6 @@ exports.MaterialDatabaseEngine = void 0;
|
|
|
13
13
|
const viewer_data_engine_material_engine_1 = require("@shapediver/viewer.data-engine.material-engine");
|
|
14
14
|
const viewer_shared_node_tree_1 = require("@shapediver/viewer.shared.node-tree");
|
|
15
15
|
const viewer_shared_services_1 = require("@shapediver/viewer.shared.services");
|
|
16
|
-
const viewer_shared_types_1 = require("@shapediver/viewer.shared.types");
|
|
17
16
|
class MaterialDatabaseEngine {
|
|
18
17
|
constructor() {
|
|
19
18
|
this._converter = viewer_shared_services_1.Converter.instance;
|
|
@@ -43,7 +42,7 @@ class MaterialDatabaseEngine {
|
|
|
43
42
|
// check if the name of the material is corresponding to a material in the material database output
|
|
44
43
|
for (let i = 0; i < n.data.length; i++) {
|
|
45
44
|
const data = n.data[i];
|
|
46
|
-
if (data instanceof
|
|
45
|
+
if (data instanceof viewer_shared_node_tree_1.GeometryData) {
|
|
47
46
|
const name = (_a = data.material) === null || _a === void 0 ? void 0 : _a.name;
|
|
48
47
|
if (name) {
|
|
49
48
|
// if the material is not found directly, try with original node name as prefix
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MaterialDatabaseEngine.js","sourceRoot":"","sources":["../src/MaterialDatabaseEngine.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,uGAA8E;AAC9E,
|
|
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.
|
|
3
|
+
"version": "3.16.1",
|
|
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.
|
|
42
|
-
"@shapediver/viewer.data-engine.shared-types": "3.
|
|
43
|
-
"@shapediver/viewer.shared.global-access-objects": "3.
|
|
44
|
-
"@shapediver/viewer.shared.node-tree": "3.
|
|
45
|
-
"@shapediver/viewer.shared.services": "3.
|
|
46
|
-
"@shapediver/viewer.shared.types": "3.
|
|
41
|
+
"@shapediver/viewer.data-engine.material-engine": "3.16.1",
|
|
42
|
+
"@shapediver/viewer.data-engine.shared-types": "3.16.1",
|
|
43
|
+
"@shapediver/viewer.shared.global-access-objects": "3.16.1",
|
|
44
|
+
"@shapediver/viewer.shared.node-tree": "3.16.1",
|
|
45
|
+
"@shapediver/viewer.shared.services": "3.16.1",
|
|
46
|
+
"@shapediver/viewer.shared.types": "3.16.1",
|
|
47
47
|
"gl-matrix": "3.3.0"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "fb70562a823b03d91da9a59f549ba501ab5ea6dd"
|
|
50
50
|
}
|