@shapediver/viewer.features.attribute-visualization 2.8.5 → 2.9.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/implementation/AttributeVisualizationEngine.d.ts +1 -0
- package/dist/implementation/AttributeVisualizationEngine.d.ts.map +1 -1
- package/dist/implementation/AttributeVisualizationEngine.js +34 -5
- package/dist/implementation/AttributeVisualizationEngine.js.map +1 -1
- package/dist/implementation/AttributeVisualizationUtils.d.ts +2 -2
- package/dist/implementation/AttributeVisualizationUtils.d.ts.map +1 -1
- package/dist/implementation/AttributeVisualizationUtils.js +1 -1
- package/dist/implementation/AttributeVisualizationUtils.js.map +1 -1
- package/package.json +5 -5
- package/src/implementation/AttributeVisualizationEngine.ts +29 -4
- package/src/implementation/AttributeVisualizationUtils.ts +4 -4
|
@@ -25,6 +25,7 @@ export declare class AttributeVisualizationEngine implements IAttributeVisualiza
|
|
|
25
25
|
addListener(cb: () => void): string;
|
|
26
26
|
removeListener(token: string): boolean;
|
|
27
27
|
private constructAttributeVisualization;
|
|
28
|
+
private createMaterialCopy;
|
|
28
29
|
private createLayers;
|
|
29
30
|
}
|
|
30
31
|
//# sourceMappingURL=AttributeVisualizationEngine.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributeVisualizationEngine.d.ts","sourceRoot":"","sources":["../../src/implementation/AttributeVisualizationEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAe,YAAY,EAAa,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,UAAU,EAA0E,MAAM,0BAA0B,CAAC;AAG9H,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAAiB,aAAa,
|
|
1
|
+
{"version":3,"file":"AttributeVisualizationEngine.d.ts","sourceRoot":"","sources":["../../src/implementation/AttributeVisualizationEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAe,YAAY,EAAa,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,UAAU,EAA0E,MAAM,0BAA0B,CAAC;AAG9H,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAAiB,aAAa,EAAwI,MAAM,iCAAiC,CAAC;AAG5O,qBAAa,4BAA6B,YAAW,6BAA6B;;gBA2BlE,QAAQ,EAAE,YAAY;IA2BlC,IAAW,eAAe,IAAI,qBAAqB,CAElD;IAED,IAAW,YAAY,IAAI,MAAM,CAEhC;IAED,IAAW,MAAM,IAAI;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAE7C;IAED,IAAW,iBAAiB,IAAI,OAAO,GAAG,UAAU,CAEnD;IAED,IAAW,sBAAsB,IAAI,OAAO,GAAG,UAAU,CAExD;IAED,IAAW,QAAQ,IAAI,aAAa,CAEnC;IAMM,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE;IAKzC,kBAAkB,CAAC,KAAK,EAAE,MAAM;IAKhC,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB;IAKrD,uBAAuB,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU;IAMlD,4BAA4B,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU;IAMvD,YAAY,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAK9C,WAAW,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,MAAM;IAMnC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAU7C,OAAO,CAAC,+BAA+B;IA+IvC,OAAO,CAAC,kBAAkB;IA0B1B,OAAO,CAAC,YAAY;CAiBvB"}
|
|
@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
11
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
12
|
};
|
|
13
|
-
var
|
|
13
|
+
var _AttributeVisualizationEngine_uuidGenerator, _AttributeVisualizationEngine_viewport, _AttributeVisualizationEngine_attributes, _AttributeVisualizationEngine_defaultMaterial, _AttributeVisualizationEngine_defaultLayer, _AttributeVisualizationEngine_layers, _AttributeVisualizationEngine_overview, _AttributeVisualizationEngine_listeners, _AttributeVisualizationEngine_visualizedMaterialType, _AttributeVisualizationEngine_layerMaterialType;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.AttributeVisualizationEngine = void 0;
|
|
16
16
|
const viewer_1 = require("@shapediver/viewer");
|
|
@@ -23,7 +23,6 @@ class AttributeVisualizationEngine {
|
|
|
23
23
|
// #region Constructors (1)
|
|
24
24
|
constructor(viewport) {
|
|
25
25
|
// #region Properties (7)
|
|
26
|
-
_AttributeVisualizationEngine_converter.set(this, viewer_shared_services_1.Converter.instance);
|
|
27
26
|
_AttributeVisualizationEngine_uuidGenerator.set(this, viewer_shared_services_1.UuidGenerator.instance);
|
|
28
27
|
_AttributeVisualizationEngine_viewport.set(this, void 0);
|
|
29
28
|
_AttributeVisualizationEngine_attributes.set(this, []);
|
|
@@ -169,7 +168,7 @@ class AttributeVisualizationEngine {
|
|
|
169
168
|
}
|
|
170
169
|
// early out, layer is not enabled
|
|
171
170
|
if (layer.enabled === false) {
|
|
172
|
-
const mat = __classPrivateFieldGet(this, _AttributeVisualizationEngine_defaultMaterial, "f")
|
|
171
|
+
const mat = this.createMaterialCopy(__classPrivateFieldGet(this, _AttributeVisualizationEngine_defaultMaterial, "f"));
|
|
173
172
|
mat.opacity = 0;
|
|
174
173
|
return {
|
|
175
174
|
matrix: gl_matrix_1.mat4.create(),
|
|
@@ -234,7 +233,7 @@ class AttributeVisualizationEngine {
|
|
|
234
233
|
}
|
|
235
234
|
}
|
|
236
235
|
// no attributes were found, return the default material adjusted by the layer opacity
|
|
237
|
-
const mat = __classPrivateFieldGet(this, _AttributeVisualizationEngine_defaultMaterial, "f")
|
|
236
|
+
const mat = this.createMaterialCopy(__classPrivateFieldGet(this, _AttributeVisualizationEngine_defaultMaterial, "f"));
|
|
238
237
|
mat.opacity *= layer.opacity;
|
|
239
238
|
return {
|
|
240
239
|
matrix: gl_matrix_1.mat4.create(),
|
|
@@ -243,6 +242,36 @@ class AttributeVisualizationEngine {
|
|
|
243
242
|
}
|
|
244
243
|
};
|
|
245
244
|
}
|
|
245
|
+
createMaterialCopy(material) {
|
|
246
|
+
if (material instanceof viewer_shared_types_1.MaterialGemData) {
|
|
247
|
+
const newMaterial = new viewer_shared_types_1.MaterialGemData();
|
|
248
|
+
newMaterial.copy(material);
|
|
249
|
+
return newMaterial;
|
|
250
|
+
}
|
|
251
|
+
else if (material instanceof viewer_shared_types_1.MaterialShadowData) {
|
|
252
|
+
const newMaterial = new viewer_shared_types_1.MaterialShadowData();
|
|
253
|
+
newMaterial.copy(material);
|
|
254
|
+
return newMaterial;
|
|
255
|
+
}
|
|
256
|
+
else if (material instanceof viewer_shared_types_1.MaterialSpecularGlossinessData) {
|
|
257
|
+
const newMaterial = new viewer_shared_types_1.MaterialSpecularGlossinessData();
|
|
258
|
+
newMaterial.copy(material);
|
|
259
|
+
return newMaterial;
|
|
260
|
+
}
|
|
261
|
+
else if (material instanceof viewer_shared_types_1.MaterialStandardData) {
|
|
262
|
+
const newMaterial = new viewer_shared_types_1.MaterialStandardData();
|
|
263
|
+
newMaterial.copy(material);
|
|
264
|
+
return newMaterial;
|
|
265
|
+
}
|
|
266
|
+
else if (material instanceof viewer_shared_types_1.MaterialUnlitData) {
|
|
267
|
+
const newMaterial = new viewer_shared_types_1.MaterialUnlitData();
|
|
268
|
+
newMaterial.copy(material);
|
|
269
|
+
return newMaterial;
|
|
270
|
+
}
|
|
271
|
+
else {
|
|
272
|
+
return new viewer_shared_types_1.MaterialStandardData();
|
|
273
|
+
}
|
|
274
|
+
}
|
|
246
275
|
createLayers() {
|
|
247
276
|
__classPrivateFieldSet(this, _AttributeVisualizationEngine_layers, {}, "f");
|
|
248
277
|
if (__classPrivateFieldGet(this, _AttributeVisualizationEngine_overview, "f")['layer']) {
|
|
@@ -260,5 +289,5 @@ class AttributeVisualizationEngine {
|
|
|
260
289
|
}
|
|
261
290
|
}
|
|
262
291
|
exports.AttributeVisualizationEngine = AttributeVisualizationEngine;
|
|
263
|
-
|
|
292
|
+
_AttributeVisualizationEngine_uuidGenerator = new WeakMap(), _AttributeVisualizationEngine_viewport = new WeakMap(), _AttributeVisualizationEngine_attributes = new WeakMap(), _AttributeVisualizationEngine_defaultMaterial = new WeakMap(), _AttributeVisualizationEngine_defaultLayer = new WeakMap(), _AttributeVisualizationEngine_layers = new WeakMap(), _AttributeVisualizationEngine_overview = new WeakMap(), _AttributeVisualizationEngine_listeners = new WeakMap(), _AttributeVisualizationEngine_visualizedMaterialType = new WeakMap(), _AttributeVisualizationEngine_layerMaterialType = new WeakMap();
|
|
264
293
|
//# sourceMappingURL=AttributeVisualizationEngine.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributeVisualizationEngine.js","sourceRoot":"","sources":["../../src/implementation/AttributeVisualizationEngine.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+CAA0E;AAE1E,yCAAiC;AACjC,+EAAyF;AAEzF,
|
|
1
|
+
{"version":3,"file":"AttributeVisualizationEngine.js","sourceRoot":"","sources":["../../src/implementation/AttributeVisualizationEngine.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+CAA0E;AAE1E,yCAAiC;AACjC,+EAAyF;AAEzF,yEAA4O;AAC5O,+EAA4E;AAE5E,MAAa,4BAA4B;IAuBrC,4BAA4B;IAE5B,2BAA2B;IAE3B,YAAY,QAAsB;QA1BlC,yBAAyB;QAEzB,sDAAyC,sCAAa,CAAC,QAAQ,EAAC;QAChE,yDAAiC;QAEjC,mDAA4B,EAAE,EAAC;QAC/B,wDAA0C,IAAI,uCAAiB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAC;QAClG,qDAAwB;YACpB,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,IAAI;SAChB,EAAC;QACF,+CAEI,EAAE,EAAC;QACP,yDAAyB;QACzB,kDAEI,EAAE,EAAC;QACP,+DAAgD,OAAO,EAAC;QACxD,0DAA2C,OAAO,EAAC;QAO/C,uBAAA,IAAI,0CAAa,QAAQ,MAAA,CAAC;QAE1B,uBAAA,IAAI,0CAAa,uBAAA,IAAI,8CAAU,CAAC,kBAAkB,CAAC,kBAAS,CAAC,IAAI,CAAC,MAAA,CAAC;QACnE,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,+BAA+B,EAAE,CAAC;QACvC,IAAA,oBAAW,EAAC,kCAAS,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,EAAE;YACnD,uBAAA,IAAI,0CAAa,uBAAA,IAAI,8CAAU,CAAC,kBAAkB,CAAC,kBAAS,CAAC,IAAI,CAAC,MAAA,CAAC;YAEnE,MAAM,MAAM,GAAG,uBAAA,IAAI,4CAAQ,CAAC;YAC5B,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,KAAK,IAAI,CAAC,IAAI,MAAM,EAAE;gBAClB,IAAI,uBAAA,IAAI,4CAAQ,CAAC,CAAC,CAAC;oBACf,uBAAA,IAAI,4CAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;aACnC;YAED,IAAI,CAAC,+BAA+B,EAAE,CAAC;YAEvC,KAAK,IAAI,CAAC,IAAI,uBAAA,IAAI,+CAAW;gBACzB,uBAAA,IAAI,+CAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAA;IACN,CAAC;IAED,8BAA8B;IAE9B,+BAA+B;IAE/B,IAAW,eAAe;QACtB,OAAO,uBAAA,IAAI,qDAAiB,CAAC;IACjC,CAAC;IAED,IAAW,YAAY;QACnB,OAAO,uBAAA,IAAI,kDAAc,CAAC;IAC9B,CAAC;IAED,IAAW,MAAM;QACb,OAAO,uBAAA,IAAI,4CAAQ,CAAC;IACxB,CAAC;IAED,IAAW,iBAAiB;QACxB,OAAO,uBAAA,IAAI,uDAAmB,CAAC;IACnC,CAAC;IAED,IAAW,sBAAsB;QAC7B,OAAO,uBAAA,IAAI,4DAAwB,CAAC;IACxC,CAAC;IAED,IAAW,QAAQ;QACf,OAAO,uBAAA,IAAI,8CAAU,CAAC;IAC1B,CAAC;IAED,kCAAkC;IAElC,6BAA6B;IAEtB,gBAAgB,CAAC,UAAwB;QAC5C,uBAAA,IAAI,4CAAe,UAAU,MAAA,CAAC;QAC9B,IAAI,CAAC,+BAA+B,EAAE,CAAC;IAC3C,CAAC;IAEM,kBAAkB,CAAC,KAAa;QACnC,uBAAA,IAAI,8CAAiB,KAAK,MAAA,CAAC;QAC3B,IAAI,CAAC,+BAA+B,EAAE,CAAC;IAC3C,CAAC;IAEM,qBAAqB,CAAC,QAA+B;QACxD,uBAAA,IAAI,iDAAoB,QAAQ,MAAA,CAAC;QACjC,IAAI,CAAC,+BAA+B,EAAE,CAAC;IAC3C,CAAC;IAEM,uBAAuB,CAAC,IAA0B;QACrD,uBAAA,IAAI,mDAAsB,IAAI,MAAA,CAAC;QAC/B,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,+BAA+B,EAAE,CAAC;IAC3C,CAAC;IAEM,4BAA4B,CAAC,IAA0B;QAC1D,uBAAA,IAAI,wDAA2B,IAAI,MAAA,CAAC;QACpC,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,+BAA+B,EAAE,CAAC;IAC3C,CAAC;IAEM,YAAY,CAAC,MAAiC;QACjD,uBAAA,IAAI,wCAAW,MAAM,MAAA,CAAC;QACtB,IAAI,CAAC,+BAA+B,EAAE,CAAC;IAC3C,CAAC;IAEM,WAAW,CAAC,EAAc;QAC7B,MAAM,KAAK,GAAG,uBAAA,IAAI,mDAAe,CAAC,MAAM,EAAE,CAAC;QAC3C,uBAAA,IAAI,+CAAW,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,cAAc,CAAC,KAAa;QAC/B,IAAI,CAAC,uBAAA,IAAI,+CAAW,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAC1C,OAAO,uBAAA,IAAI,+CAAW,CAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,gCAAgC;IAEhC,8BAA8B;IAEtB,+BAA+B;QACnC,uBAAA,IAAI,8CAAU,CAAC,mBAAmB,GAAG,CAAC,QAAuB,EAAE,QAAwB,EAAE,EAAE;YACvF,yDAAyD;YACzD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;gBACnC,IAAI,uBAAA,IAAI,gDAAY,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC/B,gCAAgC;oBAChC,IAAI,QAAQ,CAAC;oBACb,IAAG,uBAAA,IAAI,uDAAmB,KAAK,OAAO,EAAE;wBACpC,QAAQ,GAAG,IAAI,uCAAiB,CAAC;4BAC7B,OAAO,EAAE,uBAAA,IAAI,kDAAc,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAA,IAAI,kDAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;4BACpE,KAAK,EAAE,uBAAA,IAAI,kDAAc,CAAC,KAAK;yBAClC,CAAC,CAAC;qBACN;yBAAM;wBACH,QAAQ,GAAG,IAAI,0CAAoB,CAAC;4BAChC,OAAO,EAAE,uBAAA,IAAI,kDAAc,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAA,IAAI,kDAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;4BACpE,KAAK,EAAE,uBAAA,IAAI,kDAAc,CAAC,KAAK;yBAClC,CAAC,CAAC;qBACN;oBACD,OAAO;wBACH,MAAM,EAAE,gBAAI,CAAC,MAAM,EAAE;wBACrB,QAAQ;qBACX,CAAA;iBACJ;qBAAM;oBACH,gCAAgC;oBAChC,IAAI,QAAQ,CAAC;oBACb,IAAG,uBAAA,IAAI,uDAAmB,KAAK,OAAO,EAAE;wBACpC,QAAQ,GAAG,IAAI,uCAAiB,CAAC;4BAC7B,OAAO,EAAE,uBAAA,IAAI,kDAAc,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAA,IAAI,kDAAc,CAAC,OAAO,GAAG,uBAAA,IAAI,qDAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;4BACpG,KAAK,EAAE,uBAAA,IAAI,qDAAiB,CAAC,KAAK;yBACrC,CAAC,CAAC;qBACN;yBAAM;wBACH,QAAQ,GAAG,IAAI,0CAAoB,CAAC;4BAChC,OAAO,EAAE,uBAAA,IAAI,kDAAc,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAA,IAAI,kDAAc,CAAC,OAAO,GAAG,uBAAA,IAAI,qDAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;4BACpG,KAAK,EAAE,uBAAA,IAAI,qDAAiB,CAAC,KAAK;yBACrC,CAAC,CAAC;qBACN;oBACD,OAAO;wBACH,MAAM,EAAE,gBAAI,CAAC,MAAM,EAAE;wBACrB,QAAQ;qBACX,CAAA;iBACJ;aACJ;YAED,yFAAyF;YACzF,IAAI,KAAK,GAAW,IAAI,CAAC,YAAY,CAAC;YACtC,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,4CAAsB,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE;gBAC5G,MAAM,eAAe,GAAG,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBACrD,KAAK,GAAG,uBAAA,IAAI,4CAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;aAC/C;YAED,kCAAkC;YAClC,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,EAAE;gBACzB,MAAM,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,uBAAA,IAAI,qDAAiB,CAAC,CAAC;gBAC3D,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC;gBAChB,OAAO;oBACH,MAAM,EAAE,gBAAI,CAAC,MAAM,EAAE;oBACrB,QAAQ,EAAE,GAAG;iBAChB,CAAA;aACJ;YAED,IAAI,uBAAA,IAAI,gDAAY,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC/B,mEAAmE;gBACnE,IAAI,QAAQ,CAAC;gBACb,IAAG,uBAAA,IAAI,uDAAmB,KAAK,OAAO,EAAE;oBACpC,QAAQ,GAAG,IAAI,uCAAiB,CAAC;wBAC7B,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,KAAK,EAAE,KAAK,CAAC,KAAK;qBACrB,CAAC,CAAC;iBACN;qBAAM;oBACH,QAAQ,GAAG,IAAI,0CAAoB,CAAC;wBAChC,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,KAAK,EAAE,KAAK,CAAC,KAAK;qBACrB,CAAC,CAAC;iBACN;gBAED,OAAO;oBACH,MAAM,EAAE,gBAAI,CAAC,MAAM,EAAE;oBACrB,QAAQ;iBACX,CAAA;aACJ;iBAAM;gBACH,oEAAoE;gBACpE,MAAM,QAAQ,GAAG,uBAAA,IAAI,4DAAwB,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,uCAAiB,EAAE,CAAC,CAAC,CAAC,IAAI,0CAAoB,EAAE,CAAC;gBACjH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,uBAAA,IAAI,gDAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC9C,MAAM,CAAC,GAAG,uBAAA,IAAI,gDAAY,CAAC,CAAC,CAAC,CAAC;oBAC9B,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE;wBAC9E,MAAM,iBAAiB,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;wBACrD,MAAM,yBAAyB,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;wBAExF,QAAQ,IAAI,EAAE;4BACV,KAAK,4CAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;gCAC3C,QAAQ,CAAC,KAAK,GAAG,MAAM,GAAG,iBAAiB,CAAC,KAAK,GAAG,GAAG,CAAC;gCACxD,QAAQ,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC;gCAClC,OAAO;oCACH,MAAM,EAAE,gBAAI,CAAC,MAAM,EAAE;oCACrB,QAAQ;iCACX,CAAC;4BACN,KAAK,4CAAsB,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC;gCAC5C,MAAM,eAAe,GAAqB,CAAC,CAAC;gCAC5C,MAAM,uBAAuB,GAAG,yDAA2B,CAAC,mBAAmB,CAC3E,iBAAiB,CAAC,KAAK,EACvB,CAAC,eAAe,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,yBAAyB,CAAC,GAAG,CAAE,EAC1F,CAAC,eAAe,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,yBAAyB,CAAC,GAAG,CAAE,EAC1F,eAAe,CAAC,aAAa,EAC7B,uBAAA,IAAI,4DAAwB,EAC5B,uBAAA,IAAI,qDAAiB,CACxB,CAAC;gCACF,uBAAuB,CAAC,QAAQ,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC;gCAC1D,OAAO,uBAAuB,CAAC;4BACnC,KAAK,4CAAsB,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC;gCAC5C,MAAM,eAAe,GAAqB,CAAC,CAAC;gCAC5C,MAAM,uBAAuB,GAAG,yDAA2B,CAAC,mBAAmB,CAC3E,iBAAiB,CAAC,KAAK,EACvB,eAAe,CAAC,MAAM,IAAI,yBAAyB,CAAC,MAAM,EAC1D,eAAe,CAAC,aAAa,EAC7B,uBAAA,IAAI,4DAAwB,EAC5B,uBAAA,IAAI,qDAAiB,CACxB,CAAC;gCAEF,uBAAuB,CAAC,QAAQ,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC;gCAC1D,OAAO,uBAAuB,CAAC;4BACnC;gCACI,MAAM,gBAAgB,GAAsB,CAAC,CAAC;gCAC9C,QAAQ,CAAC,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC;gCACxC,QAAQ,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC;gCAClC,OAAO;oCACH,MAAM,EAAE,gBAAI,CAAC,MAAM,EAAE;oCACrB,QAAQ;iCACX,CAAC;yBACT;qBACJ;iBACJ;gBAED,sFAAsF;gBACtF,MAAM,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,uBAAA,IAAI,qDAAiB,CAAC,CAAC;gBAC3D,GAAG,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC;gBAC7B,OAAO;oBACH,MAAM,EAAE,gBAAI,CAAC,MAAM,EAAE;oBACrB,QAAQ,EAAE,GAAG;iBAChB,CAAA;aACJ;QACL,CAAC,CAAA;IACL,CAAC;IAEO,kBAAkB,CAAC,QAA+B;QACtD,IAAG,QAAQ,YAAY,qCAAe,EAAE;YACpC,MAAM,WAAW,GAAG,IAAI,qCAAe,EAAE,CAAC;YAC1C,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3B,OAAO,WAAW,CAAC;SACtB;aAAM,IAAG,QAAQ,YAAY,wCAAkB,EAAE;YAC9C,MAAM,WAAW,GAAG,IAAI,wCAAkB,EAAE,CAAC;YAC7C,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3B,OAAO,WAAW,CAAC;SACtB;aAAM,IAAG,QAAQ,YAAY,oDAA8B,EAAE;YAC1D,MAAM,WAAW,GAAG,IAAI,oDAA8B,EAAE,CAAC;YACzD,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3B,OAAO,WAAW,CAAC;SACtB;aAAM,IAAG,QAAQ,YAAY,0CAAoB,EAAE;YAChD,MAAM,WAAW,GAAG,IAAI,0CAAoB,EAAE,CAAC;YAC/C,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3B,OAAO,WAAW,CAAC;SACtB;aAAM,IAAG,QAAQ,YAAY,uCAAiB,EAAE;YAC7C,MAAM,WAAW,GAAG,IAAI,uCAAiB,EAAE,CAAC;YAC5C,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3B,OAAO,WAAW,CAAC;SACtB;aAAM;YACH,OAAO,IAAI,0CAAoB,EAAE,CAAC;SACrC;IACL,CAAC;IAEO,YAAY;QAChB,uBAAA,IAAI,wCAAW,EAAE,MAAA,CAAC;QAClB,IAAI,uBAAA,IAAI,8CAAU,CAAC,OAAO,CAAC,EAAE;YACzB,MAAM,4BAA4B,GAAG,uBAAA,IAAI,8CAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;YAChG,IAAI,4BAA4B,IAAI,4BAA4B,CAAC,MAAM,EAAE;gBACrE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,4BAA4B,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACjE,uBAAA,IAAI,4CAAQ,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG;wBACnD,OAAO,EAAE,IAAI;wBACb,OAAO,EAAE,CAAC;wBACV,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK;qBACpC,CAAA;iBACJ;aACJ;SACJ;IACL,CAAC;CAGJ;AA5TD,oEA4TC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { IMaterialAbstractData, ISDTFAttributeVisualizationData } from "@shapediver/viewer.shared.types";
|
|
2
2
|
import { ATTRIBUTE_VISUALIZATION } from "../interfaces/IAttribute";
|
|
3
3
|
export declare const AttributeVisualizationUtils: {
|
|
4
|
-
numberVisualization: (value: number, min: number, max: number, type: ATTRIBUTE_VISUALIZATION, materialType: 'unlit' | 'standard', defaultMaterial
|
|
5
|
-
stringVisualization: (value: string, values: string[], type: ATTRIBUTE_VISUALIZATION, materialType: 'unlit' | 'standard', defaultMaterial
|
|
4
|
+
numberVisualization: (value: number, min: number, max: number, type: ATTRIBUTE_VISUALIZATION, materialType: 'unlit' | 'standard', defaultMaterial: IMaterialAbstractData) => ISDTFAttributeVisualizationData;
|
|
5
|
+
stringVisualization: (value: string, values: string[], type: ATTRIBUTE_VISUALIZATION, materialType: 'unlit' | 'standard', defaultMaterial: IMaterialAbstractData) => ISDTFAttributeVisualizationData;
|
|
6
6
|
};
|
|
7
7
|
//# sourceMappingURL=AttributeVisualizationUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributeVisualizationUtils.d.ts","sourceRoot":"","sources":["../../src/implementation/AttributeVisualizationUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,+BAA+B,EAA2C,MAAM,iCAAiC,CAAC;AAElJ,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AA8LnE,eAAO,MAAM,2BAA2B;iCAnDJ,MAAM,OAAO,MAAM,OAAO,MAAM,QAAQ,uBAAuB,gBAAgB,OAAO,GAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"AttributeVisualizationUtils.d.ts","sourceRoot":"","sources":["../../src/implementation/AttributeVisualizationUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,+BAA+B,EAA2C,MAAM,iCAAiC,CAAC;AAElJ,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AA8LnE,eAAO,MAAM,2BAA2B;iCAnDJ,MAAM,OAAO,MAAM,OAAO,MAAM,QAAQ,uBAAuB,gBAAgB,OAAO,GAAG,UAAU,mBAAmB,qBAAqB,KAAG,+BAA+B;iCA0B7K,MAAM,UAAU,MAAM,EAAE,QAAQ,uBAAuB,gBAAgB,OAAO,GAAG,UAAU,mBAAmB,qBAAqB,KAAG,+BAA+B;CA4BxM,CAAC"}
|
|
@@ -13,7 +13,7 @@ const grayscaleVisualization = (factor, materialType) => {
|
|
|
13
13
|
};
|
|
14
14
|
const opacityVisualization = (factor, materialType, defaultMaterial) => {
|
|
15
15
|
return {
|
|
16
|
-
material: materialType === 'unlit' ? new viewer_shared_types_1.MaterialUnlitData({ color:
|
|
16
|
+
material: materialType === 'unlit' ? new viewer_shared_types_1.MaterialUnlitData({ color: defaultMaterial.color, opacity: factor }) : new viewer_shared_types_1.MaterialStandardData({ color: defaultMaterial.color, opacity: factor }),
|
|
17
17
|
matrix: gl_matrix_1.mat4.create()
|
|
18
18
|
};
|
|
19
19
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributeVisualizationUtils.js","sourceRoot":"","sources":["../../src/implementation/AttributeVisualizationUtils.ts"],"names":[],"mappings":";;;AAAA,yEAAkJ;AAClJ,yCAAiC;AACjC,yDAAmE;AAGnE,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,YAAkC,EAAmC,EAAE;IACnH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC;IACzC,OAAO;QACH,QAAQ,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,uCAAiB,CAAC,EAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI,GAAI,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,GAAG,EAAE,OAAO,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,0CAAoB,CAAC,EAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI,GAAI,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,GAAG,EAAE,OAAO,EAAE,CAAC,EAAC,CAAC;QACzO,MAAM,EAAE,gBAAI,CAAC,MAAM,EAAE;KACxB,CAAA;AACL,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAAC,MAAc,EAAE,YAAkC,EAAE,
|
|
1
|
+
{"version":3,"file":"AttributeVisualizationUtils.js","sourceRoot":"","sources":["../../src/implementation/AttributeVisualizationUtils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/viewer.features.attribute-visualization",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.9.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -41,13 +41,13 @@
|
|
|
41
41
|
"testEnvironment": "node"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
|
-
"@shapediver/viewer": "2.
|
|
45
|
-
"@shapediver/viewer.shared.services": "2.
|
|
46
|
-
"@shapediver/viewer.shared.types": "2.
|
|
44
|
+
"@shapediver/viewer": "2.9.0",
|
|
45
|
+
"@shapediver/viewer.shared.services": "2.9.0",
|
|
46
|
+
"@shapediver/viewer.shared.types": "2.9.0"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
49
|
"detect-it": "4.0.1",
|
|
50
50
|
"gl-matrix": "3.3.0"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "6afb546a9c788a179b33091396819f3a738e25ad"
|
|
53
53
|
}
|
|
@@ -4,13 +4,12 @@ import { IAttribute, IColorAttribute, IDefaultAttribute, INumberAttribute, IStri
|
|
|
4
4
|
import { mat4 } from "gl-matrix";
|
|
5
5
|
import { Converter, EVENTTYPE, UuidGenerator } from "@shapediver/viewer.shared.services";
|
|
6
6
|
import { IAttributeVisualizationEngine } from "../interfaces/IAttributeVisualizationEngine";
|
|
7
|
-
import { IMaterialAbstractData, ISDTFItemData, ISDTFOverview, MaterialStandardData, MaterialUnlitData, SdtfPrimitiveTypeGuard } from "@shapediver/viewer.shared.types";
|
|
7
|
+
import { IMaterialAbstractData, ISDTFItemData, ISDTFOverview, MaterialGemData, MaterialShadowData, MaterialSpecularGlossinessData, MaterialStandardData, MaterialUnlitData, SdtfPrimitiveTypeGuard } from "@shapediver/viewer.shared.types";
|
|
8
8
|
import { AttributeVisualizationUtils } from "./AttributeVisualizationUtils";
|
|
9
9
|
|
|
10
10
|
export class AttributeVisualizationEngine implements IAttributeVisualizationEngine {
|
|
11
11
|
// #region Properties (7)
|
|
12
12
|
|
|
13
|
-
readonly #converter: Converter = Converter.instance;
|
|
14
13
|
readonly #uuidGenerator: UuidGenerator = UuidGenerator.instance;
|
|
15
14
|
readonly #viewport: IViewportApi;
|
|
16
15
|
|
|
@@ -190,7 +189,7 @@ export class AttributeVisualizationEngine implements IAttributeVisualizationEngi
|
|
|
190
189
|
|
|
191
190
|
// early out, layer is not enabled
|
|
192
191
|
if (layer.enabled === false) {
|
|
193
|
-
const mat =
|
|
192
|
+
const mat = this.createMaterialCopy(this.#defaultMaterial);
|
|
194
193
|
mat.opacity = 0;
|
|
195
194
|
return {
|
|
196
195
|
matrix: mat4.create(),
|
|
@@ -271,7 +270,7 @@ export class AttributeVisualizationEngine implements IAttributeVisualizationEngi
|
|
|
271
270
|
}
|
|
272
271
|
|
|
273
272
|
// no attributes were found, return the default material adjusted by the layer opacity
|
|
274
|
-
const mat =
|
|
273
|
+
const mat = this.createMaterialCopy(this.#defaultMaterial);
|
|
275
274
|
mat.opacity *= layer.opacity;
|
|
276
275
|
return {
|
|
277
276
|
matrix: mat4.create(),
|
|
@@ -281,6 +280,32 @@ export class AttributeVisualizationEngine implements IAttributeVisualizationEngi
|
|
|
281
280
|
}
|
|
282
281
|
}
|
|
283
282
|
|
|
283
|
+
private createMaterialCopy(material: IMaterialAbstractData): IMaterialAbstractData {
|
|
284
|
+
if(material instanceof MaterialGemData) {
|
|
285
|
+
const newMaterial = new MaterialGemData();
|
|
286
|
+
newMaterial.copy(material);
|
|
287
|
+
return newMaterial;
|
|
288
|
+
} else if(material instanceof MaterialShadowData) {
|
|
289
|
+
const newMaterial = new MaterialShadowData();
|
|
290
|
+
newMaterial.copy(material);
|
|
291
|
+
return newMaterial;
|
|
292
|
+
} else if(material instanceof MaterialSpecularGlossinessData) {
|
|
293
|
+
const newMaterial = new MaterialSpecularGlossinessData();
|
|
294
|
+
newMaterial.copy(material);
|
|
295
|
+
return newMaterial;
|
|
296
|
+
} else if(material instanceof MaterialStandardData) {
|
|
297
|
+
const newMaterial = new MaterialStandardData();
|
|
298
|
+
newMaterial.copy(material);
|
|
299
|
+
return newMaterial;
|
|
300
|
+
} else if(material instanceof MaterialUnlitData) {
|
|
301
|
+
const newMaterial = new MaterialUnlitData();
|
|
302
|
+
newMaterial.copy(material);
|
|
303
|
+
return newMaterial;
|
|
304
|
+
} else {
|
|
305
|
+
return new MaterialStandardData();
|
|
306
|
+
}
|
|
307
|
+
}
|
|
308
|
+
|
|
284
309
|
private createLayers() {
|
|
285
310
|
this.#layers = {};
|
|
286
311
|
if (this.#overview['layer']) {
|
|
@@ -11,9 +11,9 @@ const grayscaleVisualization = (factor: number, materialType: 'unlit' | 'standar
|
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
-
const opacityVisualization = (factor: number, materialType: 'unlit' | 'standard', defaultMaterial
|
|
14
|
+
const opacityVisualization = (factor: number, materialType: 'unlit' | 'standard', defaultMaterial: IMaterialAbstractData): ISDTFAttributeVisualizationData => {
|
|
15
15
|
return {
|
|
16
|
-
material: materialType === 'unlit' ? new MaterialUnlitData({color: defaultMaterial
|
|
16
|
+
material: materialType === 'unlit' ? new MaterialUnlitData({color: defaultMaterial.color, opacity: factor}) : new MaterialStandardData({color: defaultMaterial.color, opacity: factor}),
|
|
17
17
|
matrix: mat4.create()
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -139,7 +139,7 @@ const hslVisualization = (factor: number, materialType: 'unlit' | 'standard'): I
|
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
141
|
|
|
142
|
-
const numberVisualization = (value: number, min: number, max: number, type: ATTRIBUTE_VISUALIZATION, materialType: 'unlit' | 'standard', defaultMaterial
|
|
142
|
+
const numberVisualization = (value: number, min: number, max: number, type: ATTRIBUTE_VISUALIZATION, materialType: 'unlit' | 'standard', defaultMaterial: IMaterialAbstractData): ISDTFAttributeVisualizationData => {
|
|
143
143
|
let factor = (value - min) / (max - min);
|
|
144
144
|
factor = Math.min(1, Math.max(0, factor))
|
|
145
145
|
|
|
@@ -165,7 +165,7 @@ const numberVisualization = (value: number, min: number, max: number, type: ATTR
|
|
|
165
165
|
}
|
|
166
166
|
}
|
|
167
167
|
|
|
168
|
-
const stringVisualization = (value: string, values: string[], type: ATTRIBUTE_VISUALIZATION, materialType: 'unlit' | 'standard', defaultMaterial
|
|
168
|
+
const stringVisualization = (value: string, values: string[], type: ATTRIBUTE_VISUALIZATION, materialType: 'unlit' | 'standard', defaultMaterial: IMaterialAbstractData): ISDTFAttributeVisualizationData => {
|
|
169
169
|
let factor = values.indexOf(value) / (values.length - 1);
|
|
170
170
|
factor = Math.min(1, Math.max(0, factor))
|
|
171
171
|
switch(type) {
|