@configura/babylon-view 1.6.1 → 2.0.0-alpha.0

package/dist/camera/CfgOrbitalCamera.d.ts

@@ -58,8 +58,13 @@ export declare class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
     frameRenderNeeded(): boolean;
     private _notifyCameraControlListeners;
     get cameraControlObservable(): Observable<CfgOrbitalCameraControlProps>;
-    setContentBoundingBox(newBoundingBox: CfgBoundingBox, force: boolean): void;
-    _applyAdaptToContentBoundingBox(force: boolean): void;
+    /**
+     * @param force true makes the camera distance adapt to the new bounds, even if they have
+     * not changed significantly. false makes the camera distance not adapt even if the
+     * bounding box size change is significant.
+     */
+    setContentBoundingBox(newBoundingBox: CfgBoundingBox, force: boolean | undefined): void;
+    private _applyAdaptToContentBoundingBox;
     refreshCameraNearFar(): void;
     private _applyNoSneakPeeking;
     private _updateCameraLimits;

package/dist/camera/CfgOrbitalCamera.js

@@ -1,6 +1,6 @@
 import { ArcRotateCamera } from "@babylonjs/core/Cameras/arcRotateCamera.js";
 import { Vector3 } from "@babylonjs/core/Maths/math.vector.js";
-import { degToRad, Observable } from "@configura/web-utilities";
+import { degToRad, normalizeAngle, Observable } from "@configura/web-utilities";
 import { CfgBoundingBox } from "../utilities/CfgBoundingBox.js";
 import { boundingBoxesAreSignificantlyDifferent, measureLongestDistanceToCorner, } from "../utilities/utilities3D.js";
 import { CfgArcRotateCameraPointersInput } from "./CfgArcRotateCameraPointersInput.js";
@@ -19,6 +19,8 @@ const defaultOrbitalCameraConfig = {
     significantBoundingBoxSizeChangeShrinkFactor: 0.4,
     significantBoundingBoxSizeChangeGrowFactor: 0.1,
 };
