@configura/babylon-view 2.0.0-alpha.1 → 2.0.0-alpha.10

package/dist/camera/CfgOrbitalCamera.d.ts

@@ -46,6 +46,7 @@ export declare class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
     _lowestAllowedCameraHeight: number | undefined;
     set lowestAllowedCameraHeight(v: number | undefined);
     get lowestAllowedCameraHeight(): number | undefined;
+    private _pointerDown;
     disableAutomaticSizing: boolean;
     disableZoom: boolean;
     private _externalControlHasHappened;
@@ -55,7 +56,9 @@ export declare class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
     get radius(): number;
     private get _orbitalCameraControlProps();
     private _boundNotifyCameraControlListeners;
+    private _pointerUpDownCallback;
     frameRenderNeeded(): boolean;
+    private get _isMoving();
     private _notifyCameraControlListeners;
     get cameraControlObservable(): Observable<CfgOrbitalCameraControlProps>;
     /**

package/dist/camera/CfgOrbitalCamera.js

@@ -1,3 +1,4 @@
+import { PointerEventTypes } from "@babylonjs/core";
 import { ArcRotateCamera } from "@babylonjs/core/Cameras/arcRotateCamera.js";
 import { Vector3 } from "@babylonjs/core/Maths/math.vector.js";
 import { degToRad, normalizeAngle, Observable } from "@configura/web-utilities";
@@ -33,11 +34,21 @@ export class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
         this._latestSignificantChangeBoundingBox = new CfgBoundingBox();
         this._disableSubFloorCam = false;
         this._lowestAllowedCameraHeight = undefined;
+        this._pointerDown = false;
         this.disableAutomaticSizing = false;
         this.disableZoom = false;
         this._externalControlHasHappened = false;
         this._radius = 0;
         this._boundNotifyCameraControlListeners = () => this._notifyCameraControlListeners();
+        this._pointerUpDownCallback = (p, s) => {
+            if (p.type === PointerEventTypes.POINTERUP) {
+                this._pointerDown = false;
+                this._notifyCameraControlListeners();
+            }
+            if (p.type === PointerEventTypes.POINTERDOWN) {
+                this._pointerDown = true;
+            }
+        };
         this.attachControl(_canvas, // This parameters is not actually used for anything. But still required.
         false, // No panning with keyboard
         false // No panning with mouse
@@ -58,11 +69,13 @@ export class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
         this.fov = this._config.fov;
         this.inertia = this._config.inertia;
         this.angularSensibilityX = this.angularSensibilityY = this._config.pointerSpeedFactor;
+        scene.onPointerObservable.add(this._pointerUpDownCallback, PointerEventTypes.POINTERUP | PointerEventTypes.POINTERDOWN);
         this.onViewMatrixChangedObservable.add(this._boundNotifyCameraControlListeners);
     }
     dispose() {
         this.detachControl(this._canvas);
         this.onViewMatrixChangedObservable.removeCallback(this._boundNotifyCameraControlListeners);
+        this._scene.onPointerObservable.removeCallback(this._pointerUpDownCallback);
         super.dispose();
     }
     set disableSubFloorCam(v) {
@@ -103,6 +116,7 @@ export class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
             yaw: normalizeAngle(this.alpha),
             pitch: this.beta,
             distanceWasAutoSet: this.radius === this._currentMinDistanceToFitModelInView,
+            committed: !(this._isMoving || this._pointerDown),
         };
     }
     frameRenderNeeded() {
@@ -110,8 +124,10 @@ export class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
         if (externalControlHasHappened) {
             this._externalControlHasHappened = false;
         }
+        return this._isMoving || externalControlHasHappened;
+    }
+    get _isMoving() {
         return (this.useAutoRotationBehavior ||
-            externalControlHasHappened ||
             this.inertialAlphaOffset !== 0 ||
             this.inertialBetaOffset !== 0 ||
             this.inertialPanningX !== 0 ||

package/dist/camera/CfgOrbitalCameraControlProps.d.ts

@@ -7,6 +7,7 @@ export interface CfgOrbitalCameraControlProps {
     yaw?: number;
     pitch?: number;
     distanceWasAutoSet?: boolean;
+    committed?: boolean;
 }
-export declare function orbitalCameraControlPropsEquals(left: CfgOrbitalCameraControlProps, right: CfgOrbitalCameraControlProps): boolean;
+export declare function orbitalCameraControlPropsEquals(left: CfgOrbitalCameraControlProps, right: CfgOrbitalCameraControlProps, ignoreCommitted?: boolean): boolean;
 //# sourceMappingURL=CfgOrbitalCameraControlProps.d.ts.map

package/dist/camera/CfgOrbitalCameraControlProps.js

@@ -1,6 +1,7 @@
-export function orbitalCameraControlPropsEquals(left, right) {
+export function orbitalCameraControlPropsEquals(left, right, ignoreCommitted = false) {
     return (((left.distanceWasAutoSet && right.distanceWasAutoSet) ||
         left.distance === right.distance) &&
         left.yaw === right.yaw &&
-        left.pitch === right.pitch);
+        left.pitch === right.pitch &&
+        (ignoreCommitted || left.committed === right.committed));
 }

package/dist/io/CfgHistoryToCameraConfConnector.js

@@ -72,7 +72,7 @@ export class CfgHistoryToCameraConfConnector extends CfgIOCameraConfConnector {
             addToMapAndRound(qsKeyValues, this._qsKeyDistance, cameraConf.distanceWasAutoSet ? undefined : cameraConf.distance, this.defaults.distance);
         }
         return {
-            message: this.makeMessage(cameraConf, initial),
+            message: CfgIOCameraConfConnector.makeMessage(cameraConf, initial),
             qsKeyValues,
             useHistoryPush: false,
         };

package/dist/io/CfgIOCameraConfConnector.d.ts

@@ -15,22 +15,22 @@ declare type CameraConfCallback = (conf: CfgOrbitalCameraControlProps) => Promis
  */
 export declare abstract class CfgIOCameraConfConnector<S> {
     private readonly _ioManager;
-    private readonly _cameraControl;
-    private _stopListenToMessage;
-    private _stopListenToProdConf;
-    constructor(_ioManager: CfgIOManager<S>, initialCameraConf: CfgOrbitalCameraControlProps, _cameraControl: Observable<CfgOrbitalCameraControlProps>);
+    private readonly _stopListenToMessage;
+    private readonly _stopListenToCameraConf;
+    constructor(_ioManager: CfgIOManager<S>, initial: CfgOrbitalCameraControlProps, cameraControl: Observable<CfgOrbitalCameraControlProps>);
     destroy: () => void;
-    private _delayId;
+    private _latestSentData;
+    private _sendWithoutDuplicates;
     private _send;
     protected abstract makeSendData(cameraConf: CfgOrbitalCameraControlProps, initial: boolean): S;
-    makeMessage(cameraConf: CfgOrbitalCameraControlProps, initial: boolean): CfgCameraConfMessage;
-    makeMessageListener(callback: CameraConfMessageCallback): (message: unknown) => Promise<void>;
+    static makeMessage(cameraConf: CfgOrbitalCameraControlProps, initial: boolean): CfgCameraConfMessage;
+    static makeMessageListener(callback: CameraConfMessageCallback): (message: unknown) => Promise<void>;
     /**
      * Register the callback to listen for Product Configuration messages
      * @returns A function which when called will cancel listening
      */
-    listenForMessage(callback: CameraConfMessageCallback): () => void;
-    listenForCamera(callback: CameraConfCallback): () => void;
+    static listenForMessage<S>(callback: CameraConfMessageCallback, ioManager: CfgIOManager<S>): () => void;
+    static listenForCamera(callback: CameraConfCallback, cameraControl: Observable<CfgOrbitalCameraControlProps>): () => void;
 }
 export {};
 //# sourceMappingURL=CfgIOCameraConfConnector.d.ts.map

