@shapediver/viewer.shared.services 2.7.3 → 2.7.5
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/event-engine/EventEngine.d.ts.map +1 -1
- package/dist/event-engine/EventEngine.js +6 -3
- package/dist/event-engine/EventEngine.js.map +1 -1
- package/dist/http-client/HttpClient.d.ts.map +1 -1
- package/dist/http-client/HttpClient.js +3 -1
- package/dist/http-client/HttpClient.js.map +1 -1
- package/dist/settings-engine/SettingsEngine.d.ts +2 -0
- package/dist/settings-engine/SettingsEngine.d.ts.map +1 -1
- package/dist/settings-engine/SettingsEngine.js +11 -7
- package/dist/settings-engine/SettingsEngine.js.map +1 -1
- package/package.json +6 -6
- package/src/event-engine/EventEngine.ts +6 -3
- package/src/http-client/HttpClient.ts +3 -1
- package/src/settings-engine/SettingsEngine.ts +14 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventEngine.d.ts","sourceRoot":"","sources":["../../src/event-engine/EventEngine.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,cAAc,EAAE,MAAM,cAAc,CAAA;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAA;AAC/D,OAAO,EAAE,MAAM,EAAiB,MAAM,kBAAkB,CAAA;AAExD,qBACa,WAAW;IAGpB,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAmD;IACnG,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAqC;IACvE,OAAO,CAAC,eAAe,CAErB;;IAmBF,OAAO,CAAC,mBAAmB;IAkB3B;;;;;;OAMG;IACI,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,EAAE,EAAE,EAAE,SAAS,GAAG,MAAM;IAQxE;;;;;OAKG;IACI,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"EventEngine.d.ts","sourceRoot":"","sources":["../../src/event-engine/EventEngine.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,cAAc,EAAE,MAAM,cAAc,CAAA;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAA;AAC/D,OAAO,EAAE,MAAM,EAAiB,MAAM,kBAAkB,CAAA;AAExD,qBACa,WAAW;IAGpB,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAmD;IACnG,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAqC;IACvE,OAAO,CAAC,eAAe,CAErB;;IAmBF,OAAO,CAAC,mBAAmB;IAkB3B;;;;;;OAMG;IACI,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,EAAE,EAAE,EAAE,SAAS,GAAG,MAAM;IAQxE;;;;;OAKG;IACI,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAcpE;;;;;OAKG;IACI,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;CAuBhD"}
|
|
@@ -69,9 +69,12 @@ let EventEngine = class EventEngine {
|
|
|
69
69
|
*/
|
|
70
70
|
emitEvent(type, event) {
|
|
71
71
|
const typeString = this.convertTypeToString(type);
|
|
72
|
-
if (this._eventListeners[typeString] && this._eventListeners[typeString].length !== 0)
|
|
73
|
-
|
|
74
|
-
|
|
72
|
+
if (this._eventListeners[typeString] && this._eventListeners[typeString].length !== 0) {
|
|
73
|
+
const cbs = this._eventListeners[typeString].map(el => el.cb);
|
|
74
|
+
for (let i = 0; i < cbs.length; i++) {
|
|
75
|
+
cbs[i](event);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
75
78
|
if (typeString.includes('.'))
|
|
76
79
|
this.emitEvent(typeString.substr(0, typeString.indexOf('.')), event);
|
|
77
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventEngine.js","sourceRoot":"","sources":["../../src/event-engine/EventEngine.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA+C;AAE/C,6CAAwD;AAIxD,mEAA+D;AAC/D,6CAAwD;AAGxD,IAAa,WAAW,GAAxB,MAAa,WAAW;IASpB,4BAA4B;IAE5B,2BAA2B;IAE3B;QAZA,yBAAyB;QAEN,mBAAc,GAAiC,oBAAS,CAAC,OAAO,CAAC,6BAAa,CAAC,CAAC;QAChF,YAAO,GAAmB,oBAAS,CAAC,OAAO,CAAC,eAAM,CAAC,CAAC;QAUnE,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,KAAK,MAAM,IAAI,IAAI,sBAAS,EAAE;YAC1B,MAAM,YAAY,GAAG,sBAAS,CAAC,IAA8B,CAAC,CAAC;YAC/D,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC;YAC9C,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE;gBAChC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAoC,CAAC,CAAC,GAAG,EAAE,CAAC;aACjF;SACJ;IACL,CAAC;IAED,8BAA8B;IAEtB,mBAAmB,CAAC,IAA6B;QACrD,IAAI,UAAU,GAAW,EAAE,CAAC;QAC5B,IAAG,OAAO,IAAI,KAAK,QAAQ;YAAE,UAAU,GAAG,IAAI,CAAC;QAE/C,KAAK,MAAM,QAAQ,IAAI,sBAAS;YAC5B,IAAG,IAAI,KAAK,sBAAS,CAAC,QAAkC,CAAC;gBACrD,UAAU,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QAE5C,IAAG,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE;YACjD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,sBAAa,CAAC,OAAO,EAAE,0DAA0D,CAAC,CAAC;YACrG,OAAO,EAAE,CAAC;SACb;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,6BAA6B;IAE7B;;;;;;OAMG;IACI,WAAW,CAAC,IAA6B,EAAE,EAAa;;QAC3D,MAAM,UAAU,GAAW,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAG,CAAC,UAAU;YAAE,OAAO,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;QAC3C,MAAA,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,0CAAE,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;QACtD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;;;OAKG;IACI,SAAS,CAAC,IAA6B,EAAE,KAAa;QACzD,MAAM,UAAU,GAAW,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE1D,IAAI,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"EventEngine.js","sourceRoot":"","sources":["../../src/event-engine/EventEngine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpClient.d.ts","sourceRoot":"","sources":["../../src/http-client/HttpClient.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,kBAAkB,EAAiB,MAAM,OAAO,CAAA;AAGhE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAgB9C,qBACa,UAAU;IAGnB,OAAO,CAAC,UAAU,CAEX;IAEP,OAAO,CAAC,eAAe,CAKhB;;IA2BP,OAAO,CAAC,YAAY;IAeb,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE;QAChD,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAClE,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;KACvF;IAIY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,kBAAoD,EAAE,cAAc,GAAE,OAAe,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"HttpClient.d.ts","sourceRoot":"","sources":["../../src/http-client/HttpClient.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,kBAAkB,EAAiB,MAAM,OAAO,CAAA;AAGhE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAgB9C,qBACa,UAAU;IAGnB,OAAO,CAAC,UAAU,CAEX;IAEP,OAAO,CAAC,eAAe,CAKhB;;IA2BP,OAAO,CAAC,YAAY;IAeb,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE;QAChD,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAClE,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;KACvF;IAIY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,kBAAoD,EAAE,cAAc,GAAE,OAAe,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAoE5I,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAInE,iBAAiB,CAAC,SAAS,EAAE,MAAM;CAK7C"}
|
|
@@ -97,7 +97,7 @@ let HttpClient = class HttpClient {
|
|
|
97
97
|
// if we have a sessionId and the sessionLoading functions and the image is not a blob or data, we load it via the sdk
|
|
98
98
|
if (sessionLoading !== undefined && sessionId !== undefined && !href.startsWith('blob:') && !href.startsWith('data:')) {
|
|
99
99
|
// take first session to load a texture that is not session related
|
|
100
|
-
this._dataCache[dataKey] = new Promise(resolve => {
|
|
100
|
+
this._dataCache[dataKey] = new Promise((resolve, reject) => {
|
|
101
101
|
sessionLoading.downloadTexture(sessionId, href).then((result) => {
|
|
102
102
|
resolve({
|
|
103
103
|
data: result[0],
|
|
@@ -105,6 +105,8 @@ let HttpClient = class HttpClient {
|
|
|
105
105
|
'content-type': result[1]
|
|
106
106
|
}
|
|
107
107
|
});
|
|
108
|
+
}).catch(e => {
|
|
109
|
+
reject(e);
|
|
108
110
|
});
|
|
109
111
|
});
|
|
110
112
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/http-client/HttpClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/http-client/HttpClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ export declare class SettingsEngine {
|
|
|
11
11
|
private readonly _eventEngine;
|
|
12
12
|
private readonly _logger;
|
|
13
13
|
private readonly _settings;
|
|
14
|
+
private _settingsJson;
|
|
14
15
|
private _settings_version;
|
|
15
16
|
get ar(): IARSettings;
|
|
16
17
|
get camera(): ICameraSettings;
|
|
@@ -22,6 +23,7 @@ export declare class SettingsEngine {
|
|
|
22
23
|
get session(): ISessionSettings;
|
|
23
24
|
set session(value: ISessionSettings);
|
|
24
25
|
get settings(): ISettings;
|
|
26
|
+
get settingsJson(): any;
|
|
25
27
|
convertToTargetVersion(): any;
|
|
26
28
|
flatten(): {
|
|
27
29
|
[key: string]: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingsEngine.d.ts","sourceRoot":"","sources":["../../src/settings-engine/SettingsEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,aAAa,IAAI,SAAS,
|
|
1
|
+
{"version":3,"file":"SettingsEngine.d.ts","sourceRoot":"","sources":["../../src/settings-engine/SettingsEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,aAAa,IAAI,SAAS,EAA2B,MAAM,6BAA6B,CAAC;AAO/I,aAAK,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AACnC,aAAK,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAC3C,aAAK,oBAAoB,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;AACrD,aAAK,4BAA4B,GAAG,SAAS,CAAC,qBAAqB,CAAC,CAAC;AACrE,aAAK,gBAAgB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;AAC7C,aAAK,cAAc,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;AACzC,aAAK,kBAAkB,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;AACjD,aAAK,gBAAgB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;AAE7C,qBAAa,cAAc;IAGvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4D;IACzF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6C;IACrE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyB;IACnD,OAAO,CAAC,aAAa,CAAM;IAC3B,OAAO,CAAC,iBAAiB,CAA2B;IAMpD,IAAW,EAAE,IAAI,WAAW,CAE3B;IAED,IAAW,MAAM,IAAI,eAAe,CAEnC;IAED,IAAW,WAAW,IAAI,oBAAoB,CAE7C;IAED,IAAW,mBAAmB,IAAI,4BAA4B,CAE7D;IAED,IAAW,OAAO,IAAI,gBAAgB,CAErC;IAED,IAAW,KAAK,IAAI,cAAc,CAEjC;IAED,IAAW,SAAS,IAAI,kBAAkB,CAEzC;IAED,IAAW,OAAO,IAAI,gBAAgB,CAErC;IAED,IAAW,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAEzC;IAED,IAAW,QAAQ,IAAI,SAAS,CAE/B;IAED,IAAW,YAAY,IAAI,GAAG,CAE7B;IAMM,sBAAsB,IAAI,GAAG;IAI7B,OAAO;;;IAoBP,YAAY,CAAC,IAAI,EAAE,GAAG;IAkCtB,KAAK;IASZ,OAAO,CAAC,aAAa;CA2BxB"}
|
|
@@ -12,7 +12,7 @@ class SettingsEngine {
|
|
|
12
12
|
this._eventEngine = tsyringe_1.container.resolve(EventEngine_1.EventEngine);
|
|
13
13
|
this._logger = tsyringe_1.container.resolve(Logger_1.Logger);
|
|
14
14
|
this._settings = (0, viewer_settings_1.DefaultsV3_3)();
|
|
15
|
-
this._settings_version =
|
|
15
|
+
this._settings_version = viewer_settings_1.latestVersion;
|
|
16
16
|
// #endregion Private Methods (1)
|
|
17
17
|
}
|
|
18
18
|
// #endregion Properties (8)
|
|
@@ -47,6 +47,9 @@ class SettingsEngine {
|
|
|
47
47
|
get settings() {
|
|
48
48
|
return this._settings;
|
|
49
49
|
}
|
|
50
|
+
get settingsJson() {
|
|
51
|
+
return this._settingsJson;
|
|
52
|
+
}
|
|
50
53
|
// #endregion Public Accessors (10)
|
|
51
54
|
// #region Public Methods (4)
|
|
52
55
|
convertToTargetVersion() {
|
|
@@ -75,6 +78,7 @@ class SettingsEngine {
|
|
|
75
78
|
return flattenObject(this.settings);
|
|
76
79
|
}
|
|
77
80
|
loadSettings(json) {
|
|
81
|
+
this._settingsJson = json;
|
|
78
82
|
if (JSON.stringify(json) !== JSON.stringify({})) {
|
|
79
83
|
const prevVersions = ['1.0', '2.0', '3.0', '3.1', '3.2'];
|
|
80
84
|
for (let i = 0; i < prevVersions.length; i++) {
|
|
@@ -82,16 +86,16 @@ class SettingsEngine {
|
|
|
82
86
|
try {
|
|
83
87
|
(0, viewer_settings_1.validate)(json, v);
|
|
84
88
|
this._settings_version = v;
|
|
85
|
-
this._settings = (0, viewer_settings_1.convert)(json,
|
|
89
|
+
this._settings = (0, viewer_settings_1.convert)(json, viewer_settings_1.latestVersion);
|
|
86
90
|
this.cleanSettings(this._settings);
|
|
87
91
|
return;
|
|
88
92
|
}
|
|
89
93
|
catch (e) { }
|
|
90
94
|
}
|
|
91
95
|
try {
|
|
92
|
-
(0, viewer_settings_1.validate)(json,
|
|
93
|
-
this._settings_version =
|
|
94
|
-
this._settings = (0, viewer_settings_1.convert)(json,
|
|
96
|
+
(0, viewer_settings_1.validate)(json, viewer_settings_1.latestVersion);
|
|
97
|
+
this._settings_version = viewer_settings_1.latestVersion;
|
|
98
|
+
this._settings = (0, viewer_settings_1.convert)(json, viewer_settings_1.latestVersion);
|
|
95
99
|
this.cleanSettings(this._settings);
|
|
96
100
|
return;
|
|
97
101
|
}
|
|
@@ -101,13 +105,13 @@ class SettingsEngine {
|
|
|
101
105
|
}
|
|
102
106
|
}
|
|
103
107
|
else {
|
|
104
|
-
this._settings_version =
|
|
108
|
+
this._settings_version = viewer_settings_1.latestVersion;
|
|
105
109
|
this._settings = (0, viewer_settings_1.DefaultsV3_3)();
|
|
106
110
|
return;
|
|
107
111
|
}
|
|
108
112
|
}
|
|
109
113
|
reset() {
|
|
110
|
-
this._settings_version =
|
|
114
|
+
this._settings_version = viewer_settings_1.latestVersion;
|
|
111
115
|
this._settings = (0, viewer_settings_1.DefaultsV3_3)();
|
|
112
116
|
}
|
|
113
117
|
// #endregion Public Methods (4)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingsEngine.js","sourceRoot":"","sources":["../../src/settings-engine/SettingsEngine.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"SettingsEngine.js","sourceRoot":"","sources":["../../src/settings-engine/SettingsEngine.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/viewer.shared.services",
|
|
3
|
-
"version": "2.7.
|
|
3
|
+
"version": "2.7.5",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -42,18 +42,18 @@
|
|
|
42
42
|
"@ctrl/tinycolor": "^3.4.0",
|
|
43
43
|
"@sentry/browser": "^6.7.2",
|
|
44
44
|
"@sentry/tracing": "^6.7.2",
|
|
45
|
-
"@shapediver/sdk.geometry-api-sdk-v2": "1.
|
|
46
|
-
"@shapediver/viewer.settings": "0.
|
|
47
|
-
"@shapediver/viewer.shared.build-data": "2.7.
|
|
45
|
+
"@shapediver/sdk.geometry-api-sdk-v2": "1.3.0",
|
|
46
|
+
"@shapediver/viewer.settings": "0.3.0",
|
|
47
|
+
"@shapediver/viewer.shared.build-data": "2.7.5",
|
|
48
48
|
"@types/dompurify": "^2.3.1",
|
|
49
49
|
"@types/ua-parser-js": "^0.7.36",
|
|
50
50
|
"@types/uuid": "^8.3.0",
|
|
51
|
-
"axios": "^
|
|
51
|
+
"axios": "^1.2.6",
|
|
52
52
|
"dompurify": "^2.3.3",
|
|
53
53
|
"gl-matrix": "3.3.0",
|
|
54
54
|
"tsyringe": "^4.5.0",
|
|
55
55
|
"ua-parser-js": "^0.7.28",
|
|
56
56
|
"uuid": "^8.3.2"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "577a3e0400a1da71d60378c86db37a2c43d8067a"
|
|
59
59
|
}
|
|
@@ -76,9 +76,12 @@ export class EventEngine {
|
|
|
76
76
|
public emitEvent(type: string | MainEventTypes, event: IEvent): void {
|
|
77
77
|
const typeString: string = this.convertTypeToString(type);
|
|
78
78
|
|
|
79
|
-
if (this._eventListeners[typeString] && this._eventListeners[typeString].length !== 0)
|
|
80
|
-
|
|
81
|
-
|
|
79
|
+
if (this._eventListeners[typeString] && this._eventListeners[typeString].length !== 0) {
|
|
80
|
+
const cbs = this._eventListeners[typeString]!.map(el => el.cb)
|
|
81
|
+
for (let i = 0; i < cbs.length; i++) {
|
|
82
|
+
cbs[i](event);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
82
85
|
|
|
83
86
|
if(typeString.includes('.'))
|
|
84
87
|
this.emitEvent(typeString.substr(0, typeString.indexOf('.')), event);
|
|
@@ -103,7 +103,7 @@ export class HttpClient {
|
|
|
103
103
|
// if we have a sessionId and the sessionLoading functions and the image is not a blob or data, we load it via the sdk
|
|
104
104
|
if(sessionLoading !== undefined && sessionId !== undefined && !href.startsWith('blob:') && !href.startsWith('data:')) {
|
|
105
105
|
// take first session to load a texture that is not session related
|
|
106
|
-
this._dataCache[dataKey] = new Promise<HttpResponse<any>>(resolve => {
|
|
106
|
+
this._dataCache[dataKey] = new Promise<HttpResponse<any>>((resolve, reject) => {
|
|
107
107
|
sessionLoading!.downloadTexture(sessionId!, href).then((result) => {
|
|
108
108
|
resolve({
|
|
109
109
|
data: result[0],
|
|
@@ -111,6 +111,8 @@ export class HttpClient {
|
|
|
111
111
|
'content-type': result[1]
|
|
112
112
|
}
|
|
113
113
|
})
|
|
114
|
+
}).catch(e => {
|
|
115
|
+
reject(e)
|
|
114
116
|
});
|
|
115
117
|
});
|
|
116
118
|
} else {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { convert, validate, DefaultsV3_3 as Defaults, ISettingsV3_3 as ISettings, versions } from '@shapediver/viewer.settings';
|
|
1
|
+
import { convert, validate, DefaultsV3_3 as Defaults, ISettingsV3_3 as ISettings, versions, latestVersion } from '@shapediver/viewer.settings';
|
|
2
2
|
import { container, singleton } from 'tsyringe'
|
|
3
3
|
|
|
4
4
|
import { EventEngine } from '../event-engine/EventEngine'
|
|
@@ -20,7 +20,8 @@ export class SettingsEngine {
|
|
|
20
20
|
private readonly _eventEngine: EventEngine = <EventEngine>container.resolve(EventEngine);
|
|
21
21
|
private readonly _logger: Logger = <Logger>container.resolve(Logger);
|
|
22
22
|
private readonly _settings: ISettings = Defaults();
|
|
23
|
-
private
|
|
23
|
+
private _settingsJson: any;
|
|
24
|
+
private _settings_version: versions = latestVersion;
|
|
24
25
|
|
|
25
26
|
// #endregion Properties (8)
|
|
26
27
|
|
|
@@ -65,6 +66,10 @@ export class SettingsEngine {
|
|
|
65
66
|
public get settings(): ISettings {
|
|
66
67
|
return this._settings;
|
|
67
68
|
}
|
|
69
|
+
|
|
70
|
+
public get settingsJson(): any {
|
|
71
|
+
return this._settingsJson;
|
|
72
|
+
}
|
|
68
73
|
|
|
69
74
|
// #endregion Public Accessors (10)
|
|
70
75
|
|
|
@@ -95,6 +100,7 @@ export class SettingsEngine {
|
|
|
95
100
|
}
|
|
96
101
|
|
|
97
102
|
public loadSettings(json: any) {
|
|
103
|
+
this._settingsJson = json;
|
|
98
104
|
if (JSON.stringify(json) !== JSON.stringify({})) {
|
|
99
105
|
|
|
100
106
|
const prevVersions = ['1.0', '2.0', '3.0', '3.1', '3.2'];
|
|
@@ -104,16 +110,16 @@ export class SettingsEngine {
|
|
|
104
110
|
try {
|
|
105
111
|
validate(json, v as versions);
|
|
106
112
|
this._settings_version = v as versions;
|
|
107
|
-
(<any>this._settings) = convert(json,
|
|
113
|
+
(<any>this._settings) = convert(json, latestVersion);
|
|
108
114
|
this.cleanSettings(this._settings);
|
|
109
115
|
return;
|
|
110
116
|
} catch (e) {}
|
|
111
117
|
}
|
|
112
118
|
|
|
113
119
|
try {
|
|
114
|
-
validate(json,
|
|
115
|
-
this._settings_version =
|
|
116
|
-
(<any>this._settings) = convert(json,
|
|
120
|
+
validate(json, latestVersion);
|
|
121
|
+
this._settings_version = latestVersion;
|
|
122
|
+
(<any>this._settings) = convert(json, latestVersion);
|
|
117
123
|
this.cleanSettings(this._settings);
|
|
118
124
|
return;
|
|
119
125
|
} catch (e) {
|
|
@@ -121,14 +127,14 @@ export class SettingsEngine {
|
|
|
121
127
|
throw this._logger.handleError(LOGGING_TOPIC.SETTINGS, `SettingsEngine.loadSettings`, error);
|
|
122
128
|
}
|
|
123
129
|
} else {
|
|
124
|
-
this._settings_version =
|
|
130
|
+
this._settings_version = latestVersion;
|
|
125
131
|
(<any>this._settings) = Defaults();
|
|
126
132
|
return;
|
|
127
133
|
}
|
|
128
134
|
}
|
|
129
135
|
|
|
130
136
|
public reset() {
|
|
131
|
-
this._settings_version =
|
|
137
|
+
this._settings_version = latestVersion;
|
|
132
138
|
(<any>this._settings) = Defaults();
|
|
133
139
|
}
|
|
134
140
|
|