@shapediver/viewer.shared.services 2.5.0 → 2.6.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/settings-engine/SettingsEngine.d.ts +10 -10
- package/dist/settings-engine/SettingsEngine.d.ts.map +1 -1
- package/dist/settings-engine/SettingsEngine.js +18 -10
- package/dist/settings-engine/SettingsEngine.js.map +1 -1
- package/package.json +5 -5
- package/src/settings-engine/SettingsEngine.ts +29 -21
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
2
|
-
declare type IARSettings =
|
|
3
|
-
declare type ICameraSettings =
|
|
4
|
-
declare type IEnvironmentSettings =
|
|
5
|
-
declare type IEnvironmentGeometrySettings =
|
|
6
|
-
declare type IGeneralSettings =
|
|
7
|
-
declare type ILightSettings =
|
|
8
|
-
declare type IRenderingSettings =
|
|
9
|
-
declare type ISessionSettings =
|
|
1
|
+
import { ISettingsV3_2 as ISettings } from '@shapediver/viewer.settings';
|
|
2
|
+
declare type IARSettings = ISettings["ar"];
|
|
3
|
+
declare type ICameraSettings = ISettings["camera"];
|
|
4
|
+
declare type IEnvironmentSettings = ISettings["environment"];
|
|
5
|
+
declare type IEnvironmentGeometrySettings = ISettings["environmentGeometry"];
|
|
6
|
+
declare type IGeneralSettings = ISettings["general"];
|
|
7
|
+
declare type ILightSettings = ISettings["light"];
|
|
8
|
+
declare type IRenderingSettings = ISettings["rendering"];
|
|
9
|
+
declare type ISessionSettings = ISettings["session"];
|
|
10
10
|
export declare class SettingsEngine {
|
|
11
11
|
private readonly _eventEngine;
|
|
12
12
|
private readonly _logger;
|
|
@@ -21,7 +21,7 @@ export declare class SettingsEngine {
|
|
|
21
21
|
get rendering(): IRenderingSettings;
|
|
22
22
|
get session(): ISessionSettings;
|
|
23
23
|
set session(value: ISessionSettings);
|
|
24
|
-
get settings():
|
|
24
|
+
get settings(): ISettings;
|
|
25
25
|
convertToTargetVersion(): any;
|
|
26
26
|
flatten(): {
|
|
27
27
|
[key: string]: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingsEngine.d.ts","sourceRoot":"","sources":["../../src/settings-engine/SettingsEngine.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"SettingsEngine.d.ts","sourceRoot":"","sources":["../../src/settings-engine/SettingsEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,aAAa,IAAI,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAOtH,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,iBAAiB,CAAgD;IAMzE,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;IAMM,sBAAsB,IAAI,GAAG;IAI7B,OAAO;;;IAoBP,YAAY,CAAC,IAAI,EAAE,GAAG;IAmDtB,KAAK;IASZ,OAAO,CAAC,aAAa;CA2BxB"}
|
|
@@ -11,8 +11,8 @@ class SettingsEngine {
|
|
|
11
11
|
// #region Properties (8)
|
|
12
12
|
this._eventEngine = tsyringe_1.container.resolve(EventEngine_1.EventEngine);
|
|
13
13
|
this._logger = tsyringe_1.container.resolve(Logger_1.Logger);
|
|
14
|
-
this._settings = (0, viewer_settings_1.
|
|
15
|
-
this._settings_version = '3.
|
|
14
|
+
this._settings = (0, viewer_settings_1.DefaultsV3_2)();
|
|
15
|
+
this._settings_version = '3.2';
|
|
16
16
|
// #endregion Private Methods (1)
|
|
17
17
|
}
|
|
18
18
|
// #endregion Properties (8)
|
|
@@ -79,7 +79,7 @@ class SettingsEngine {
|
|
|
79
79
|
try {
|
|
80
80
|
(0, viewer_settings_1.validate)(json, '1.0');
|
|
81
81
|
this._settings_version = '1.0';
|
|
82
|
-
this._settings = (0, viewer_settings_1.convert)(json, '3.
|
|
82
|
+
this._settings = (0, viewer_settings_1.convert)(json, '3.2');
|
|
83
83
|
this.cleanSettings(this._settings);
|
|
84
84
|
return;
|
|
85
85
|
}
|
|
@@ -87,7 +87,7 @@ class SettingsEngine {
|
|
|
87
87
|
try {
|
|
88
88
|
(0, viewer_settings_1.validate)(json, '2.0');
|
|
89
89
|
this._settings_version = '2.0';
|
|
90
|
-
this._settings = (0, viewer_settings_1.convert)(json, '3.
|
|
90
|
+
this._settings = (0, viewer_settings_1.convert)(json, '3.2');
|
|
91
91
|
this.cleanSettings(this._settings);
|
|
92
92
|
return;
|
|
93
93
|
}
|
|
@@ -95,7 +95,7 @@ class SettingsEngine {
|
|
|
95
95
|
try {
|
|
96
96
|
(0, viewer_settings_1.validate)(json, '3.0');
|
|
97
97
|
this._settings_version = '3.0';
|
|
98
|
-
this._settings = (0, viewer_settings_1.convert)(json, '3.
|
|
98
|
+
this._settings = (0, viewer_settings_1.convert)(json, '3.2');
|
|
99
99
|
this.cleanSettings(this._settings);
|
|
100
100
|
return;
|
|
101
101
|
}
|
|
@@ -103,7 +103,15 @@ class SettingsEngine {
|
|
|
103
103
|
try {
|
|
104
104
|
(0, viewer_settings_1.validate)(json, '3.1');
|
|
105
105
|
this._settings_version = '3.1';
|
|
106
|
-
this._settings = (0, viewer_settings_1.convert)(json, '3.
|
|
106
|
+
this._settings = (0, viewer_settings_1.convert)(json, '3.2');
|
|
107
|
+
this.cleanSettings(this._settings);
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
catch (e) { }
|
|
111
|
+
try {
|
|
112
|
+
(0, viewer_settings_1.validate)(json, '3.2');
|
|
113
|
+
this._settings_version = '3.2';
|
|
114
|
+
this._settings = (0, viewer_settings_1.convert)(json, '3.2');
|
|
107
115
|
this.cleanSettings(this._settings);
|
|
108
116
|
return;
|
|
109
117
|
}
|
|
@@ -113,14 +121,14 @@ class SettingsEngine {
|
|
|
113
121
|
}
|
|
114
122
|
}
|
|
115
123
|
else {
|
|
116
|
-
this._settings_version = '3.
|
|
117
|
-
this._settings = (0, viewer_settings_1.
|
|
124
|
+
this._settings_version = '3.2';
|
|
125
|
+
this._settings = (0, viewer_settings_1.DefaultsV3_2)();
|
|
118
126
|
return;
|
|
119
127
|
}
|
|
120
128
|
}
|
|
121
129
|
reset() {
|
|
122
|
-
this._settings_version = '3.
|
|
123
|
-
this._settings = (0, viewer_settings_1.
|
|
130
|
+
this._settings_version = '3.2';
|
|
131
|
+
this._settings = (0, viewer_settings_1.DefaultsV3_2)();
|
|
124
132
|
}
|
|
125
133
|
// #endregion Public Methods (4)
|
|
126
134
|
// #region Private Methods (1)
|
|
@@ -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.
|
|
3
|
+
"version": "2.6.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -42,9 +42,9 @@
|
|
|
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": "
|
|
46
|
-
"@shapediver/viewer.settings": "0.1.
|
|
47
|
-
"@shapediver/viewer.shared.build-data": "2.
|
|
45
|
+
"@shapediver/sdk.geometry-api-sdk-v2": "1.2.3",
|
|
46
|
+
"@shapediver/viewer.settings": "0.1.37",
|
|
47
|
+
"@shapediver/viewer.shared.build-data": "2.6.0",
|
|
48
48
|
"@types/dompurify": "^2.3.1",
|
|
49
49
|
"@types/ua-parser-js": "^0.7.36",
|
|
50
50
|
"@types/uuid": "^8.3.0",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"ua-parser-js": "^0.7.28",
|
|
56
56
|
"uuid": "^8.3.2"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "a9946b0804ce334d7812a9121e19953b7d00f476"
|
|
59
59
|
}
|
|
@@ -1,26 +1,26 @@
|
|
|
1
|
-
import { convert, validate,
|
|
1
|
+
import { convert, validate, DefaultsV3_2 as Defaults, ISettingsV3_2 as ISettings } from '@shapediver/viewer.settings';
|
|
2
2
|
import { container, singleton } from 'tsyringe'
|
|
3
3
|
|
|
4
4
|
import { EventEngine } from '../event-engine/EventEngine'
|
|
5
5
|
import { Logger, LOGGING_TOPIC } from '../logger/Logger';
|
|
6
6
|
import { ShapeDiverViewerSettingsError } from '../logger/ShapeDiverViewerErrors';
|
|
7
7
|
|
|
8
|
-
type IARSettings =
|
|
9
|
-
type ICameraSettings =
|
|
10
|
-
type IEnvironmentSettings =
|
|
11
|
-
type IEnvironmentGeometrySettings =
|
|
12
|
-
type IGeneralSettings =
|
|
13
|
-
type ILightSettings =
|
|
14
|
-
type IRenderingSettings =
|
|
15
|
-
type ISessionSettings =
|
|
8
|
+
type IARSettings = ISettings["ar"];
|
|
9
|
+
type ICameraSettings = ISettings["camera"];
|
|
10
|
+
type IEnvironmentSettings = ISettings["environment"];
|
|
11
|
+
type IEnvironmentGeometrySettings = ISettings["environmentGeometry"];
|
|
12
|
+
type IGeneralSettings = ISettings["general"];
|
|
13
|
+
type ILightSettings = ISettings["light"];
|
|
14
|
+
type IRenderingSettings = ISettings["rendering"];
|
|
15
|
+
type ISessionSettings = ISettings["session"];
|
|
16
16
|
|
|
17
17
|
export class SettingsEngine {
|
|
18
18
|
// #region Properties (8)
|
|
19
19
|
|
|
20
20
|
private readonly _eventEngine: EventEngine = <EventEngine>container.resolve(EventEngine);
|
|
21
21
|
private readonly _logger: Logger = <Logger>container.resolve(Logger);
|
|
22
|
-
private readonly _settings:
|
|
23
|
-
private _settings_version: '1.0' | '2.0' | '3.0' | '3.1' = '3.
|
|
22
|
+
private readonly _settings: ISettings = Defaults();
|
|
23
|
+
private _settings_version: '1.0' | '2.0' | '3.0' | '3.1' | '3.2' = '3.2';
|
|
24
24
|
|
|
25
25
|
// #endregion Properties (8)
|
|
26
26
|
|
|
@@ -62,7 +62,7 @@ export class SettingsEngine {
|
|
|
62
62
|
this._settings.session = value;
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
-
public get settings():
|
|
65
|
+
public get settings(): ISettings {
|
|
66
66
|
return this._settings;
|
|
67
67
|
}
|
|
68
68
|
|
|
@@ -99,7 +99,7 @@ export class SettingsEngine {
|
|
|
99
99
|
try {
|
|
100
100
|
validate(json, '1.0');
|
|
101
101
|
this._settings_version = '1.0';
|
|
102
|
-
(<any>this._settings) = convert(json, '3.
|
|
102
|
+
(<any>this._settings) = convert(json, '3.2');
|
|
103
103
|
this.cleanSettings(this._settings);
|
|
104
104
|
return;
|
|
105
105
|
} catch (e) {}
|
|
@@ -107,7 +107,7 @@ export class SettingsEngine {
|
|
|
107
107
|
try {
|
|
108
108
|
validate(json, '2.0');
|
|
109
109
|
this._settings_version = '2.0';
|
|
110
|
-
(<any>this._settings) = convert(json, '3.
|
|
110
|
+
(<any>this._settings) = convert(json, '3.2');
|
|
111
111
|
this.cleanSettings(this._settings);
|
|
112
112
|
return;
|
|
113
113
|
} catch (e) {}
|
|
@@ -115,7 +115,7 @@ export class SettingsEngine {
|
|
|
115
115
|
try {
|
|
116
116
|
validate(json, '3.0');
|
|
117
117
|
this._settings_version = '3.0';
|
|
118
|
-
(<any>this._settings) = convert(json, '3.
|
|
118
|
+
(<any>this._settings) = convert(json, '3.2');
|
|
119
119
|
this.cleanSettings(this._settings);
|
|
120
120
|
return;
|
|
121
121
|
} catch (e) {}
|
|
@@ -123,7 +123,15 @@ export class SettingsEngine {
|
|
|
123
123
|
try {
|
|
124
124
|
validate(json, '3.1');
|
|
125
125
|
this._settings_version = '3.1';
|
|
126
|
-
(<any>this._settings) = convert(json, '3.
|
|
126
|
+
(<any>this._settings) = convert(json, '3.2');
|
|
127
|
+
this.cleanSettings(this._settings);
|
|
128
|
+
return;
|
|
129
|
+
} catch (e) {}
|
|
130
|
+
|
|
131
|
+
try {
|
|
132
|
+
validate(json, '3.2');
|
|
133
|
+
this._settings_version = '3.2';
|
|
134
|
+
(<any>this._settings) = convert(json, '3.2');
|
|
127
135
|
this.cleanSettings(this._settings);
|
|
128
136
|
return;
|
|
129
137
|
} catch (e) {
|
|
@@ -131,22 +139,22 @@ export class SettingsEngine {
|
|
|
131
139
|
throw this._logger.handleError(LOGGING_TOPIC.SETTINGS, `SettingsEngine.loadSettings`, error);
|
|
132
140
|
}
|
|
133
141
|
} else {
|
|
134
|
-
this._settings_version = '3.
|
|
135
|
-
(<any>this._settings) =
|
|
142
|
+
this._settings_version = '3.2';
|
|
143
|
+
(<any>this._settings) = Defaults();
|
|
136
144
|
return;
|
|
137
145
|
}
|
|
138
146
|
}
|
|
139
147
|
|
|
140
148
|
public reset() {
|
|
141
|
-
this._settings_version = '3.
|
|
142
|
-
(<any>this._settings) =
|
|
149
|
+
this._settings_version = '3.2';
|
|
150
|
+
(<any>this._settings) = Defaults();
|
|
143
151
|
}
|
|
144
152
|
|
|
145
153
|
// #endregion Public Methods (4)
|
|
146
154
|
|
|
147
155
|
// #region Private Methods (1)
|
|
148
156
|
|
|
149
|
-
private cleanSettings(json:
|
|
157
|
+
private cleanSettings(json: ISettings) {
|
|
150
158
|
for(let c in json.camera.cameras) {
|
|
151
159
|
const camera = json.camera.cameras[c];
|
|
152
160
|
if(camera.type === 'perspective') {
|