@shapediver/viewer.data-engine.tag3d-engine 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/Tag3dEngine.js +1 -1
- package/dist/Tag3dEngine.js.map +1 -1
- package/package.json +7 -7
- package/src/Tag3dEngine.ts +2 -2
package/dist/Tag3dEngine.js
CHANGED
|
@@ -168,7 +168,7 @@ class Tag3dEngine {
|
|
|
168
168
|
attributes[attributeName] = new viewer_shared_types_1.AttributeData(line.attributes[attribute].array, line.attributes[attribute].itemSize, 0, 0, 0, false, line.attributes[attribute].array.length / line.attributes[attribute].itemSize);
|
|
169
169
|
}
|
|
170
170
|
const child = new viewer_shared_node_tree_1.TreeNode('tag3d_' + line);
|
|
171
|
-
child.data.push(new viewer_shared_types_1.GeometryData(new viewer_shared_types_1.PrimitiveData(attributes,
|
|
171
|
+
child.data.push(new viewer_shared_types_1.GeometryData(new viewer_shared_types_1.PrimitiveData(attributes, null), viewer_shared_types_1.PRIMITIVE_MODE.TRIANGLES, new viewer_shared_types_1.MaterialStandardData({ color: tag3dInfo.color, metalness: 0, roughness: 1 })));
|
|
172
172
|
node.children.push(child);
|
|
173
173
|
}
|
|
174
174
|
}
|
package/dist/Tag3dEngine.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tag3dEngine.js","sourceRoot":"","sources":["../src/Tag3dEngine.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8B;AAC9B,iFAAyE;AACzE,+EAAoI;AACpI,
|
|
1
|
+
{"version":3,"file":"Tag3dEngine.js","sourceRoot":"","sources":["../src/Tag3dEngine.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8B;AAC9B,iFAAyE;AACzE,+EAAoI;AACpI,yEAAkI;AAGlI,kEAA8D;AAC9D,2DAAkD;AAClD,iCAA6B;AAE7B,MAAa,WAAW;IAAxB;QACI,yBAAyB;QAER,eAAU,GAAc,kCAAS,CAAC,QAAQ,CAAC;QAC3C,gBAAW,GAAe,mCAAU,CAAC,QAAQ,CAAC;QAC9C,YAAO,GAAW,+BAAM,CAAC,QAAQ,CAAC;QAClC,iBAAY,GAAgB,oCAAW,CAAC,QAAQ,CAAC;QA6JlE,gCAAgC;IACpC,CAAC;IAxJG,4BAA4B;IAE5B,sCAAsC;IAE/B,MAAM,KAAK,QAAQ;QACtB,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,yCAAyC;IAEzC,6BAA6B;IAE7B;;;;;OAKG;IACU,WAAW,CAAC,OAAwC;;YAC7D,IAAG,CAAC,IAAI,CAAC,KAAK,EAAE;gBACZ,IAAI,CAAC,KAAK,GAAG,IAAI,iBAAI,CAAC,WAAI,CAAC,CAAC;gBAC5B,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAC9C;YAED,MAAM,IAAI,GAAG,IAAI,kCAAQ,CAAC,OAAO,CAAC,CAAC;YAEnC,IAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,QAAQ,KAAK,KAAK;gBAC9C,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC;YAEvC,IAAI,CAAC,OAAO;gBACR,MAAM,IAAI,4DAAmC,CAAC,wEAAwE,CAAC,CAAC;YAE5H,IAAI,OAAO,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC1C,MAAM,SAAS,GAAW,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBAC1C,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;oBACtD,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,IAAI,EAAE,CAAC;oBAEtC,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;oBACrD,IAAI,SAAS,GAAG,EAAE,CAAC;oBAEnB,KAAK,IAAI,SAAS,GAAG,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE;wBAC9D,IAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE;4BAAE,SAAS;wBACxC,yBAAyB;wBACzB,IAAI,GAAG,GAAG,IAAI,2BAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,IAAI,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;wBACzH,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;qBACvB;oBAED,0BAA0B;oBAC1B,IAAI,YAAY,GAAG,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;oBACxC,KAAK,IAAI,IAAI,IAAI,SAAS,EAAE;wBACxB,YAAY,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;qBACzE;oBAED,cAAc;oBACd,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,GAAG,CAAC,CAAC;oBAC3C;wBACI,UAAU,GAAG,CAAC,CAAC;wBACf,KAAK,IAAI,KAAK,IAAI,YAAY,CAAC,QAAQ,EAAE;4BACrC,EAAE,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;4BAC3C,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;4BAC/B,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;yBAC/C;qBACJ;oBACD,UAAU,IAAI,IAAI,CAAC;oBAEnB,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;wBAC1B,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,EAAE,CAAC,CAAC,CAAC;oBAChD,CAAC,CAAC,CAAC;oBAEH,gBAAgB;oBAChB,EAAE,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;oBAElD,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC/B,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC/B,IAAI,kBAAkB,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;oBAEpD,QAAQ,SAAS,CAAC,aAAa,EAAE;wBAC7B,KAAK,IAAI;4BACL,MAAM;wBACV,KAAK,IAAI;4BACL,kBAAkB,CAAC,CAAC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC;4BACvC,MAAM;wBACV,KAAK,IAAI;4BACL,kBAAkB,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;4BACjC,MAAM;wBACV,KAAK,IAAI;4BACL,kBAAkB,CAAC,CAAC,GAAG,QAAQ,GAAG,GAAG,CAAC;4BACtC,MAAM;wBACV,KAAK,IAAI;4BACL,kBAAkB,CAAC,CAAC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC;4BACvC,kBAAkB,CAAC,CAAC,GAAG,QAAQ,GAAG,GAAG,CAAC;4BACtC,MAAM;wBACV,KAAK,IAAI;4BACL,kBAAkB,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;4BACjC,kBAAkB,CAAC,CAAC,GAAG,QAAQ,GAAG,GAAG,CAAC;4BACtC,MAAM;wBACV,KAAK,IAAI;4BACL,kBAAkB,CAAC,CAAC,GAAG,QAAQ,CAAC;4BAChC,MAAM;wBACV,KAAK,IAAI;4BACL,kBAAkB,CAAC,CAAC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC;4BACvC,kBAAkB,CAAC,CAAC,GAAG,QAAQ,CAAC;4BAChC,MAAM;wBACV,KAAK,IAAI;4BACL,kBAAkB,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;4BACjC,kBAAkB,CAAC,CAAC,GAAG,QAAQ,CAAC;4BAChC,MAAM;qBACb;oBAED,KAAK,IAAI,IAAI,IAAI,SAAS,EAAE;wBACxB,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC;qBACpF;oBAED,WAAW;oBACX,IAAI,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;wBAC5C,IAAI,SAAS,GAAG,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;wBACpC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;wBAClS,KAAK,IAAI,IAAI,IAAI,SAAS,EAAE;4BACxB,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;4BAC7B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;yBACzG;qBACJ;oBAED,KAAK,IAAI,IAAI,IAAI,SAAS,EAAE;wBACxB,MAAM,UAAU,GAEZ,EAAE,CAAC;wBACP,KAAK,IAAI,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;4BACnC,IAAI,aAAa,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;4BAC5C,IAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gCACzD,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;gCACxC,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,GAAG,GAAG,aAAa,CAAC,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;6BAClH;iCAAM,IAAG,aAAa,KAAK,UAAU,IAAI,aAAa,KAAK,OAAO,IAAI,aAAa,KAAK,QAAQ,IAAI,aAAa,KAAK,SAAS,EAAE;gCAC9H,aAAa,IAAI,IAAI,CAAC;6BACzB;iCAAM,IAAI,aAAa,KAAK,IAAI,EAAE;gCAC/B,aAAa,GAAG,YAAY,CAAC;6BAChC;4BACD,UAAU,CAAC,aAAa,CAAC,GAAG,IAAI,mCAAa,CAAuC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAE,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAyC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAE,CAAC,KAAM,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAA;yBACtS;wBACD,MAAM,KAAK,GAAG,IAAI,kCAAQ,CAAC,QAAQ,GAAC,IAAI,CAAC,CAAA;wBACzC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,kCAAY,CAAC,IAAI,mCAAa,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,oCAAc,CAAC,SAAS,EAAE,IAAI,0CAAoB,CAAC,EAAC,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC;wBACjL,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBAC7B;iBACJ;aACJ;iBAAM;gBACH,MAAM,IAAI,4DAAmC,CAAC,sEAAsE,CAAC,CAAC;aACzH;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;CAGJ;AApKD,kCAoKC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/viewer.data-engine.tag3d-engine",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.9.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -39,15 +39,15 @@
|
|
|
39
39
|
"testEnvironment": "node"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@shapediver/sdk.geometry-api-sdk-v2": "1.
|
|
43
|
-
"@shapediver/viewer.data-engine.shared-types": "2.
|
|
44
|
-
"@shapediver/viewer.shared.node-tree": "2.
|
|
45
|
-
"@shapediver/viewer.shared.services": "2.
|
|
46
|
-
"@shapediver/viewer.shared.types": "2.
|
|
42
|
+
"@shapediver/sdk.geometry-api-sdk-v2": "1.4.0",
|
|
43
|
+
"@shapediver/viewer.data-engine.shared-types": "2.9.0",
|
|
44
|
+
"@shapediver/viewer.shared.node-tree": "2.9.0",
|
|
45
|
+
"@shapediver/viewer.shared.services": "2.9.0",
|
|
46
|
+
"@shapediver/viewer.shared.types": "2.9.0",
|
|
47
47
|
"@types/three": "0.149.0",
|
|
48
48
|
"axios": "^1.2.6",
|
|
49
49
|
"gl-matrix": "3.3.0",
|
|
50
50
|
"three": "0.149.0"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "6afb546a9c788a179b33091396819f3a738e25ad"
|
|
53
53
|
}
|
package/src/Tag3dEngine.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as THREE from 'three'
|
|
2
2
|
import { ITreeNode, TreeNode } from '@shapediver/viewer.shared.node-tree'
|
|
3
3
|
import { HttpClient, Logger, Converter, StateEngine, ShapeDiverViewerDataProcessingError } from '@shapediver/viewer.shared.services'
|
|
4
|
-
import { AttributeData, GeometryData, MaterialStandardData, PrimitiveData } from '@shapediver/viewer.shared.types'
|
|
4
|
+
import { AttributeData, GeometryData, MaterialStandardData, PrimitiveData, PRIMITIVE_MODE } from '@shapediver/viewer.shared.types'
|
|
5
5
|
import { ShapeDiverResponseOutputContent } from '@shapediver/sdk.geometry-api-sdk-v2'
|
|
6
6
|
import { ITag3D } from '@shapediver/viewer.data-engine.shared-types'
|
|
7
7
|
import { TextGeometry } from './three/geometries/TextGeometry'
|
|
@@ -161,7 +161,7 @@ export class Tag3dEngine {
|
|
|
161
161
|
attributes[attributeName] = new AttributeData(<Float32Array>(<THREE.BufferAttribute>line.attributes[attribute]).array, line.attributes[attribute].itemSize, 0, 0, 0, false, (<Float32Array>(<THREE.BufferAttribute>line.attributes[attribute]).array).length / line.attributes[attribute].itemSize)
|
|
162
162
|
}
|
|
163
163
|
const child = new TreeNode('tag3d_'+line)
|
|
164
|
-
child.data.push(new GeometryData(new PrimitiveData(attributes,
|
|
164
|
+
child.data.push(new GeometryData(new PrimitiveData(attributes, null), PRIMITIVE_MODE.TRIANGLES, new MaterialStandardData({color: tag3dInfo.color, metalness: 0, roughness: 1})));
|
|
165
165
|
node.children.push(child);
|
|
166
166
|
}
|
|
167
167
|
}
|