@shapediver/viewer.shared.services 1.11.9 → 1.12.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/converter/Converter.d.ts +1 -0
- package/dist/converter/Converter.d.ts.map +1 -1
- package/dist/converter/Converter.js +5 -1
- package/dist/converter/Converter.js.map +1 -1
- package/dist/settings-engine/SettingsEngine.d.ts +11 -11
- package/dist/settings-engine/SettingsEngine.d.ts.map +1 -1
- package/dist/settings-engine/SettingsEngine.js +18 -9
- package/dist/settings-engine/SettingsEngine.js.map +1 -1
- package/package.json +3 -3
|
@@ -3,6 +3,7 @@ export declare class Converter {
|
|
|
3
3
|
private tinyColorToString;
|
|
4
4
|
toHex8Color(color: any, defColorString?: string): string;
|
|
5
5
|
toColorArray(color: string): number[];
|
|
6
|
+
toThreeJsColorInput(color: string): string;
|
|
6
7
|
toColor(color: any, defColorString?: string): string;
|
|
7
8
|
toVec3(point: any): vec3;
|
|
8
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Converter.d.ts","sourceRoot":"","sources":["../../src/converter/Converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAQ,MAAM,WAAW,CAAA;AAItC,qBACa,SAAS;IAElB,OAAO,CAAC,iBAAiB;IAQlB,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,cAAc,GAAE,MAAkB,GAAG,MAAM;IAOnE,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"Converter.d.ts","sourceRoot":"","sources":["../../src/converter/Converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAQ,MAAM,WAAW,CAAA;AAItC,qBACa,SAAS;IAElB,OAAO,CAAC,iBAAiB;IAQlB,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,cAAc,GAAE,MAAkB,GAAG,MAAM;IAOnE,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;IAMrC,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAY1C,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,cAAc,GAAE,MAAkB,GAAG,MAAM;IAuF/D,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI;CAYlC"}
|
|
@@ -12,7 +12,7 @@ const tinycolor_1 = require("@ctrl/tinycolor");
|
|
|
12
12
|
const tsyringe_1 = require("tsyringe");
|
|
13
13
|
let Converter = class Converter {
|
|
14
14
|
tinyColorToString(color) {
|
|
15
|
-
return color.
|
|
15
|
+
return color.toHex8String();
|
|
16
16
|
}
|
|
17
17
|
toHex8Color(color, defColorString = '#00fff7') {
|
|
18
18
|
const c = this.toColor(color, defColorString);
|
|
@@ -25,6 +25,10 @@ let Converter = class Converter {
|
|
|
25
25
|
const rgb = tColor.toRgb();
|
|
26
26
|
return [rgb.r / 255.0, rgb.g / 255.0, rgb.b / 255.0];
|
|
27
27
|
}
|
|
28
|
+
toThreeJsColorInput(color) {
|
|
29
|
+
const c = this.toColor(color);
|
|
30
|
+
return c.slice(0, c.length - 2);
|
|
31
|
+
}
|
|
28
32
|
toColor(color, defColorString = '#00fff7') {
|
|
29
33
|
if (!color || color === 'default')
|
|
30
34
|
return defColorString;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Converter.js","sourceRoot":"","sources":["../../src/converter/Converter.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yCAAsC;AACtC,+CAA2C;AAC3C,uCAAoC;AAGpC,IAAa,SAAS,GAAtB,MAAa,SAAS;IAEV,iBAAiB,CAAC,KAAgB;QACtC,OAAO,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"Converter.js","sourceRoot":"","sources":["../../src/converter/Converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,17 @@
|
|
|
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_1 } from '@shapediver/viewer.settings';
|
|
2
|
+
declare type IARSettings = ISettingsV3_1["ar"];
|
|
3
|
+
declare type ICameraSettings = ISettingsV3_1["camera"];
|
|
4
|
+
declare type IEnvironmentSettings = ISettingsV3_1["environment"];
|
|
5
|
+
declare type IEnvironmentGeometrySettings = ISettingsV3_1["environmentGeometry"];
|
|
6
|
+
declare type IGeneralSettings = ISettingsV3_1["general"];
|
|
7
|
+
declare type ILightSettings = ISettingsV3_1["light"];
|
|
8
|
+
declare type IRenderingSettings = ISettingsV3_1["rendering"];
|
|
9
|
+
declare type ISessionSettings = ISettingsV3_1["session"];
|
|
10
10
|
export declare class SettingsEngine {
|
|
11
11
|
private readonly _eventEngine;
|
|
12
12
|
private readonly _logger;
|
|
13
13
|
private readonly _settings;
|
|
14
|
-
private _settings_version
|
|
14
|
+
private _settings_version;
|
|
15
15
|
get ar(): IARSettings;
|
|
16
16
|
get camera(): ICameraSettings;
|
|
17
17
|
get environment(): IEnvironmentSettings;
|
|
@@ -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(): ISettingsV3_1;
|
|
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,EAAmC,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAO7F,aAAK,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;AACvC,aAAK,eAAe,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;AAC/C,aAAK,oBAAoB,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;AACzD,aAAK,4BAA4B,GAAG,aAAa,CAAC,qBAAqB,CAAC,CAAC;AACzE,aAAK,gBAAgB,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;AACjD,aAAK,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;AAC7C,aAAK,kBAAkB,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;AACrD,aAAK,gBAAgB,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;AAEjD,qBACa,cAAc;IAGvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4D;IACzF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6C;IACrE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAiC;IAC3D,OAAO,CAAC,iBAAiB,CAAwC;IAMjE,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,aAAa,CAEnC;IAMM,sBAAsB,IAAI,GAAG;IAI7B,OAAO;;;IAoBP,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe;IA2CzE,KAAK;IASZ,OAAO,CAAC,aAAa;CA2BxB"}
|
|
@@ -16,7 +16,8 @@ let SettingsEngine = class SettingsEngine {
|
|
|
16
16
|
constructor() {
|
|
17
17
|
this._eventEngine = tsyringe_1.container.resolve(EventEngine_1.EventEngine);
|
|
18
18
|
this._logger = tsyringe_1.container.resolve(Logger_1.Logger);
|
|
19
|
-
this._settings = viewer_settings_1.
|
|
19
|
+
this._settings = viewer_settings_1.DefaultsV3_1();
|
|
20
|
+
this._settings_version = '3.1';
|
|
20
21
|
}
|
|
21
22
|
get ar() {
|
|
22
23
|
return this._settings.ar;
|
|
@@ -49,7 +50,7 @@ let SettingsEngine = class SettingsEngine {
|
|
|
49
50
|
return this._settings;
|
|
50
51
|
}
|
|
51
52
|
convertToTargetVersion() {
|
|
52
|
-
return viewer_settings_1.convert(this._settings,
|
|
53
|
+
return viewer_settings_1.convert(this._settings, this._settings_version);
|
|
53
54
|
}
|
|
54
55
|
flatten() {
|
|
55
56
|
const flattenObject = (ob) => {
|
|
@@ -78,7 +79,7 @@ let SettingsEngine = class SettingsEngine {
|
|
|
78
79
|
try {
|
|
79
80
|
viewer_settings_1.validate(json, '1.0');
|
|
80
81
|
this._settings_version = '1.0';
|
|
81
|
-
this._settings = viewer_settings_1.convert(json, '3.
|
|
82
|
+
this._settings = viewer_settings_1.convert(json, '3.1');
|
|
82
83
|
this.cleanSettings(this._settings);
|
|
83
84
|
return;
|
|
84
85
|
}
|
|
@@ -86,7 +87,7 @@ let SettingsEngine = class SettingsEngine {
|
|
|
86
87
|
try {
|
|
87
88
|
viewer_settings_1.validate(json, '2.0');
|
|
88
89
|
this._settings_version = '2.0';
|
|
89
|
-
this._settings = viewer_settings_1.convert(json, '3.
|
|
90
|
+
this._settings = viewer_settings_1.convert(json, '3.1');
|
|
90
91
|
this.cleanSettings(this._settings);
|
|
91
92
|
return;
|
|
92
93
|
}
|
|
@@ -94,7 +95,15 @@ let SettingsEngine = class SettingsEngine {
|
|
|
94
95
|
try {
|
|
95
96
|
viewer_settings_1.validate(json, '3.0');
|
|
96
97
|
this._settings_version = '3.0';
|
|
97
|
-
this._settings = viewer_settings_1.convert(json, '3.
|
|
98
|
+
this._settings = viewer_settings_1.convert(json, '3.1');
|
|
99
|
+
this.cleanSettings(this._settings);
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
catch (e) { }
|
|
103
|
+
try {
|
|
104
|
+
viewer_settings_1.validate(json, '3.1');
|
|
105
|
+
this._settings_version = '3.1';
|
|
106
|
+
this._settings = viewer_settings_1.convert(json, '3.1');
|
|
98
107
|
this.cleanSettings(this._settings);
|
|
99
108
|
return;
|
|
100
109
|
}
|
|
@@ -104,14 +113,14 @@ let SettingsEngine = class SettingsEngine {
|
|
|
104
113
|
}
|
|
105
114
|
}
|
|
106
115
|
else {
|
|
107
|
-
this._settings_version = '3.
|
|
108
|
-
this._settings = viewer_settings_1.
|
|
116
|
+
this._settings_version = '3.1';
|
|
117
|
+
this._settings = viewer_settings_1.DefaultsV3_1();
|
|
109
118
|
return;
|
|
110
119
|
}
|
|
111
120
|
}
|
|
112
121
|
reset() {
|
|
113
|
-
this._settings_version =
|
|
114
|
-
this._settings = viewer_settings_1.
|
|
122
|
+
this._settings_version = '3.1';
|
|
123
|
+
this._settings = viewer_settings_1.DefaultsV3_1();
|
|
115
124
|
}
|
|
116
125
|
cleanSettings(json) {
|
|
117
126
|
for (let c in json.camera.cameras) {
|
|
@@ -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": "1.
|
|
3
|
+
"version": "1.12.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"@sentry/tracing": "^6.7.2",
|
|
42
42
|
"@shapediver/sdk.geometry-api-sdk-v2": "^1.0.15",
|
|
43
43
|
"@shapediver/viewer.settings": "*",
|
|
44
|
-
"@shapediver/viewer.shared.build-data": "1.
|
|
44
|
+
"@shapediver/viewer.shared.build-data": "1.12.0",
|
|
45
45
|
"@types/dompurify": "^2.3.1",
|
|
46
46
|
"@types/ua-parser-js": "^0.7.36",
|
|
47
47
|
"@types/uuid": "^8.3.0",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"ua-parser-js": "^0.7.28",
|
|
53
53
|
"uuid": "^8.3.2"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "5a8184e94f1d8664d8c4d1d713fefb65496b9ba0"
|
|
56
56
|
}
|