@configura/babylon-view 1.2.1-alpha.0 → 1.3.0-alpha.2

package/dist/camera/CfgOrbitalCamera.d.ts

@@ -41,7 +41,11 @@ export declare class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
     private _currentMinDistanceToFitModelInView;
     private _orbitalCameraControlObservable;
     private _previousOrbitalCameraControlProps;
-    disableSubFloorCam: boolean;
+    _disableSubFloorCam: boolean;
+    set disableSubFloorCam(v: boolean);
+    _lowestAllowedCameraHeight: number | undefined;
+    set lowestAllowedCameraHeight(v: number | undefined);
+    get lowestAllowedCameraHeight(): number | undefined;
     disableAutomaticSizing: boolean;
     disableZoom: boolean;
     private _externalControlHasHappened;

package/dist/camera/CfgOrbitalCamera.js

@@ -29,7 +29,8 @@ export class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
         this._canvas = _canvas;
         this._currentBoundingBox = new CfgBoundingBox();
         this._latestSignificantChangeBoundingBox = new CfgBoundingBox();
-        this.disableSubFloorCam = false;
+        this._disableSubFloorCam = false;
+        this._lowestAllowedCameraHeight = undefined;
         this.disableAutomaticSizing = false;
         this.disableZoom = false;
         this._externalControlHasHappened = false;
@@ -64,6 +65,24 @@ export class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
         this.onViewMatrixChangedObservable.removeCallback(this._boundNotifyCameraControlListeners);
         super.dispose();
     }
+    set disableSubFloorCam(v) {
+        this._disableSubFloorCam = v;
+    }
+    set lowestAllowedCameraHeight(v) {
+        this._lowestAllowedCameraHeight = v;
+    }
+    get lowestAllowedCameraHeight() {
+        if (this._lowestAllowedCameraHeight !== undefined) {
+            if (this._disableSubFloorCam) {
+                return Math.max(0, this._lowestAllowedCameraHeight);
+            }
+            return this._lowestAllowedCameraHeight;
+        }
+        if (this._disableSubFloorCam) {
+            return 0;
+        }
+        return undefined;
+    }
     forceRadius(r) {
         this._radius = r;
     }
@@ -188,10 +207,6 @@ export class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
         this.maxZ = cameraDistance + graceDistance;
     }
     _applyNoSneakPeeking() {
-        if (!this.disableSubFloorCam) {
-            this.upperBetaLimit = MAX_UPPER_BETA_LIMIT;
-            return;
-        }
         //It might be impolite to look at a Cfg models underside
         const noPeekLimit = this._calculateNoPeekingLimit();
         if (noPeekLimit === undefined || !isFinite(noPeekLimit)) {
@@ -222,10 +237,12 @@ export class CfgOrbitalCamera extends WorkaroundCfgOrbitalCamera {
     }
     _calculateNoPeekingLimit() {
         const bb = this._currentBoundingBox;
-        if (bb.isEmpty) {
+        if (bb.isEmpty || this.lowestAllowedCameraHeight === undefined) {
             return undefined;
         }
-        const bottomDepth = bb.minimum.y - this.target.y;
+        const bottomDepth = bb.minimum.y -
+            this.target.y +
+            (bb.maximum.y - bb.minimum.y) * this.lowestAllowedCameraHeight;
         const cameraDistance = this.radius;
         const lowestAngleUnderHorizonRad = Math.asin(bottomDepth / cameraDistance);
         return lowestAngleUnderHorizonRad;

package/dist/engine/EngineCreator.js

@@ -4,7 +4,7 @@ export function getDefaultEngine(canvas, width, height) {
     // see WEB-8493 for additional details. It should be safe to apply to all browsers.
     //
     // TODO: Remove this workaround when upgrading to Babylon.js 5.0
-    const engine = new Engine(canvas, true, { xrCompatible: false }, true);
+    const engine = new Engine(canvas, true, { xrCompatible: false, preserveDrawingBuffer: true }, true);
     engine.setSize(Math.floor(width), Math.floor(height));
     return engine;
 }

package/dist/view/SingleProductDefaultCameraView.js

@@ -40,6 +40,7 @@ export class SingleProductDefaultCameraView extends SingleProductView {
         this._camera.disableAutomaticSizing = cameraConf.disableAutomaticSizing === true;
         this._camera.disableZoom = cameraConf.disableZoom === true;
         this._camera.disableSubFloorCam = cameraConf.disableSubFloorCam === true;
+        this._camera.lowestAllowedCameraHeight = cameraConf.lowestAllowedCameraHeight;
         this._cameraConf = cameraConf;
         this.resetCamera();
         const { autoRotate } = cameraConf;

package/dist/view/SingleProductDefaultCameraViewConfiguration.d.ts

@@ -5,6 +5,7 @@ import { SingleProductViewConfiguration, SingleProductViewEventMap } from "./Sin
  * @param disableZoom Don't let the camera dolly in and out. Zoom is stricly speaking not correct, we only dolly the camera.
  * @param disableAutomaticSizing Turn off automatic adaption of camera distance and light rig size.
  * @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.
@@ -20,6 +21,7 @@ export interface SingleProductDefaultCameraViewConfiguration extends SingleProdu
         disableZoom?: boolean;
         disableAutomaticSizing?: boolean;
         disableSubFloorCam?: boolean;
+        lowestAllowedCameraHeight?: number;
         autoRotate?: {
             idleRotationSpeed?: number;
             idleRotationSpinupTime?: number;

package/package.json

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