@configura/babylon-view 2.0.0-alpha.6 → 2.0.0-alpha.9
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/io/CfgHistoryToCameraConfConnector.d.ts +2 -3
- package/dist/io/CfgHistoryToCameraConfConnector.js +6 -7
- package/dist/io/CfgIOCameraConfConnector.d.ts +4 -4
- package/dist/io/CfgIOCameraConfConnector.js +8 -10
- package/dist/io/CfgObservableStateToCameraConfConnector.js +1 -1
- package/dist/io/CfgWindowMessageToCameraConfConnector.js +1 -1
- package/package.json +5 -5
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CfgHistoryManager, CfgHistoryManagerSendData
|
|
1
|
+
import { CfgHistoryManager, CfgHistoryManagerSendData } from "@configura/web-api";
|
|
2
2
|
import { Observable } from "@configura/web-utilities";
|
|
3
3
|
import { CfgOrbitalCameraControlProps } from "../camera/CfgOrbitalCameraControlProps.js";
|
|
4
4
|
import { CfgCameraConfMessage, CfgIOCameraConfConnector } from "./CfgIOCameraConfConnector.js";
|
|
@@ -9,7 +9,6 @@ import { CfgCameraConfMessage, CfgIOCameraConfConnector } from "./CfgIOCameraCon
|
|
|
9
9
|
*/
|
|
10
10
|
export declare class CfgHistoryToCameraConfConnector extends CfgIOCameraConfConnector<CfgHistoryManagerSendData<CfgCameraConfMessage>> {
|
|
11
11
|
private readonly defaults;
|
|
12
|
-
private readonly _historyWriteMode;
|
|
13
12
|
private readonly _qsKeyYaw;
|
|
14
13
|
private readonly _qsKeyPitch;
|
|
15
14
|
private readonly _qsKeyDistance;
|
|
@@ -21,7 +20,7 @@ export declare class CfgHistoryToCameraConfConnector extends CfgIOCameraConfConn
|
|
|
21
20
|
* @param qsKeyDistance The Query String key for Distance.
|
|
22
21
|
* @returns The instance and the initial camera orientation.
|
|
23
22
|
*/
|
|
24
|
-
static make(manager: CfgHistoryManager, defaults: CfgOrbitalCameraControlProps, cameraControl: Observable<CfgOrbitalCameraControlProps>,
|
|
23
|
+
static make(manager: CfgHistoryManager, defaults: CfgOrbitalCameraControlProps, cameraControl: Observable<CfgOrbitalCameraControlProps>, qsKeyYaw?: string, qsKeyPitch?: string, qsKeyDistance?: string): {
|
|
25
24
|
instance: CfgHistoryToCameraConfConnector;
|
|
26
25
|
initial: CfgOrbitalCameraControlProps;
|
|
27
26
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CfgHistoryManager
|
|
1
|
+
import { CfgHistoryManager } from "@configura/web-api";
|
|
2
2
|
import { degToRad, radToDeg } from "@configura/web-utilities";
|
|
3
3
|
import { CfgIOCameraConfConnector } from "./CfgIOCameraConfConnector.js";
|
|
4
4
|
const YAW_QS_KEY = "stageyaw";
|
|
@@ -38,10 +38,9 @@ const radToDegOrUndefined = (v) => v && radToDeg(v);
|
|
|
38
38
|
* to the history stack.
|
|
39
39
|
*/
|
|
40
40
|
export class CfgHistoryToCameraConfConnector extends CfgIOCameraConfConnector {
|
|
41
|
-
constructor(manager, defaults, initial, cameraControl,
|
|
41
|
+
constructor(manager, defaults, initial, cameraControl, _qsKeyYaw, _qsKeyPitch, _qsKeyDistance) {
|
|
42
42
|
super(manager, initial, cameraControl);
|
|
43
43
|
this.defaults = defaults;
|
|
44
|
-
this._historyWriteMode = _historyWriteMode;
|
|
45
44
|
this._qsKeyYaw = _qsKeyYaw;
|
|
46
45
|
this._qsKeyPitch = _qsKeyPitch;
|
|
47
46
|
this._qsKeyDistance = _qsKeyDistance;
|
|
@@ -54,7 +53,7 @@ export class CfgHistoryToCameraConfConnector extends CfgIOCameraConfConnector {
|
|
|
54
53
|
* @param qsKeyDistance The Query String key for Distance.
|
|
55
54
|
* @returns The instance and the initial camera orientation.
|
|
56
55
|
*/
|
|
57
|
-
static make(manager, defaults, cameraControl,
|
|
56
|
+
static make(manager, defaults, cameraControl, qsKeyYaw = YAW_QS_KEY, qsKeyPitch = PITCH_QS_KEY, qsKeyDistance = DISTANCE_QS_KEY) {
|
|
58
57
|
var _a, _b;
|
|
59
58
|
const qsKeyValues = CfgHistoryManager.currentQsKeyValues();
|
|
60
59
|
const initial = {
|
|
@@ -62,7 +61,7 @@ export class CfgHistoryToCameraConfConnector extends CfgIOCameraConfConnector {
|
|
|
62
61
|
pitch: (_b = degToRadOrUndefined(qsAsNumber(qsKeyValues, qsKeyPitch))) !== null && _b !== void 0 ? _b : defaults.pitch,
|
|
63
62
|
distance: qsAsNumber(qsKeyValues, qsKeyDistance !== null && qsKeyDistance !== void 0 ? qsKeyDistance : defaults.distance),
|
|
64
63
|
};
|
|
65
|
-
const instance = new CfgHistoryToCameraConfConnector(manager, defaults, initial, cameraControl,
|
|
64
|
+
const instance = new CfgHistoryToCameraConfConnector(manager, defaults, initial, cameraControl, qsKeyYaw, qsKeyPitch, qsKeyDistance);
|
|
66
65
|
return { instance, initial };
|
|
67
66
|
}
|
|
68
67
|
makeSendData(cameraConf, initial) {
|
|
@@ -73,9 +72,9 @@ export class CfgHistoryToCameraConfConnector extends CfgIOCameraConfConnector {
|
|
|
73
72
|
addToMapAndRound(qsKeyValues, this._qsKeyDistance, cameraConf.distanceWasAutoSet ? undefined : cameraConf.distance, this.defaults.distance);
|
|
74
73
|
}
|
|
75
74
|
return {
|
|
76
|
-
message:
|
|
75
|
+
message: CfgIOCameraConfConnector.makeMessage(cameraConf, initial),
|
|
77
76
|
qsKeyValues,
|
|
78
|
-
|
|
77
|
+
useHistoryPush: false,
|
|
79
78
|
};
|
|
80
79
|
}
|
|
81
80
|
}
|
|
@@ -23,14 +23,14 @@ export declare abstract class CfgIOCameraConfConnector<S> {
|
|
|
23
23
|
private _delayId;
|
|
24
24
|
private _send;
|
|
25
25
|
protected abstract makeSendData(cameraConf: CfgOrbitalCameraControlProps, initial: boolean): S;
|
|
26
|
-
makeMessage(cameraConf: CfgOrbitalCameraControlProps, initial: boolean): CfgCameraConfMessage;
|
|
27
|
-
makeMessageListener(callback: CameraConfMessageCallback): (message: unknown) => Promise<void>;
|
|
26
|
+
static makeMessage(cameraConf: CfgOrbitalCameraControlProps, initial: boolean): CfgCameraConfMessage;
|
|
27
|
+
static makeMessageListener(callback: CameraConfMessageCallback): (message: unknown) => Promise<void>;
|
|
28
28
|
/**
|
|
29
29
|
* Register the callback to listen for Product Configuration messages
|
|
30
30
|
* @returns A function which when called will cancel listening
|
|
31
31
|
*/
|
|
32
|
-
listenForMessage(callback: CameraConfMessageCallback): () => void;
|
|
33
|
-
listenForCamera(callback: CameraConfCallback): () => void;
|
|
32
|
+
static listenForMessage<S>(callback: CameraConfMessageCallback, ioManager: CfgIOManager<S>): () => void;
|
|
33
|
+
static listenForCamera(callback: CameraConfCallback, cameraControl: Observable<CfgOrbitalCameraControlProps>): () => void;
|
|
34
34
|
}
|
|
35
35
|
export {};
|
|
36
36
|
//# sourceMappingURL=CfgIOCameraConfConnector.d.ts.map
|
|
@@ -28,28 +28,28 @@ export class CfgIOCameraConfConnector {
|
|
|
28
28
|
};
|
|
29
29
|
this._send = (data) => this._ioManager.send(STAGE_CAMERA_CONF_MESSAGE_KEY, data);
|
|
30
30
|
this._send(this.makeSendData(initial, true));
|
|
31
|
-
this._stopListenToMessage =
|
|
31
|
+
this._stopListenToMessage = CfgIOCameraConfConnector.listenForMessage((message) => __awaiter(this, void 0, void 0, function* () {
|
|
32
32
|
if (this._delayId !== undefined) {
|
|
33
33
|
return;
|
|
34
34
|
}
|
|
35
35
|
_cameraControl.notifyAll(message.cameraConf, this);
|
|
36
|
-
}));
|
|
37
|
-
this._stopListenToProdConf =
|
|
36
|
+
}), _ioManager);
|
|
37
|
+
this._stopListenToProdConf = CfgIOCameraConfConnector.listenForCamera((cameraConf) => __awaiter(this, void 0, void 0, function* () {
|
|
38
38
|
window.clearTimeout(this._delayId);
|
|
39
39
|
this._delayId = window.setTimeout(() => {
|
|
40
40
|
this._send(this.makeSendData(cameraConf, false));
|
|
41
41
|
this._delayId = undefined;
|
|
42
42
|
}, THROTTLING_DELAY);
|
|
43
|
-
}));
|
|
43
|
+
}), _cameraControl);
|
|
44
44
|
}
|
|
45
|
-
makeMessage(cameraConf, initial) {
|
|
45
|
+
static makeMessage(cameraConf, initial) {
|
|
46
46
|
return {
|
|
47
47
|
version: STAGE_CAMERA_MESSAGE_VERSION,
|
|
48
48
|
initial,
|
|
49
49
|
cameraConf,
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
|
-
makeMessageListener(callback) {
|
|
52
|
+
static makeMessageListener(callback) {
|
|
53
53
|
return (message) => __awaiter(this, void 0, void 0, function* () {
|
|
54
54
|
const cameraConfMessage = message;
|
|
55
55
|
const version = cameraConfMessage.version;
|
|
@@ -64,16 +64,14 @@ export class CfgIOCameraConfConnector {
|
|
|
64
64
|
* Register the callback to listen for Product Configuration messages
|
|
65
65
|
* @returns A function which when called will cancel listening
|
|
66
66
|
*/
|
|
67
|
-
listenForMessage(callback) {
|
|
68
|
-
const ioManager = this._ioManager;
|
|
67
|
+
static listenForMessage(callback, ioManager) {
|
|
69
68
|
const listener = this.makeMessageListener(callback);
|
|
70
69
|
ioManager.listenForMessage(listener, STAGE_CAMERA_CONF_MESSAGE_KEY);
|
|
71
70
|
return () => {
|
|
72
71
|
ioManager.stopListenForMessage(listener);
|
|
73
72
|
};
|
|
74
73
|
}
|
|
75
|
-
listenForCamera(callback) {
|
|
76
|
-
const cameraControl = this._cameraControl;
|
|
74
|
+
static listenForCamera(callback, cameraControl) {
|
|
77
75
|
cameraControl.listen(callback, this);
|
|
78
76
|
return () => {
|
|
79
77
|
cameraControl.stopListen(callback);
|
|
@@ -6,6 +6,6 @@ import { CfgIOCameraConfConnector } from "./CfgIOCameraConfConnector.js";
|
|
|
6
6
|
*/
|
|
7
7
|
export class CfgObservableStateToCameraConfConnector extends CfgIOCameraConfConnector {
|
|
8
8
|
makeSendData(cameraConf, initial) {
|
|
9
|
-
return
|
|
9
|
+
return CfgIOCameraConfConnector.makeMessage(cameraConf, initial);
|
|
10
10
|
}
|
|
11
11
|
}
|
|
@@ -6,6 +6,6 @@ import { CfgIOCameraConfConnector } from "./CfgIOCameraConfConnector.js";
|
|
|
6
6
|
*/
|
|
7
7
|
export class CfgWindowMessageToCameraConfConnector extends CfgIOCameraConfConnector {
|
|
8
8
|
makeSendData(cameraConf, initial) {
|
|
9
|
-
return
|
|
9
|
+
return CfgIOCameraConfConnector.makeMessage(cameraConf, initial);
|
|
10
10
|
}
|
|
11
11
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@configura/babylon-view",
|
|
3
|
-
"version": "2.0.0-alpha.
|
|
3
|
+
"version": "2.0.0-alpha.9",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -16,16 +16,16 @@
|
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"@babylonjs/core": "4.2.0",
|
|
19
|
-
"@configura/web-core": "2.0.0-alpha.
|
|
20
|
-
"@configura/web-utilities": "2.0.0-alpha.
|
|
19
|
+
"@configura/web-core": "2.0.0-alpha.9",
|
|
20
|
+
"@configura/web-utilities": "2.0.0-alpha.9"
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
23
|
-
"@configura/web-api": "2.0.0-alpha.
|
|
23
|
+
"@configura/web-api": "2.0.0-alpha.9",
|
|
24
24
|
"del-cli": "^3.0.0",
|
|
25
25
|
"typescript": "4.2"
|
|
26
26
|
},
|
|
27
27
|
"publishConfig": {
|
|
28
28
|
"access": "public"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "734f4e65f7d3dc9836c5c0321dbe6c36bbfa2531"
|
|
31
31
|
}
|