+// Babylon initializes radius to this to avoid divide by zero
+const BABYLON_DO_NOT_DIVIDE_BY_ZERO_MAGIC_CONSTANT = 0.0001;
 // This is a workaround as you are not allowed to override fields with accessors.
 // By adding this abstract field this becomes possible. This is a hack.
 class WorkaroundCfgOrbitalCamera extends ArcRotateCamera {
@@ -35,9 +37,7 @@ export class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
         this.disableZoom = false;
         this._externalControlHasHappened = false;
         this._radius = 0;
-        this._boundNotifyCameraControlListeners = () => {
-            this._notifyCameraControlListeners();
-        };
+        this._boundNotifyCameraControlListeners = () => this._notifyCameraControlListeners();
         this.attachControl(_canvas, // This parameters is not actually used for anything. But still required.
         false, // No panning with keyboard
         false // No panning with mouse
@@ -97,9 +97,12 @@ export class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
     }
     get _orbitalCameraControlProps() {
         return {
-            distance: this.radius,
-            yaw: this.alpha,
+            distance: this.radius === BABYLON_DO_NOT_DIVIDE_BY_ZERO_MAGIC_CONSTANT
+                ? undefined
+                : this.radius,
+            yaw: normalizeAngle(this.alpha),
             pitch: this.beta,
+            distanceWasAutoSet: this.radius === this._currentMinDistanceToFitModelInView,
         };
     }
     frameRenderNeeded() {
@@ -131,9 +134,11 @@ export class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
         if (this._orbitalCameraControlObservable === undefined) {
             this._orbitalCameraControlObservable = new Observable();
             this._orbitalCameraControlObservable.listen((c) => {
-                const { distance, yaw, pitch } = c;
+                const { distance, yaw, pitch, distanceWasAutoSet } = c;
                 let change = false;
-                if (distance !== undefined && distance !== this.radius) {
+                if (distanceWasAutoSet !== true &&
+                    distance !== undefined &&
+                    distance !== this.radius) {
                     this.forceRadius(distance);
                     change = true;
                 }
@@ -153,10 +158,15 @@ export class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
         }
         return this._orbitalCameraControlObservable;
     }
+    /**
+     * @param force true makes the camera distance adapt to the new bounds, even if they have
+     * not changed significantly. false makes the camera distance not adapt even if the
+     * bounding box size change is significant.
+     */
     setContentBoundingBox(newBoundingBox, force) {
         this._currentBoundingBox = newBoundingBox;
         const significantChange = boundingBoxesAreSignificantlyDifferent(this._latestSignificantChangeBoundingBox, newBoundingBox, this._config.significantBoundingBoxSizeChangeShrinkFactor, this._config.significantBoundingBoxSizeChangeGrowFactor);
-        if (!significantChange && !force) {
+        if (!significantChange && force !== true) {
             return;
         }
         this._latestSignificantChangeBoundingBox = newBoundingBox;
@@ -168,18 +178,18 @@ export class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
         if (bb.isEmpty) {
             return;
         }
-        // Keeps the camera from recomputing angles
-        const pre = [this.alpha, this.beta];
+        // Keeps the camera from recomputing angles and distance
+        const pre = [this.alpha, this.beta, this.radius];
         this.target = bb.center;
         if (this.disableAutomaticSizing) {
             return;
         }
-        [this.alpha, this.beta] = pre;
+        [this.alpha, this.beta, this.radius] = pre;
         this._updateCameraLimits();
         const minDistanceToFitModelInView = this._currentMinDistanceToFitModelInView;
         const minDistanceToKeepCameraOutOfModel = this._currentMinDistanceToKeepCameraOutOfModel;
         if (minDistanceToFitModelInView !== undefined) {
-            if (force || this.radius < minDistanceToFitModelInView) {
+            if (force !== false && (force === true || this.radius < minDistanceToFitModelInView)) {
                 this.forceRadius(minDistanceToFitModelInView);
             }
         }

package/dist/camera/CfgOrbitalCameraControlProps.d.ts

@@ -1,7 +1,12 @@
+/**
+ * @param distanceWasAutoSet Indicates that the camera distance was auto set. If true when setting
+ * camera settings @param distance will be ignored.
+ */
 export interface CfgOrbitalCameraControlProps {
     distance?: number;
     yaw?: number;
     pitch?: number;
+    distanceWasAutoSet?: boolean;
 }
 export declare function orbitalCameraControlPropsEquals(left: CfgOrbitalCameraControlProps, right: CfgOrbitalCameraControlProps): boolean;
 //# sourceMappingURL=CfgOrbitalCameraControlProps.d.ts.map

package/dist/camera/CfgOrbitalCameraControlProps.js

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

package/dist/geometry/stretch/CfgStretchData.d.ts

@@ -1,8 +1,8 @@
 import { Matrix, Vector3 } from "@babylonjs/core/Maths/math.vector.js";
-import { LengthValue, StretchMap } from "@configura/web-api";
+import { StretchMap } from "@configura/web-api";
 import { SymNode } from "@configura/web-core/dist/cm/format/cmsym/SymNode.js";
 import { DetailLevel } from "@configura/web-core/dist/cm/geometry/DetailMask.js";
-import { Logger } from "@configura/web-utilities";
+import { LengthValue, Logger } from "@configura/web-utilities";
 /**
  * How far along from sp to ep is a point on a plane crossing the sp to ep line?
  * 1 means at ep, 0 means at sp.

package/dist/index.d.ts

@@ -3,6 +3,9 @@ export * from "./animation/coordinator/CoordinatorPulseBounce.js";
 export * from "./animation/coordinator/CoordinatorPulseHighlight.js";
 export * from "./animation/coordinator/CoordinatorPulseInflate.js";
 export * from "./camera/CfgOrbitalCameraControlProps.js";
+export * from "./io/CfgHistoryToCameraConfConnector.js";
+export * from "./io/CfgObservableStateToCameraConfConnector.js";
+export * from "./io/CfgWindowMessageToCameraConfConnector.js";
 export * from "./utilities/utilities3D.js";
 export * from "./view/BaseView.js";
 export * from "./view/BaseViewConfiguration.js";

package/dist/index.js

@@ -3,6 +3,9 @@ export * from "./animation/coordinator/CoordinatorPulseBounce.js";
 export * from "./animation/coordinator/CoordinatorPulseHighlight.js";
 export * from "./animation/coordinator/CoordinatorPulseInflate.js";
 export * from "./camera/CfgOrbitalCameraControlProps.js";
+export * from "./io/CfgHistoryToCameraConfConnector.js";
+export * from "./io/CfgObservableStateToCameraConfConnector.js";
+export * from "./io/CfgWindowMessageToCameraConfConnector.js";
 export * from "./utilities/utilities3D.js";
 export * from "./view/BaseView.js";
 export * from "./view/BaseViewConfiguration.js";

package/dist/io/CfgHistoryToCameraConfConnector.d.ts

@@ -0,0 +1,30 @@
+import { CfgHistoryManager, CfgHistoryManagerSendData } from "@configura/web-api";
+import { Observable } from "@configura/web-utilities";
+import { CfgOrbitalCameraControlProps } from "../camera/CfgOrbitalCameraControlProps.js";
+import { CfgCameraConfMessage, CfgIOCameraConfConnector } from "./CfgIOCameraConfConnector.js";
+/**
+ * Instantiating this will make the browser history (and URL) update with the orientation
+ * of the Camera. It always use replace in the history API, so it will never add frames
+ * to the history stack.
+ */
+export declare class CfgHistoryToCameraConfConnector extends CfgIOCameraConfConnector<CfgHistoryManagerSendData<CfgCameraConfMessage>> {
+    private readonly defaults;
+    private readonly _qsKeyYaw;
+    private readonly _qsKeyPitch;
+    private readonly _qsKeyDistance;
+    /**
+     * @param defaults The default camera settings.
+     * @param cameraControl Connects with the Camera.
+     * @param qsKeyYaw The Query String key for Yaw.
+     * @param qsKeyPitch The Query String key for Pitch.
+     * @param qsKeyDistance The Query String key for Distance.
+     * @returns The instance and the initial camera orientation.
+     */
+    static make(manager: CfgHistoryManager, defaults: CfgOrbitalCameraControlProps, cameraControl: Observable<CfgOrbitalCameraControlProps>, qsKeyYaw?: string, qsKeyPitch?: string, qsKeyDistance?: string): {
+        instance: CfgHistoryToCameraConfConnector;
+        initial: CfgOrbitalCameraControlProps;
+    };
+    private constructor();
+    protected makeSendData(cameraConf: CfgOrbitalCameraControlProps, initial: boolean): CfgHistoryManagerSendData<CfgCameraConfMessage>;
+}
+//# sourceMappingURL=CfgHistoryToCameraConfConnector.d.ts.map

package/dist/io/CfgHistoryToCameraConfConnector.js

@@ -0,0 +1,80 @@
+import { CfgHistoryManager } from "@configura/web-api";
+import { degToRad, radToDeg } from "@configura/web-utilities";
+import { CfgIOCameraConfConnector } from "./CfgIOCameraConfConnector.js";
+const YAW_QS_KEY = "stageyaw";
+const PITCH_QS_KEY = "stagepitch";
+const DISTANCE_QS_KEY = "stagedistance";
+/**
+ * @returns if the key is set in qsMap return the value as a number, or else undefined
+ */
+const qsAsNumber = (qsMap, key) => {
+    const asString = qsMap.get(key);
+    if (asString === undefined) {
+        return undefined;
+    }
+    const asNumber = parseFloat(asString);
+    if (!isFinite(asNumber)) {
+        return undefined;
+    }
+    return asNumber;
+};
+/**
+ * If the number is set, round it and add to the map
+ */
+const addToMapAndRound = (map, key, value, def) => {
+    if (value === undefined || value === def) {
+        map.set(key, undefined);
+        return;
+    }
+    const timesHundredString = `${Math.round(100 * value)}`;
+    const decimalPlace = timesHundredString.length - 2;
+    map.set(key, `${timesHundredString.substring(0, decimalPlace)}.${timesHundredString.substring(decimalPlace)}`);
+};
+const degToRadOrUndefined = (v) => v && degToRad(v);
+const radToDegOrUndefined = (v) => v && radToDeg(v);
+/**
+ * Instantiating this will make the browser history (and URL) update with the orientation
+ * of the Camera. It always use replace in the history API, so it will never add frames
+ * to the history stack.
+ */
+export class CfgHistoryToCameraConfConnector extends CfgIOCameraConfConnector {
+    constructor(manager, defaults, initial, cameraControl, _qsKeyYaw, _qsKeyPitch, _qsKeyDistance) {
+        super(manager, initial, cameraControl);
+        this.defaults = defaults;
+        this._qsKeyYaw = _qsKeyYaw;
+        this._qsKeyPitch = _qsKeyPitch;
+        this._qsKeyDistance = _qsKeyDistance;
+    }
+    /**
+     * @param defaults The default camera settings.
+     * @param cameraControl Connects with the Camera.
+     * @param qsKeyYaw The Query String key for Yaw.
+     * @param qsKeyPitch The Query String key for Pitch.
+     * @param qsKeyDistance The Query String key for Distance.
+     * @returns The instance and the initial camera orientation.
+     */
+    static make(manager, defaults, cameraControl, qsKeyYaw = YAW_QS_KEY, qsKeyPitch = PITCH_QS_KEY, qsKeyDistance = DISTANCE_QS_KEY) {
+        var _a, _b;
+        const qsKeyValues = CfgHistoryManager.currentQsKeyValues();
+        const initial = {
+            yaw: (_a = degToRadOrUndefined(qsAsNumber(qsKeyValues, qsKeyYaw))) !== null && _a !== void 0 ? _a : defaults.yaw,
+            pitch: (_b = degToRadOrUndefined(qsAsNumber(qsKeyValues, qsKeyPitch))) !== null && _b !== void 0 ? _b : defaults.pitch,
+            distance: qsAsNumber(qsKeyValues, qsKeyDistance !== null && qsKeyDistance !== void 0 ? qsKeyDistance : defaults.distance),
+        };
+        const instance = new CfgHistoryToCameraConfConnector(manager, defaults, initial, cameraControl, qsKeyYaw, qsKeyPitch, qsKeyDistance);
+        return { instance, initial };
+    }
+    makeSendData(cameraConf, initial) {
+        const qsKeyValues = new Map();
+        if (!initial) {
+            addToMapAndRound(qsKeyValues, this._qsKeyYaw, radToDegOrUndefined(cameraConf.yaw), radToDegOrUndefined(this.defaults.yaw));
+            addToMapAndRound(qsKeyValues, this._qsKeyPitch, radToDegOrUndefined(cameraConf.pitch), radToDegOrUndefined(this.defaults.pitch));
+            addToMapAndRound(qsKeyValues, this._qsKeyDistance, cameraConf.distanceWasAutoSet ? undefined : cameraConf.distance, this.defaults.distance);
+        }
+        return {
+            message: this.makeMessage(cameraConf, initial),
+            qsKeyValues,
+            useHistoryPush: false,
+        };
+    }
+}

package/dist/io/CfgIOCameraConfConnector.d.ts

@@ -0,0 +1,36 @@
+import { CfgIOManager } from "@configura/web-api";
+import { Observable } from "@configura/web-utilities";
+import { CfgOrbitalCameraControlProps } from "../camera/CfgOrbitalCameraControlProps.js";
+export declare type CfgCameraConfMessage = {
+    version: string;
+    initial: boolean;
+    cameraConf: CfgOrbitalCameraControlProps;
+};
+export declare const STAGE_CAMERA_CONF_MESSAGE_KEY = "stagecameraconf";
+export declare const STAGE_CAMERA_MESSAGE_VERSION = "1.0";
+declare type CameraConfMessageCallback = (message: CfgCameraConfMessage) => Promise<void>;
+declare type CameraConfCallback = (conf: CfgOrbitalCameraControlProps) => Promise<void>;
+/**
+ * Base class for connecting the camera configuration to an IO channel
+ */
+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>);
+    destroy: () => void;
+    private _delayId;
+    private _send;
+    protected abstract makeSendData(cameraConf: CfgOrbitalCameraControlProps, initial: boolean): S;
+    makeMessage(cameraConf: CfgOrbitalCameraControlProps, initial: boolean): CfgCameraConfMessage;
+    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;
+}
+export {};
+//# sourceMappingURL=CfgIOCameraConfConnector.d.ts.map

package/dist/io/CfgIOCameraConfConnector.js

@@ -0,0 +1,82 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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;
+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) {
+        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._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) {
+                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);
+        }));
+    }
+    makeMessage(cameraConf, initial) {
+        return {
+            version: STAGE_CAMERA_MESSAGE_VERSION,
+            initial,
+            cameraConf,
+        };
+    }
+    makeMessageListener(callback) {
+        return (message) => __awaiter(this, void 0, void 0, function* () {
+            const cameraConfMessage = message;
+            const version = cameraConfMessage.version;
+            if (version !== STAGE_CAMERA_MESSAGE_VERSION) {
+                console.error(`The a message was passed with an unsupported version "${version}". Currently only ${STAGE_CAMERA_MESSAGE_VERSION} is supported.`);
+                return;
+            }
+            yield callback(cameraConfMessage);
+        });
+    }
+    /**
+     * Register the callback to listen for Product Configuration messages
+     * @returns A function which when called will cancel listening
+     */
+    listenForMessage(callback) {
+        const ioManager = this._ioManager;
+        const listener = this.makeMessageListener(callback);
+        ioManager.listenForMessage(listener, STAGE_CAMERA_CONF_MESSAGE_KEY);
+        return () => {
+            ioManager.stopListenForMessage(listener);
+        };
+    }
+    listenForCamera(callback) {
+        const cameraControl = this._cameraControl;
+        cameraControl.listen(callback, this);
+        return () => {
+            cameraControl.stopListen(callback);
+        };
+    }
+}

