@shapediver/viewer.data-engine.tag3d-engine 2.7.9 → 2.8.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.d.ts +2 -1
- package/dist/Tag3dEngine.d.ts.map +1 -1
- package/dist/Tag3dEngine.js +17 -30
- package/dist/Tag3dEngine.js.map +1 -1
- package/package.json +7 -8
- package/src/Tag3dEngine.ts +16 -18
package/dist/Tag3dEngine.d.ts
CHANGED
|
@@ -5,8 +5,9 @@ export declare class Tag3dEngine {
|
|
|
5
5
|
private readonly _httpClient;
|
|
6
6
|
private readonly _logger;
|
|
7
7
|
private readonly _stateEngine;
|
|
8
|
+
private static _instance;
|
|
8
9
|
private _font;
|
|
9
|
-
|
|
10
|
+
static get instance(): Tag3dEngine;
|
|
10
11
|
/**
|
|
11
12
|
* Load the tag3d content into a scene graph node.
|
|
12
13
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tag3dEngine.d.ts","sourceRoot":"","sources":["../src/Tag3dEngine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAY,MAAM,qCAAqC,CAAA;
|
|
1
|
+
{"version":3,"file":"Tag3dEngine.d.ts","sourceRoot":"","sources":["../src/Tag3dEngine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAY,MAAM,qCAAqC,CAAA;AAGzE,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAA;AAMrF,qBAAa,WAAW;IAGpB,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,YAAY,CAAqC;IAElE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAc;IAEtC,OAAO,CAAC,KAAK,CAAQ;IAMrB,WAAkB,QAAQ,gBAEzB;IAMD;;;;;OAKG;IACU,WAAW,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAAC,SAAS,CAAC;CAsIzF"}
|
package/dist/Tag3dEngine.js
CHANGED
|
@@ -11,12 +11,6 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
11
11
|
}) : function(o, v) {
|
|
12
12
|
o["default"] = v;
|
|
13
13
|
});
|
|
14
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
15
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
16
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
17
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
18
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
19
|
-
};
|
|
20
14
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
21
15
|
if (mod && mod.__esModule) return mod;
|
|
22
16
|
var result = {};
|
|
@@ -24,9 +18,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
18
|
__setModuleDefault(result, mod);
|
|
25
19
|
return result;
|
|
26
20
|
};
|
|
27
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
28
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
29
|
-
};
|
|
30
21
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
31
22
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
32
23
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -40,23 +31,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
40
31
|
exports.Tag3dEngine = void 0;
|
|
41
32
|
const THREE = __importStar(require("three"));
|
|
42
33
|
const viewer_shared_node_tree_1 = require("@shapediver/viewer.shared.node-tree");
|
|
43
|
-
const tsyringe_1 = require("tsyringe");
|
|
44
34
|
const viewer_shared_services_1 = require("@shapediver/viewer.shared.services");
|
|
45
35
|
const viewer_shared_types_1 = require("@shapediver/viewer.shared.types");
|
|
46
36
|
const TextGeometry_1 = require("./three/geometries/TextGeometry");
|
|
47
37
|
const FontLoader_1 = require("./three/loaders/FontLoader");
|
|
48
38
|
const font_1 = require("./font");
|
|
49
|
-
|
|
50
|
-
// #endregion Properties (5)
|
|
51
|
-
// #region Constructors (1)
|
|
39
|
+
class Tag3dEngine {
|
|
52
40
|
constructor() {
|
|
53
|
-
// #region Properties (
|
|
54
|
-
this._converter =
|
|
55
|
-
this._httpClient =
|
|
56
|
-
this._logger =
|
|
57
|
-
this._stateEngine =
|
|
41
|
+
// #region Properties (6)
|
|
42
|
+
this._converter = viewer_shared_services_1.Converter.instance;
|
|
43
|
+
this._httpClient = viewer_shared_services_1.HttpClient.instance;
|
|
44
|
+
this._logger = viewer_shared_services_1.Logger.instance;
|
|
45
|
+
this._stateEngine = viewer_shared_services_1.StateEngine.instance;
|
|
46
|
+
// #endregion Public Methods (1)
|
|
47
|
+
}
|
|
48
|
+
// #endregion Properties (6)
|
|
49
|
+
// #region Public Static Accessors (1)
|
|
50
|
+
static get instance() {
|
|
51
|
+
return this._instance || (this._instance = new this());
|
|
58
52
|
}
|
|
59
|
-
// #endregion
|
|
53
|
+
// #endregion Public Static Accessors (1)
|
|
60
54
|
// #region Public Methods (1)
|
|
61
55
|
/**
|
|
62
56
|
* Load the tag3d content into a scene graph node.
|
|
@@ -73,10 +67,8 @@ let Tag3dEngine = class Tag3dEngine {
|
|
|
73
67
|
const node = new viewer_shared_node_tree_1.TreeNode('tag3d');
|
|
74
68
|
if (this._stateEngine.fontLoaded.resolved === false)
|
|
75
69
|
yield this._stateEngine.fontLoaded;
|
|
76
|
-
if (!content)
|
|
77
|
-
|
|
78
|
-
throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.DATA_PROCESSING, `Tag3dEngine.loadContent`, error);
|
|
79
|
-
}
|
|
70
|
+
if (!content)
|
|
71
|
+
throw new viewer_shared_services_1.ShapeDiverViewerDataProcessingError('Tag3dEngine.loadContent: Invalid content was provided to tag3d engine.');
|
|
80
72
|
if (content.data && Array.isArray(content.data)) {
|
|
81
73
|
for (let i = 0; i < content.data.length; i++) {
|
|
82
74
|
const tag3dInfo = content.data[i];
|
|
@@ -182,16 +174,11 @@ let Tag3dEngine = class Tag3dEngine {
|
|
|
182
174
|
}
|
|
183
175
|
}
|
|
184
176
|
else {
|
|
185
|
-
|
|
186
|
-
throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.DATA_PROCESSING, `Tag3dEngine.loadContent`, error);
|
|
177
|
+
throw new viewer_shared_services_1.ShapeDiverViewerDataProcessingError('Tag3dEngine.loadContent: No tag3d data was provided to tag3d engine.');
|
|
187
178
|
}
|
|
188
179
|
return node;
|
|
189
180
|
});
|
|
190
181
|
}
|
|
191
|
-
}
|
|
192
|
-
Tag3dEngine = __decorate([
|
|
193
|
-
(0, tsyringe_1.singleton)(),
|
|
194
|
-
__metadata("design:paramtypes", [])
|
|
195
|
-
], Tag3dEngine);
|
|
182
|
+
}
|
|
196
183
|
exports.Tag3dEngine = Tag3dEngine;
|
|
197
184
|
//# sourceMappingURL=Tag3dEngine.js.map
|
package/dist/Tag3dEngine.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tag3dEngine.js","sourceRoot":"","sources":["../src/Tag3dEngine.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Tag3dEngine.js","sourceRoot":"","sources":["../src/Tag3dEngine.ts"],"names":[],"mappings":"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"}
|
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.8.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -40,15 +40,14 @@
|
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@shapediver/sdk.geometry-api-sdk-v2": "1.3.0",
|
|
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.
|
|
43
|
+
"@shapediver/viewer.data-engine.shared-types": "2.8.0",
|
|
44
|
+
"@shapediver/viewer.shared.node-tree": "2.8.0",
|
|
45
|
+
"@shapediver/viewer.shared.services": "2.8.0",
|
|
46
|
+
"@shapediver/viewer.shared.types": "2.8.0",
|
|
47
47
|
"@types/three": "0.149.0",
|
|
48
48
|
"axios": "^1.2.6",
|
|
49
49
|
"gl-matrix": "3.3.0",
|
|
50
|
-
"three": "0.149.0"
|
|
51
|
-
"tsyringe": "^4.5.0"
|
|
50
|
+
"three": "0.149.0"
|
|
52
51
|
},
|
|
53
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "9caee20107c5d71e43de33edc14ee19d62ec268b"
|
|
54
53
|
}
|
package/src/Tag3dEngine.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import * as THREE from 'three'
|
|
2
2
|
import { ITreeNode, TreeNode } from '@shapediver/viewer.shared.node-tree'
|
|
3
|
-
import {
|
|
4
|
-
import { HttpClient, Logger, LOGGING_TOPIC, Converter, StateEngine, ShapeDiverViewerDataProcessingError } from '@shapediver/viewer.shared.services'
|
|
3
|
+
import { HttpClient, Logger, Converter, StateEngine, ShapeDiverViewerDataProcessingError } from '@shapediver/viewer.shared.services'
|
|
5
4
|
import { AttributeData, GeometryData, MaterialStandardData, PrimitiveData } from '@shapediver/viewer.shared.types'
|
|
6
5
|
import { ShapeDiverResponseOutputContent } from '@shapediver/sdk.geometry-api-sdk-v2'
|
|
7
6
|
import { ITag3D } from '@shapediver/viewer.data-engine.shared-types'
|
|
@@ -9,25 +8,27 @@ import { TextGeometry } from './three/geometries/TextGeometry'
|
|
|
9
8
|
import { Font } from './three/loaders/FontLoader';
|
|
10
9
|
import { font } from './font'
|
|
11
10
|
|
|
12
|
-
@singleton()
|
|
13
11
|
export class Tag3dEngine {
|
|
14
|
-
// #region Properties (
|
|
12
|
+
// #region Properties (6)
|
|
15
13
|
|
|
16
|
-
private readonly _converter: Converter =
|
|
17
|
-
private readonly _httpClient: HttpClient =
|
|
18
|
-
private readonly _logger: Logger =
|
|
19
|
-
private readonly _stateEngine: StateEngine =
|
|
14
|
+
private readonly _converter: Converter = Converter.instance;
|
|
15
|
+
private readonly _httpClient: HttpClient = HttpClient.instance;
|
|
16
|
+
private readonly _logger: Logger = Logger.instance;
|
|
17
|
+
private readonly _stateEngine: StateEngine = StateEngine.instance;
|
|
18
|
+
|
|
19
|
+
private static _instance: Tag3dEngine;
|
|
20
20
|
|
|
21
21
|
private _font!: Font;
|
|
22
22
|
|
|
23
|
-
// #endregion Properties (
|
|
23
|
+
// #endregion Properties (6)
|
|
24
24
|
|
|
25
|
-
// #region
|
|
25
|
+
// #region Public Static Accessors (1)
|
|
26
26
|
|
|
27
|
-
|
|
27
|
+
public static get instance() {
|
|
28
|
+
return this._instance || (this._instance = new this());
|
|
28
29
|
}
|
|
29
30
|
|
|
30
|
-
// #endregion
|
|
31
|
+
// #endregion Public Static Accessors (1)
|
|
31
32
|
|
|
32
33
|
// #region Public Methods (1)
|
|
33
34
|
|
|
@@ -48,10 +49,8 @@ export class Tag3dEngine {
|
|
|
48
49
|
if(this._stateEngine.fontLoaded.resolved === false)
|
|
49
50
|
await this._stateEngine.fontLoaded;
|
|
50
51
|
|
|
51
|
-
if (!content)
|
|
52
|
-
|
|
53
|
-
throw this._logger.handleError(LOGGING_TOPIC.DATA_PROCESSING, `Tag3dEngine.loadContent`, error);
|
|
54
|
-
}
|
|
52
|
+
if (!content)
|
|
53
|
+
throw new ShapeDiverViewerDataProcessingError('Tag3dEngine.loadContent: Invalid content was provided to tag3d engine.');
|
|
55
54
|
|
|
56
55
|
if (content.data && Array.isArray(content.data)) {
|
|
57
56
|
for (let i = 0; i < content.data.length; i++) {
|
|
@@ -167,8 +166,7 @@ export class Tag3dEngine {
|
|
|
167
166
|
}
|
|
168
167
|
}
|
|
169
168
|
} else {
|
|
170
|
-
|
|
171
|
-
throw this._logger.handleError(LOGGING_TOPIC.DATA_PROCESSING, `Tag3dEngine.loadContent`, error);
|
|
169
|
+
throw new ShapeDiverViewerDataProcessingError('Tag3dEngine.loadContent: No tag3d data was provided to tag3d engine.');
|
|
172
170
|
}
|
|
173
171
|
return node;
|
|
174
172
|
}
|