@babylonjs/core 6.24.0 → 6.25.0

package/Cameras/camera.d.ts

@@ -13,6 +13,14 @@ import type { PostProcess } from "../PostProcesses/postProcess";
 import type { RenderTargetTexture } from "../Materials/Textures/renderTargetTexture";
 import type { FreeCamera } from "./freeCamera";
 import type { Ray } from "../Culling/ray";
+interface IObliqueParams {
+    /** The angle of the plane */
+    angle: number;
+    /** The length of the plane */
+    length: number;
+    /** The offset of the plane */
+    offset: number;
+}
 /**
  * This is the base class of all the camera used in the application.
  * @see https://doc.babylonjs.com/features/featuresDeepDive/cameras
@@ -72,10 +80,6 @@ export declare class Camera extends Node {
      * Defines that both eyes of the camera should be renderered in a VR mode (carbox).
      */
     static readonly RIG_MODE_VR = 20;
-    /**
-     * Defines that both eyes of the camera should be renderered in a VR mode (webVR).
-     */
-    static readonly RIG_MODE_WEBVR = 21;
     /**
      * Custom rig mode allowing rig cameras to be populated manually with any number of cameras
      */
@@ -102,6 +106,10 @@ export declare class Camera extends Node {
      */
     set upVector(vec: Vector3);
     get upVector(): Vector3;
+    /**
+     * Object containing oblique projection values (only used with ORTHOGRAPHIC_CAMERA)
+     */
+    oblique: Nullable<IObliqueParams>;
     /**
      * The screen area in scene units squared
      */
@@ -249,7 +257,6 @@ export declare class Camera extends Node {
     _rigCameras: Camera[];
     /** @internal */
     _rigPostProcess: Nullable<PostProcess>;
-    protected _webvrViewMatrix: Matrix;
     /** @internal */
     _skipRendering: boolean;
     /** @internal */
@@ -429,12 +436,13 @@ export declare class Camera extends Node {
      * @returns a Matrix
      */
     getTransformationMatrix(): Matrix;
+    private _computeObliqueDistance;
     private _updateFrustumPlanes;
     /**
      * Checks if a cullable object (mesh...) is in the camera frustum
      * This checks the bounding box center. See isCompletelyInFrustum for a full bounding check
      * @param target The object to check
-     * @param checkRigCameras If the rig cameras should be checked (eg. with webVR camera both eyes should be checked) (Default: false)
+     * @param checkRigCameras If the rig cameras should be checked (eg. with VR camera both eyes should be checked) (Default: false)
      * @returns true if the object is in frustum otherwise false
      */
     isInFrustum(target: ICullable, checkRigCameras?: boolean): boolean;
@@ -505,20 +513,6 @@ export declare class Camera extends Node {
     protected _setRigMode(rigParams: any): void;
     /** @internal */
     _getVRProjectionMatrix(): Matrix;
-    protected _updateCameraRotationMatrix(): void;
-    protected _updateWebVRCameraRotationMatrix(): void;
-    /**
-     * This function MUST be overwritten by the different WebVR cameras available.
-     * The context in which it is running is the RIG camera. So 'this' is the TargetCamera, left or right.
-     * @internal
-     */
-    _getWebVRProjectionMatrix(): Matrix;
-    /**
-     * This function MUST be overwritten by the different WebVR cameras available.
-     * The context in which it is running is the RIG camera. So 'this' is the TargetCamera, left or right.
-     * @internal
-     */
-    _getWebVRViewMatrix(): Matrix;
     /**
      * @internal
      */
@@ -588,3 +582,4 @@ export declare class Camera extends Node {
     /** @internal */
     _calculateHandednessMultiplier(): number;
 }
+export {};

package/Cameras/camera.js

@@ -120,6 +120,10 @@ export class Camera extends Node {
         /** @internal */
         this._position = Vector3.Zero();
         this._upVector = Vector3.Up();
+        /**
+         * Object containing oblique projection values (only used with ORTHOGRAPHIC_CAMERA)
+         */
+        this.oblique = null;
         /**
          * Define the current limit on the left side for an orthographic camera
          * In scene unit
@@ -232,7 +236,6 @@ export class Camera extends Node {
         this.isRigCamera = false;
         /** @internal */
         this._rigCameras = new Array();
-        this._webvrViewMatrix = Matrix.Identity();
         /** @internal */
         this._skipRendering = false;
         /** @internal */
@@ -371,6 +374,9 @@ export class Camera extends Node {
         this._cache.orthoRight = undefined;
         this._cache.orthoBottom = undefined;
         this._cache.orthoTop = undefined;
+        this._cache.obliqueAngle = undefined;
+        this._cache.obliqueLength = undefined;
+        this._cache.obliqueOffset = undefined;
         this._cache.renderWidth = undefined;
         this._cache.renderHeight = undefined;
     }
@@ -397,28 +403,35 @@ export class Camera extends Node {
     }
     /** @internal */
     _isSynchronizedProjectionMatrix() {
-        let check = this._cache.mode === this.mode && this._cache.minZ === this.minZ && this._cache.maxZ === this.maxZ;
-        if (!check) {
+        let isSynchronized = this._cache.mode === this.mode && this._cache.minZ === this.minZ && this._cache.maxZ === this.maxZ;
+        if (!isSynchronized) {
             return false;
         }
         const engine = this.getEngine();
         if (this.mode === Camera.PERSPECTIVE_CAMERA) {
-            check =
+            isSynchronized =
                 this._cache.fov === this.fov &&
                     this._cache.fovMode === this.fovMode &&
                     this._cache.aspectRatio === engine.getAspectRatio(this) &&
                     this._cache.projectionPlaneTilt === this.projectionPlaneTilt;
         }
         else {
-            check =
+            isSynchronized =
                 this._cache.orthoLeft === this.orthoLeft &&
                     this._cache.orthoRight === this.orthoRight &&
                     this._cache.orthoBottom === this.orthoBottom &&
                     this._cache.orthoTop === this.orthoTop &&
                     this._cache.renderWidth === engine.getRenderWidth() &&
                     this._cache.renderHeight === engine.getRenderHeight();
+            if (this.oblique) {
+                isSynchronized =
+                    isSynchronized &&
+                        this._cache.obliqueAngle === this.oblique.angle &&
+                        this._cache.obliqueLength === this.oblique.length &&
+                        this._cache.obliqueOffset === this.oblique.offset;
+            }
         }
-        return check;
+        return isSynchronized;
     }
     /**
      * Attach the input controls to a specific dom element to get the input from.
@@ -606,7 +619,7 @@ export class Camera extends Node {
      * @returns the projection matrix
      */
     getProjectionMatrix(force) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         if (this._doNotComputeProjectionMatrix || (!force && this._isSynchronizedProjectionMatrix())) {
             return this._projectionMatrix;
         }
@@ -640,15 +653,28 @@ export class Camera extends Node {
             const halfWidth = engine.getRenderWidth() / 2.0;
             const halfHeight = engine.getRenderHeight() / 2.0;
             if (scene.useRightHandedSystem) {
-                Matrix.OrthoOffCenterRHToRef((_a = this.orthoLeft) !== null && _a !== void 0 ? _a : -halfWidth, (_b = this.orthoRight) !== null && _b !== void 0 ? _b : halfWidth, (_c = this.orthoBottom) !== null && _c !== void 0 ? _c : -halfHeight, (_d = this.orthoTop) !== null && _d !== void 0 ? _d : halfHeight, reverseDepth ? this.maxZ : this.minZ, reverseDepth ? this.minZ : this.maxZ, this._projectionMatrix, engine.isNDCHalfZRange);
+                if (this.oblique) {
+                    Matrix.ObliqueOffCenterRHToRef((_a = this.orthoLeft) !== null && _a !== void 0 ? _a : -halfWidth, (_b = this.orthoRight) !== null && _b !== void 0 ? _b : halfWidth, (_c = this.orthoBottom) !== null && _c !== void 0 ? _c : -halfHeight, (_d = this.orthoTop) !== null && _d !== void 0 ? _d : halfHeight, reverseDepth ? this.maxZ : this.minZ, reverseDepth ? this.minZ : this.maxZ, this.oblique.length, this.oblique.angle, this._computeObliqueDistance(this.oblique.offset), this._projectionMatrix, engine.isNDCHalfZRange);
+                }
+                else {
+                    Matrix.OrthoOffCenterRHToRef((_e = this.orthoLeft) !== null && _e !== void 0 ? _e : -halfWidth, (_f = this.orthoRight) !== null && _f !== void 0 ? _f : halfWidth, (_g = this.orthoBottom) !== null && _g !== void 0 ? _g : -halfHeight, (_h = this.orthoTop) !== null && _h !== void 0 ? _h : halfHeight, reverseDepth ? this.maxZ : this.minZ, reverseDepth ? this.minZ : this.maxZ, this._projectionMatrix, engine.isNDCHalfZRange);
+                }
             }
             else {
-                Matrix.OrthoOffCenterLHToRef((_e = this.orthoLeft) !== null && _e !== void 0 ? _e : -halfWidth, (_f = this.orthoRight) !== null && _f !== void 0 ? _f : halfWidth, (_g = this.orthoBottom) !== null && _g !== void 0 ? _g : -halfHeight, (_h = this.orthoTop) !== null && _h !== void 0 ? _h : halfHeight, reverseDepth ? this.maxZ : this.minZ, reverseDepth ? this.minZ : this.maxZ, this._projectionMatrix, engine.isNDCHalfZRange);
+                if (this.oblique) {
+                    Matrix.ObliqueOffCenterLHToRef((_j = this.orthoLeft) !== null && _j !== void 0 ? _j : -halfWidth, (_k = this.orthoRight) !== null && _k !== void 0 ? _k : halfWidth, (_l = this.orthoBottom) !== null && _l !== void 0 ? _l : -halfHeight, (_m = this.orthoTop) !== null && _m !== void 0 ? _m : halfHeight, reverseDepth ? this.maxZ : this.minZ, reverseDepth ? this.minZ : this.maxZ, this.oblique.length, this.oblique.angle, this._computeObliqueDistance(this.oblique.offset), this._projectionMatrix, engine.isNDCHalfZRange);
+                }
+                else {
+                    Matrix.OrthoOffCenterLHToRef((_o = this.orthoLeft) !== null && _o !== void 0 ? _o : -halfWidth, (_p = this.orthoRight) !== null && _p !== void 0 ? _p : halfWidth, (_q = this.orthoBottom) !== null && _q !== void 0 ? _q : -halfHeight, (_r = this.orthoTop) !== null && _r !== void 0 ? _r : halfHeight, reverseDepth ? this.maxZ : this.minZ, reverseDepth ? this.minZ : this.maxZ, this._projectionMatrix, engine.isNDCHalfZRange);
+                }
             }
             this._cache.orthoLeft = this.orthoLeft;
             this._cache.orthoRight = this.orthoRight;
             this._cache.orthoBottom = this.orthoBottom;
             this._cache.orthoTop = this.orthoTop;
+            this._cache.obliqueAngle = (_s = this.oblique) === null || _s === void 0 ? void 0 : _s.angle;
+            this._cache.obliqueLength = (_t = this.oblique) === null || _t === void 0 ? void 0 : _t.length;
+            this._cache.obliqueOffset = (_u = this.oblique) === null || _u === void 0 ? void 0 : _u.offset;
             this._cache.renderWidth = engine.getRenderWidth();
             this._cache.renderHeight = engine.getRenderHeight();
         }
@@ -663,6 +689,11 @@ export class Camera extends Node {
         this._computedViewMatrix.multiplyToRef(this._projectionMatrix, this._transformMatrix);
         return this._transformMatrix;
     }
+    _computeObliqueDistance(offset) {
+        const arcRotateCamera = this;
+        const targetCamera = this;
+        return (arcRotateCamera.radius || (targetCamera.target ? Vector3.Distance(this.position, targetCamera.target) : this.position.length())) + offset;
+    }
     _updateFrustumPlanes() {
         if (!this._refreshFrustumPlanes) {
             return;
@@ -680,7 +711,7 @@ export class Camera extends Node {
      * Checks if a cullable object (mesh...) is in the camera frustum
      * This checks the bounding box center. See isCompletelyInFrustum for a full bounding check
      * @param target The object to check
-     * @param checkRigCameras If the rig cameras should be checked (eg. with webVR camera both eyes should be checked) (Default: false)
+     * @param checkRigCameras If the rig cameras should be checked (eg. with VR camera both eyes should be checked) (Default: false)
      * @returns true if the object is in frustum otherwise false
      */
     isInFrustum(target, checkRigCameras = false) {
@@ -890,28 +921,6 @@ export class Camera extends Node {
         this._cameraRigParams.vrWorkMatrix.multiplyToRef(this._cameraRigParams.vrHMatrix, this._projectionMatrix);
         return this._projectionMatrix;
     }
-    _updateCameraRotationMatrix() {
-        //Here for WebVR
-    }
-    _updateWebVRCameraRotationMatrix() {
-        //Here for WebVR
-    }
-    /**
-     * This function MUST be overwritten by the different WebVR cameras available.
-     * The context in which it is running is the RIG camera. So 'this' is the TargetCamera, left or right.
-     * @internal
-     */
-    _getWebVRProjectionMatrix() {
-        return Matrix.Identity();
-    }
-    /**
-     * This function MUST be overwritten by the different WebVR cameras available.
-     * The context in which it is running is the RIG camera. So 'this' is the TargetCamera, left or right.
-     * @internal
-     */
-    _getWebVRViewMatrix() {
-        return Matrix.Identity();
-    }
     /**
      * @internal
      */
@@ -1168,10 +1177,6 @@ Camera.RIG_MODE_STEREOSCOPIC_INTERLACED = 14;
  * Defines that both eyes of the camera should be renderered in a VR mode (carbox).
  */
 Camera.RIG_MODE_VR = 20;
-/**
- * Defines that both eyes of the camera should be renderered in a VR mode (webVR).
- */
-Camera.RIG_MODE_WEBVR = 21;
 /**
  * Custom rig mode allowing rig cameras to be populated manually with any number of cameras
  */