package/dist/io/CfgObservableStateToCameraConfConnector.d.ts

@@ -0,0 +1,11 @@
+import { CfgOrbitalCameraControlProps } from "../camera/CfgOrbitalCameraControlProps.js";
+import { CfgCameraConfMessage, CfgIOCameraConfConnector } from "./CfgIOCameraConfConnector.js";
+/**
+ * Instantiating this will make Stage send camera orientation to the observable state.
+ * It will also make Stage listen for incoming updates to the observable state.
+
+ */
+export declare class CfgObservableStateToCameraConfConnector extends CfgIOCameraConfConnector<CfgCameraConfMessage> {
+    protected makeSendData(cameraConf: CfgOrbitalCameraControlProps, initial: boolean): CfgCameraConfMessage;
+}
+//# sourceMappingURL=CfgObservableStateToCameraConfConnector.d.ts.map

package/dist/io/CfgObservableStateToCameraConfConnector.js

@@ -0,0 +1,11 @@
+import { CfgIOCameraConfConnector } from "./CfgIOCameraConfConnector.js";
+/**
+ * Instantiating this will make Stage send camera orientation to the observable state.
+ * It will also make Stage listen for incoming updates to the observable state.
+
+ */
+export class CfgObservableStateToCameraConfConnector extends CfgIOCameraConfConnector {
+    makeSendData(cameraConf, initial) {
+        return this.makeMessage(cameraConf, initial);
+    }
+}