package/dist/io/CfgIOCameraConfConnector.js

@@ -7,49 +7,50 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-// Chrome is not happy if history updates are sent to rapidly.
-// And message receivers probably don't want to get flooded either.
-const THROTTLING_DELAY = 100;
+import { orbitalCameraControlPropsEquals, } from "../camera/CfgOrbitalCameraControlProps.js";
 export const STAGE_CAMERA_CONF_MESSAGE_KEY = "stagecameraconf";
 export const STAGE_CAMERA_MESSAGE_VERSION = "1.0";
 /**
  * Base class for connecting the camera configuration to an IO channel
  */
 export class CfgIOCameraConfConnector {
-    constructor(_ioManager, initialCameraConf, _cameraControl) {
+    constructor(_ioManager, initial, cameraControl) {
         this._ioManager = _ioManager;
-        this._cameraControl = _cameraControl;
-        this._stopListenToMessage = undefined;
-        this._stopListenToProdConf = undefined;
         this.destroy = () => {
-            var _a, _b;
-            (_a = this._stopListenToMessage) === null || _a === void 0 ? void 0 : _a.call(this);
-            (_b = this._stopListenToProdConf) === null || _b === void 0 ? void 0 : _b.call(this);
+            this._stopListenToMessage();
+            this._stopListenToCameraConf();
+        };
+        this._sendWithoutDuplicates = (cameraConf, initial) => {
+            const latestSentData = this._latestSentData;
+            if (latestSentData !== undefined) {
+                if (orbitalCameraControlPropsEquals(latestSentData.cameraConf, cameraConf) &&
+                    latestSentData.initial === initial) {
+                    return;
+                }
+            }
+            this._latestSentData = { cameraConf, initial };
+            this._send(this.makeSendData(cameraConf, initial));
         };
         this._send = (data) => this._ioManager.send(STAGE_CAMERA_CONF_MESSAGE_KEY, data);
-        this._send(this.makeSendData(initialCameraConf, true));
-        this._stopListenToMessage = this.listenForMessage((message) => __awaiter(this, void 0, void 0, function* () {
-            if (this._delayId !== undefined) {
+        this._sendWithoutDuplicates(initial, true);
+        this._stopListenToMessage = CfgIOCameraConfConnector.listenForMessage((message) => __awaiter(this, void 0, void 0, function* () {
+            cameraControl.notifyAll(message.cameraConf, this);
+        }), _ioManager);
+        this._stopListenToCameraConf = CfgIOCameraConfConnector.listenForCamera((cameraConf) => __awaiter(this, void 0, void 0, function* () {
+            if (!cameraConf.committed) {
                 return;
             }
-            _cameraControl.notifyAll(message.cameraConf, this);
-        }));
-        this._stopListenToProdConf = this.listenForCamera((cameraConf) => __awaiter(this, void 0, void 0, function* () {
-            window.clearTimeout(this._delayId);
-            this._delayId = window.setTimeout(() => {
-                this._send(this.makeSendData(cameraConf, false));
-                this._delayId = undefined;
-            }, THROTTLING_DELAY);
-        }));
+            this._sendWithoutDuplicates(cameraConf, false);
+        }), cameraControl);
     }
-    makeMessage(cameraConf, initial) {
+    static makeMessage(cameraConf, initial) {
         return {
             version: STAGE_CAMERA_MESSAGE_VERSION,
             initial,
             cameraConf,
         };
     }
-    makeMessageListener(callback) {
+    static makeMessageListener(callback) {
         return (message) => __awaiter(this, void 0, void 0, function* () {
             const cameraConfMessage = message;
             const version = cameraConfMessage.version;
@@ -64,16 +65,14 @@ export class CfgIOCameraConfConnector {
      * Register the callback to listen for Product Configuration messages
      * @returns A function which when called will cancel listening
      */
-    listenForMessage(callback) {
-        const ioManager = this._ioManager;
+    static listenForMessage(callback, ioManager) {
         const listener = this.makeMessageListener(callback);
         ioManager.listenForMessage(listener, STAGE_CAMERA_CONF_MESSAGE_KEY);
         return () => {
             ioManager.stopListenForMessage(listener);
         };
     }
-    listenForCamera(callback) {
-        const cameraControl = this._cameraControl;
+    static listenForCamera(callback, cameraControl) {
         cameraControl.listen(callback, this);
         return () => {
             cameraControl.stopListen(callback);

package/dist/io/CfgObservableStateToCameraConfConnector.js

@@ -6,6 +6,6 @@ import { CfgIOCameraConfConnector } from "./CfgIOCameraConfConnector.js";
  */
 export class CfgObservableStateToCameraConfConnector extends CfgIOCameraConfConnector {
     makeSendData(cameraConf, initial) {
-        return this.makeMessage(cameraConf, initial);
+        return CfgIOCameraConfConnector.makeMessage(cameraConf, initial);
     }
 }

package/dist/io/CfgWindowMessageToCameraConfConnector.js

@@ -6,6 +6,6 @@ import { CfgIOCameraConfConnector } from "./CfgIOCameraConfConnector.js";
  */
 export class CfgWindowMessageToCameraConfConnector extends CfgIOCameraConfConnector {
     makeSendData(cameraConf, initial) {
-        return this.makeMessage(cameraConf, initial);
+        return CfgIOCameraConfConnector.makeMessage(cameraConf, initial);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/babylon-view",
-	"version": "2.0.0-alpha.1",
+	"version": "2.0.0-alpha.10",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -16,16 +16,16 @@
 	},
 	"dependencies": {
 		"@babylonjs/core": "4.2.0",
-		"@configura/web-core": "2.0.0-alpha.1",
-		"@configura/web-utilities": "2.0.0-alpha.1"
+		"@configura/web-core": "2.0.0-alpha.10",
+		"@configura/web-utilities": "2.0.0-alpha.10"
 	},
 	"devDependencies": {
-		"@configura/web-api": "2.0.0-alpha.1",
+		"@configura/web-api": "2.0.0-alpha.10",
 		"del-cli": "^3.0.0",
 		"typescript": "4.2"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "f35367369c2e0189ed8181ae91040a149c729368"
+	"gitHead": "77f9cbe7521be3fd58a139bdc93167a349ef384f"
 }