@shapediver/viewer.shared.services 2.8.4 → 2.8.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/settings-engine/SettingsEngine.d.ts +0 -2
- package/dist/settings-engine/SettingsEngine.d.ts.map +1 -1
- package/dist/settings-engine/SettingsEngine.js +0 -8
- package/dist/settings-engine/SettingsEngine.js.map +1 -1
- package/package.json +3 -3
- package/src/settings-engine/SettingsEngine.ts +0 -9
|
@@ -12,7 +12,6 @@ export declare class SettingsEngine {
|
|
|
12
12
|
private readonly _logger;
|
|
13
13
|
private readonly _settings;
|
|
14
14
|
private _settingsJson;
|
|
15
|
-
private _settings_version;
|
|
16
15
|
get ar(): IARSettings;
|
|
17
16
|
get camera(): ICameraSettings;
|
|
18
17
|
get environment(): IEnvironmentSettings;
|
|
@@ -24,7 +23,6 @@ export declare class SettingsEngine {
|
|
|
24
23
|
set session(value: ISessionSettings);
|
|
25
24
|
get settings(): ISettings;
|
|
26
25
|
get settingsJson(): any;
|
|
27
|
-
convertToTargetVersion(): any;
|
|
28
26
|
flatten(): {
|
|
29
27
|
[key: string]: any;
|
|
30
28
|
};
|
|
@@ -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,EAA2B,MAAM,6BAA6B,CAAC;AAM/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,CAAqC;IAClE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyB;IACnD,OAAO,CAAC,aAAa,CAAM;
|
|
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;AAM/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,CAAqC;IAClE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyB;IACnD,OAAO,CAAC,aAAa,CAAM;IAM3B,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,OAAO;;;IAoBP,YAAY,CAAC,IAAI,EAAE,GAAG;IA8BtB,KAAK;IAQZ,OAAO,CAAC,aAAa;CA2BxB"}
|
|
@@ -11,7 +11,6 @@ class SettingsEngine {
|
|
|
11
11
|
this._eventEngine = EventEngine_1.EventEngine.instance;
|
|
12
12
|
this._logger = Logger_1.Logger.instance;
|
|
13
13
|
this._settings = (0, viewer_settings_1.DefaultsV3_3)();
|
|
14
|
-
this._settings_version = viewer_settings_1.latestVersion;
|
|
15
14
|
// #endregion Private Methods (1)
|
|
16
15
|
}
|
|
17
16
|
// #endregion Properties (8)
|
|
@@ -51,9 +50,6 @@ class SettingsEngine {
|
|
|
51
50
|
}
|
|
52
51
|
// #endregion Public Accessors (10)
|
|
53
52
|
// #region Public Methods (4)
|
|
54
|
-
convertToTargetVersion() {
|
|
55
|
-
return (0, viewer_settings_1.convert)(this._settings, this._settings_version);
|
|
56
|
-
}
|
|
57
53
|
flatten() {
|
|
58
54
|
const flattenObject = (ob) => {
|
|
59
55
|
const toReturn = {};
|
|
@@ -84,7 +80,6 @@ class SettingsEngine {
|
|
|
84
80
|
const v = prevVersions[i];
|
|
85
81
|
try {
|
|
86
82
|
(0, viewer_settings_1.validate)(json, v);
|
|
87
|
-
this._settings_version = v;
|
|
88
83
|
this._settings = (0, viewer_settings_1.convert)(json, viewer_settings_1.latestVersion);
|
|
89
84
|
this.cleanSettings(this._settings);
|
|
90
85
|
return;
|
|
@@ -93,7 +88,6 @@ class SettingsEngine {
|
|
|
93
88
|
}
|
|
94
89
|
try {
|
|
95
90
|
(0, viewer_settings_1.validate)(json, viewer_settings_1.latestVersion);
|
|
96
|
-
this._settings_version = viewer_settings_1.latestVersion;
|
|
97
91
|
this._settings = (0, viewer_settings_1.convert)(json, viewer_settings_1.latestVersion);
|
|
98
92
|
this.cleanSettings(this._settings);
|
|
99
93
|
return;
|
|
@@ -103,13 +97,11 @@ class SettingsEngine {
|
|
|
103
97
|
}
|
|
104
98
|
}
|
|
105
99
|
else {
|
|
106
|
-
this._settings_version = viewer_settings_1.latestVersion;
|
|
107
100
|
this._settings = (0, viewer_settings_1.DefaultsV3_3)();
|
|
108
101
|
return;
|
|
109
102
|
}
|
|
110
103
|
}
|
|
111
104
|
reset() {
|
|
112
|
-
this._settings_version = viewer_settings_1.latestVersion;
|
|
113
105
|
this._settings = (0, viewer_settings_1.DefaultsV3_3)();
|
|
114
106
|
}
|
|
115
107
|
// #endregion Public Methods (4)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingsEngine.js","sourceRoot":"","sources":["../../src/settings-engine/SettingsEngine.ts"],"names":[],"mappings":";;;AAAA,iEAA+I;AAE/I,6DAAyD;AACzD,6CAA0C;AAC1C,6EAAiF;AAWjF,MAAa,cAAc;IAA3B;QACI,yBAAyB;QAER,iBAAY,GAAgB,yBAAW,CAAC,QAAQ,CAAC;QACjD,YAAO,GAAW,eAAM,CAAC,QAAQ,CAAC;QAClC,cAAS,GAAc,IAAA,8BAAQ,GAAE,CAAC;
|
|
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.8.
|
|
3
|
+
"version": "2.8.5",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"@ctrl/tinycolor": "^3.4.0",
|
|
43
43
|
"@shapediver/sdk.geometry-api-sdk-v2": "1.3.0",
|
|
44
44
|
"@shapediver/viewer.settings": "0.3.0",
|
|
45
|
-
"@shapediver/viewer.shared.build-data": "2.8.
|
|
45
|
+
"@shapediver/viewer.shared.build-data": "2.8.5",
|
|
46
46
|
"@types/dompurify": "^2.3.1",
|
|
47
47
|
"@types/ua-parser-js": "^0.7.36",
|
|
48
48
|
"@types/uuid": "^9.0.0",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"ua-parser-js": "^0.7.28",
|
|
53
53
|
"uuid": "^9.0.0"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "a89e7b495fd87f1cb8bf6d412dec704190ee9585"
|
|
56
56
|
}
|
|
@@ -20,7 +20,6 @@ export class SettingsEngine {
|
|
|
20
20
|
private readonly _logger: Logger = Logger.instance;
|
|
21
21
|
private readonly _settings: ISettings = Defaults();
|
|
22
22
|
private _settingsJson: any;
|
|
23
|
-
private _settings_version: versions = latestVersion;
|
|
24
23
|
|
|
25
24
|
// #endregion Properties (8)
|
|
26
25
|
|
|
@@ -74,10 +73,6 @@ export class SettingsEngine {
|
|
|
74
73
|
|
|
75
74
|
// #region Public Methods (4)
|
|
76
75
|
|
|
77
|
-
public convertToTargetVersion(): any {
|
|
78
|
-
return convert(this._settings, this._settings_version);
|
|
79
|
-
}
|
|
80
|
-
|
|
81
76
|
public flatten() {
|
|
82
77
|
const flattenObject = (ob: any) => {
|
|
83
78
|
const toReturn: { [key: string]: any } = {};
|
|
@@ -108,7 +103,6 @@ export class SettingsEngine {
|
|
|
108
103
|
|
|
109
104
|
try {
|
|
110
105
|
validate(json, v as versions);
|
|
111
|
-
this._settings_version = v as versions;
|
|
112
106
|
(<any>this._settings) = convert(json, latestVersion);
|
|
113
107
|
this.cleanSettings(this._settings);
|
|
114
108
|
return;
|
|
@@ -117,7 +111,6 @@ export class SettingsEngine {
|
|
|
117
111
|
|
|
118
112
|
try {
|
|
119
113
|
validate(json, latestVersion);
|
|
120
|
-
this._settings_version = latestVersion;
|
|
121
114
|
(<any>this._settings) = convert(json, latestVersion);
|
|
122
115
|
this.cleanSettings(this._settings);
|
|
123
116
|
return;
|
|
@@ -125,14 +118,12 @@ export class SettingsEngine {
|
|
|
125
118
|
throw new ShapeDiverViewerSettingsError('SettingsEngine.loadSettings: Settings could not be validated. ' + (<Error>e).message, <Error>e);
|
|
126
119
|
}
|
|
127
120
|
} else {
|
|
128
|
-
this._settings_version = latestVersion;
|
|
129
121
|
(<any>this._settings) = Defaults();
|
|
130
122
|
return;
|
|
131
123
|
}
|
|
132
124
|
}
|
|
133
125
|
|
|
134
126
|
public reset() {
|
|
135
|
-
this._settings_version = latestVersion;
|
|
136
127
|
(<any>this._settings) = Defaults();
|
|
137
128
|
}
|
|
138
129
|
|