package/dist/io/CfgWindowMessageToCameraConfConnector.d.ts

@@ -0,0 +1,11 @@
+import { CfgOrbitalCameraControlProps } from "../camera/CfgOrbitalCameraControlProps.js";
+import { CfgCameraConfMessage, CfgIOCameraConfConnector } from "./CfgIOCameraConfConnector.js";
+/**
+ * Instantiating this will make Stage send camera orientation changes using the post message-API.
+ * It will also make Stage listen for incoming camera orientation update messages.
+ * This can be used to communicate in and out of an iframe for example.
+ */
+export declare class CfgWindowMessageToCameraConfConnector extends CfgIOCameraConfConnector<CfgCameraConfMessage> {
+    protected makeSendData(cameraConf: CfgOrbitalCameraControlProps, initial: boolean): CfgCameraConfMessage;
+}
+//# sourceMappingURL=CfgWindowMessageToCameraConfConnector.d.ts.map

package/dist/io/CfgWindowMessageToCameraConfConnector.js

@@ -0,0 +1,11 @@
+import { CfgIOCameraConfConnector } from "./CfgIOCameraConfConnector.js";
+/**
+ * Instantiating this will make Stage send camera orientation changes using the post message-API.
+ * It will also make Stage listen for incoming camera orientation update messages.
+ * This can be used to communicate in and out of an iframe for example.
+ */
+export class CfgWindowMessageToCameraConfConnector extends CfgIOCameraConfConnector {
+    makeSendData(cameraConf, initial) {
+        return this.makeMessage(cameraConf, initial);
+    }
+}

package/dist/nodes/CfgSymRootNode.d.ts

@@ -1,5 +1,5 @@
 import { Matrix } from "@babylonjs/core/Maths/math.vector.js";
-import { CfgMaterialMapping, RootNodeSource, Transform as ModelTransform } from "@configura/web-api";
+import { CfgMaterialMapping, DtoTransform as ModelTransform, RootNodeSource } from "@configura/web-api";
 import { SymNode } from "@configura/web-core/dist/cm/format/cmsym/SymNode.js";
 import { LengthUnit, Logger } from "@configura/web-utilities";
 import { CoordinatorWithMeta } from "../animation/coordinator/Coordinator.js";

package/dist/utilities/anchor/anchor.d.ts

@@ -1,5 +1,5 @@
 import { Matrix, Vector3 } from "@babylonjs/core";
-import { MeasureParam } from "@configura/web-api";
+import { DtoMeasureParam } from "@configura/web-api";
 import { CfgMeasureDefinition, CfgMeasurePriority } from "@configura/web-api/dist/CfgMeasure";
 import { CfgProductNode } from "../../nodes/CfgProductNode.js";
 import { CfgSymRootNode } from "../../nodes/CfgSymRootNode.js";
@@ -20,13 +20,13 @@ export declare const getAnchorTargetPriorityComparer: (measureDefinitions: CfgMe
  * It might be possible in the future to anchor to other things than Measures (which are primarily)
  * used for stretch, but for now we can only support anchoring to the ends of a Measure.
  * toSp means anchor to start point, else end point.
- * The MeasureParam class is used in several different contexts. To make the intent inside Stage
+ * The DtoMeasureParam class is used in several different contexts. To make the intent inside Stage
  * clear CfgAnchorRef exists, which including only what is relevant for when used for anchoring.
  */
 export declare class CfgAnchorRef {
     readonly stretchSymNodeId: string;
     readonly toSp: boolean;
-    static make(m: MeasureParam | undefined): CfgAnchorRef | undefined;
+    static make(m: DtoMeasureParam | undefined): CfgAnchorRef | undefined;
     /**
      * The name stretchSymNodeId might seem confusing. And it is. Turns out CET is implemented so
      * that it bases its anchoring on symNode Id containing the stretch. Not the measureParamId.

package/dist/utilities/anchor/anchor.js

@@ -45,7 +45,7 @@ export const getAnchorTargetPriorityComparer = (measureDefinitions) => (measureP
  * It might be possible in the future to anchor to other things than Measures (which are primarily)
  * used for stretch, but for now we can only support anchoring to the ends of a Measure.
  * toSp means anchor to start point, else end point.
- * The MeasureParam class is used in several different contexts. To make the intent inside Stage
+ * The DtoMeasureParam class is used in several different contexts. To make the intent inside Stage
  * clear CfgAnchorRef exists, which including only what is relevant for when used for anchoring.
  */
 export class CfgAnchorRef {

package/dist/utilities/utilities3D.d.ts

@@ -1,5 +1,5 @@
 import { Matrix, Vector3 } from "@babylonjs/core/Maths/math.vector.js";
-import { Transform as ModelTransform } from "@configura/web-api";
+import { DtoTransform as ModelTransform } from "@configura/web-api";
 import { ATriMeshF } from "@configura/web-core/dist/cm/core3D/ATriMeshF.js";
 import { SymTransform } from "@configura/web-core/dist/cm/format/cmsym/components/SymTransform.js";
 import { Point } from "@configura/web-core/dist/cm/geometry/Point.js";

package/dist/utilities/utilitiesSymRootIdentifier.d.ts

@@ -1,4 +1,4 @@
-import { RootNodeSource, Transform as ModelTransform } from "@configura/web-api";
+import { DtoTransform as ModelTransform, RootNodeSource } from "@configura/web-api";
 import { CfgAnchorRef } from "./anchor/anchor.js";
 export declare function makeIdentifier(type: "uri" | "file", v: string): string;
 export declare function identifierIsUri(identifier: string): boolean;

package/dist/view/SingleProductDefaultCameraView.d.ts

@@ -28,6 +28,9 @@ export declare class SingleProductDefaultCameraView<T extends SingleProductDefau
     protected notifyCameraListeners(): void;
     get cameraControlObservable(): Observable<CfgOrbitalCameraControlProps>;
     protected get contentCenter(): Vector3;
+    /**
+     * @param force true means force apply camera distance and camera bounds. false means force do not apply.
+     */
     protected handleSizing(force: boolean): void;
     protected refreshCameraNearFar(): void;
     protected getNeededFrameRender(time: number): boolean;

package/dist/view/SingleProductDefaultCameraView.js

@@ -114,6 +114,9 @@ export class SingleProductDefaultCameraView extends SingleProductView {
     get contentCenter() {
         return this._camera.target;
     }
+    /**
+     * @param force true means force apply camera distance and camera bounds. false means force do not apply.
+     */
     handleSizing(force) {
         super.handleSizing(force);
         if (this._viewportSize === undefined) {
@@ -124,7 +127,8 @@ export class SingleProductDefaultCameraView extends SingleProductView {
             ? new CfgBoundingBox()
             : currentProductNode.boundingBox;
         boundingBox.applyMatrix(CET_TO_BABYLON_MATRIX);
-        this._camera.setContentBoundingBox(boundingBox, force);
+        const initialCameraDistanceSetPreventsInitialAutoSizingSet = this.isFirstLoad && this._cameraConf.distance !== undefined;
+        this._camera.setContentBoundingBox(boundingBox, initialCameraDistanceSetPreventsInitialAutoSizingSet ? false : force ? true : undefined);
         if (!boundingBox.isEmpty) {
             this._lightRig.scale =
                 measureLongestDistanceToCorner(boundingBox, [0, 1, 2]) *

package/dist/view/SingleProductDefaultCameraViewConfiguration.d.ts

@@ -1,4 +1,5 @@
 import { EventListener } from "@configura/web-utilities";
+import { CfgOrbitalCameraControlProps } from "../camera/CfgOrbitalCameraControlProps.js";
 import { CameraConfigurationProps } from "./BaseViewConfiguration.js";
 import { SingleProductViewConfiguration, SingleProductViewEventMap } from "./SingleProductViewConfiguration.js";
 /**
@@ -7,17 +8,12 @@ import { SingleProductViewConfiguration, SingleProductViewEventMap } from "./Sin
  * @param disableSubFloorCam It is common that catalogue models are designed to never be shown from below. This limits camera polar angle.
  * @param lowestAllowedCameraHeight Relative to the size of the viewed model, the lowest height the camera can reach. Setting this to 0 is the same as disableSubFloorCam. 1 means the camera can not move lower than the height of the model. Any numeric value is allowed.
  * @param distance Only works if disableAutomaticSizing is set
- * @param yaw Horisontal angle for the camera. Range -π/2 to π/2 radians.
- * @param pitch Vertical angle for the camera. Range 0 to π/2 radians, measured from the north pole.
+ * @param yaw Horisontal angle for the camera. Range -π to π radians.
+ * @param pitch Vertical angle for the camera. Range 0 to π radians, measured from the north pole.
  * @param autoRotate See babylon-documentation for parameter-documentation
  */
-export declare type SingleProductDefaultCameraDirection = {
-    distance?: number;
-    yaw?: number;
-    pitch?: number;
-};
 export interface SingleProductDefaultCameraViewConfiguration extends SingleProductViewConfiguration {
-    camera?: SingleProductDefaultCameraDirection & {
+    camera?: CfgOrbitalCameraControlProps & {
         disableZoom?: boolean;
         disableAutomaticSizing?: boolean;
         disableSubFloorCam?: boolean;

package/dist/view/SingleProductView.d.ts

@@ -1,5 +1,5 @@
 import { Camera } from "@babylonjs/core/Cameras/camera.js";
-import { ApplicationArea, CfgProduct } from "@configura/web-api";
+import { CfgProduct, DtoApplicationArea } from "@configura/web-api";
 import { EventListener } from "@configura/web-utilities";
 import { CoordinatorWithMeta } from "../animation/coordinator/Coordinator.js";
 import { CameraCreator } from "../camera/CameraCreator.js";
@@ -10,7 +10,7 @@ import { CfgProductNode } from "../nodes/CfgProductNode.js";
 import { SceneCreator } from "../scene/SceneCreator.js";
 import { BaseView } from "./BaseView.js";
 import { SingleProductViewConfiguration, SingleProductViewEventMap } from "./SingleProductViewConfiguration.js";
-export declare type LoadingOrApplicationAreas = ApplicationArea[] | "loading";
+export declare type LoadingOrApplicationAreas = DtoApplicationArea[] | "loading";
 export declare type SingleProductViewConstructorOptions<C extends Camera> = {
     canvas: HTMLCanvasElement;
     cameraCreator: CameraCreator<C>;
@@ -20,6 +20,7 @@ export declare type SingleProductViewConstructorOptions<C extends Camera> = {
     dummyMaterialCreator?: DummyMaterialCreator;
 };
 export declare class SingleProductView<C extends Camera = Camera, T extends SingleProductViewEventMap = SingleProductViewEventMap> extends BaseView<C, T> {
+    private _isFirstLoad;
     private _currentProductNode;
     private _scheduledForRemoval;
     private _viewPhaseObservable;
@@ -31,6 +32,7 @@ export declare class SingleProductView<C extends Camera = Camera, T extends Sing
     private scheduleForRemoval;
     setConfiguration(configuration: SingleProductViewConfiguration): void;
     get currentProductNode(): CfgProductNode | undefined;
+    get isFirstLoad(): boolean;
     addEventListener<K extends keyof T>(event: K, listener: EventListener<T, K>): void;
     removeEventListener<K extends keyof T>(event: K, listener: EventListener<T, K>): void;
     protected getNeededFrameRender(time: number): boolean;

package/dist/view/SingleProductView.js

@@ -16,6 +16,7 @@ import { SingleProductViewPhase, } from "./SingleProductViewConfiguration.js";
 export class SingleProductView extends BaseView {
     constructor(options) {
         super(options);
+        this._isFirstLoad = true;
         this._scheduledForRemoval = [];
         this._viewPhaseObservable = new Observable();
         this._currentPhase = SingleProductViewPhase.Idle;
@@ -100,6 +101,7 @@ export class SingleProductView extends BaseView {
                         this.notifyPhaseChange(SingleProductViewPhase.HandleSizing);
                         this.handleSizing(false);
                     }
+                    this._isFirstLoad = false;
                     if (doRenderTemporaryMaterials) {
                         this.scheduleRerender();
                     }
@@ -158,6 +160,9 @@ export class SingleProductView extends BaseView {
     get currentProductNode() {
         return this._currentProductNode;
     }
+    get isFirstLoad() {
+        return this._isFirstLoad;
+    }
     addEventListener(event, listener) {
         switch (event) {
             case "viewPhase":

package/package.json

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