@vived/app 2.9.1 → 2.10.0

package/lib/Entities/FocusCamera.d.ts

@@ -0,0 +1,70 @@
+import { Vector3 } from ".";
+export declare type OnFocusCameraChange = () => void;
+export interface FocusCameraLerper {
+    cancelLerp: () => void;
+}
+export interface FocusCameraData {
+    defaultAlpha?: number;
+    defaultBeta?: number;
+    defaultRadius?: number;
+    defaultTarget?: {
+        x: number;
+        y: number;
+        z: number;
+    };
+    nearClip?: number;
+    farClip?: number;
+    alphaLimit?: {
+        min: number;
+        max: number;
+    };
+    betaLimit?: {
+        min: number;
+        max: number;
+    };
+    radiusLimit?: {
+        min: number;
+        max: number;
+    };
+    targetLimit?: {
+        min: {
+            x: number;
+            y: number;
+            z: number;
+        };
+        max: {
+            x: number;
+            y: number;
+            z: number;
+        };
+    };
+}
+export interface FocusCamera {
+    alpha: number;
+    beta: number;
+    radius: number;
+    target: Vector3;
+    direction: Vector3;
+    cameraPosition: Vector3;
+    nearClip: number;
+    farClip: number;
+    defaultAlpha: number;
+    defaultBeta: number;
+    defaultRadius: number;
+    defaultTarget: Vector3;
+    setAlphaLimits: (min: number, max: number) => void;
+    clearAlphaLimits: () => void;
+    setBetaLimits: (min: number, max: number) => void;
+    clearBetaLimits: () => void;
+    setRadiusLimits: (min: number, max: number) => void;
+    clearRadiusLimits: () => void;
+    setTargetLimits: (min: Vector3, max: Vector3) => void;
+    clearTargetLimits: () => void;
+    registerLerp: (lerper: FocusCameraLerper) => void;
+    lerpCompleted: () => void;
+    cancelLerp: () => void;
+    applyData: (data: FocusCameraData) => void;
+    addObserver: (observer: OnFocusCameraChange) => void;
+    removeObserver: (observer: OnFocusCameraChange) => void;
+}
+export declare function makeFocusCamera(): FocusCamera;

package/lib/Entities/FocusCamera.js

@@ -0,0 +1,243 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeFocusCamera = void 0;
+const _1 = require(".");
+function makeFocusCamera() {
+    return new FocusCameraImp();
+}
+exports.makeFocusCamera = makeFocusCamera;
+class FocusCameraImp {
+    constructor() {
+        this.farClip = 100;
+        this.nearClip = 0.01;
+        this.defaultAlpha = 0;
+        this.defaultBeta = 30;
+        this.defaultRadius = 8;
+        this.defaultTarget = _1.Vector3.Zero();
+        this.limitRadius = false;
+        this.minRadius = 0;
+        this.maxRadius = 0;
+        this.limitAlpha = false;
+        this.minAlpha = 0;
+        this.maxAlpha = 0;
+        this.limitBeta = false;
+        this.minBeta = 0;
+        this.maxBeta = 0;
+        this.limitTarget = false;
+        this.maxTargetPosition = _1.Vector3.Zero();
+        this.minTargetPosition = _1.Vector3.Zero();
+        this.observers = new _1.ObserverList();
+        this.memoizedAlpha = new _1.MemoizedNumber(0, this.observers.notify);
+        this.memoizedBeta = new _1.MemoizedNumber(0, this.observers.notify);
+        this.memoizedRadius = new _1.MemoizedNumber(1, this.observers.notify);
+        this.memoizedTarget = new _1.MemoizedVector3(_1.Vector3.Zero(), this.observers.notify);
+        this.setRadiusLimits = (min, max) => {
+            if (min < 0) {
+                throw new Error("[Orbit Camera] Mininum Radius must be greater >= 0");
+            }
+            if (max < min) {
+                throw new Error("[Orbit Camera] Max radius must be >= min radius");
+            }
+            this.maxRadius = max;
+            this.minRadius = min;
+            this.limitRadius = true;
+            this.radius = this.radius;
+        };
+        this.clearRadiusLimits = () => {
+            this.maxRadius = 0;
+            this.minRadius = 0;
+            this.limitRadius = false;
+        };
+        this.setAlphaLimits = (min, max) => {
+            if (min > max) {
+                throw new Error("[Orbit Camera] Max alpha must be >= min alpha");
+            }
+            if (min < -180) {
+                throw new Error("[Orbit Camera] Min alpha must be >= -180");
+            }
+            if (max > 180) {
+                throw new Error("[Orbit Camera] Max alpha must be <= 180");
+            }
+            this.maxAlpha = max;
+            this.minAlpha = min;
+            this.limitAlpha = true;
+            this.alpha = this.alpha;
+        };
+        this.clearAlphaLimits = () => {
+            this.maxAlpha = 0;
+            this.minAlpha = 0;
+            this.limitAlpha = false;
+        };
+        this.setBetaLimits = (min, max) => {
+            if (min > max) {
+                throw new Error("[Orbit Camera] Max beta must be >= min beta");
+            }
+            if (min < -180) {
+                throw new Error("[Orbit Camera] Min beta must be >= -180");
+            }
+            if (max > 180) {
+                throw new Error("[Orbit Camera] Max beta must be <= 180");
+            }
+            this.maxBeta = max;
+            this.minBeta = min;
+            this.limitBeta = true;
+            this.beta = this.beta;
+        };
+        this.clearBetaLimits = () => {
+            this.maxBeta = 0;
+            this.minBeta = 0;
+            this.limitBeta = false;
+        };
+        this.setTargetLimits = (min, max) => {
+            const minArray = min.asArray();
+            const maxArray = max.asArray();
+            for (let i = 0; i < 3; i++) {
+                if (minArray[i] > maxArray[i]) {
+                    throw new Error("[Orbit Camera] Min target must be less than the max target");
+                }
+            }
+            this.maxTargetPosition = max;
+            this.minTargetPosition = min;
+            this.limitTarget = true;
+            this.target = this.target;
+        };
+        this.clearTargetLimits = () => {
+            this.maxTargetPosition = _1.Vector3.Zero();
+            this.minTargetPosition = _1.Vector3.Zero();
+            this.limitTarget = false;
+        };
+        this.registerLerp = (lerper) => {
+            if (this.currentLerp) {
+                this.currentLerp.cancelLerp();
+            }
+            this.currentLerp = lerper;
+        };
+        this.lerpCompleted = () => {
+            this.currentLerp = undefined;
+        };
+        this.cancelLerp = () => {
+            var _a;
+            (_a = this.currentLerp) === null || _a === void 0 ? void 0 : _a.cancelLerp();
+            this.currentLerp = undefined;
+        };
+        this.applyData = (data) => {
+            if (data.defaultAlpha !== undefined) {
+                this.defaultAlpha = data.defaultAlpha;
+            }
+            if (data.defaultBeta !== undefined) {
+                this.defaultBeta = data.defaultBeta;
+            }
+            if (data.defaultRadius !== undefined) {
+                this.defaultRadius = data.defaultRadius;
+            }
+            if (data.defaultTarget !== undefined) {
+                const { x, y, z } = data.defaultTarget;
+                this.defaultTarget = new _1.Vector3(x, y, z);
+            }
+            if (data.nearClip !== undefined) {
+                this.nearClip = data.nearClip;
+            }
+            if (data.farClip !== undefined) {
+                this.farClip = data.farClip;
+            }
+            if (data.alphaLimit !== undefined) {
+                this.setAlphaLimits(data.alphaLimit.min, data.alphaLimit.max);
+            }
+            if (data.betaLimit !== undefined) {
+                this.setBetaLimits(data.betaLimit.min, data.betaLimit.max);
+            }
+            if (data.radiusLimit !== undefined) {
+                this.setRadiusLimits(data.radiusLimit.min, data.radiusLimit.max);
+            }
+            if (data.targetLimit !== undefined) {
+                const { max, min } = data.targetLimit;
+                this.setTargetLimits(new _1.Vector3(min.x, min.y, min.z), new _1.Vector3(max.x, max.y, max.z));
+            }
+        };
+        this.addObserver = (observer) => {
+            this.observers.add(observer);
+        };
+        this.removeObserver = (observer) => {
+            this.observers.remove(observer);
+        };
+    }
+    get alpha() {
+        return this.memoizedAlpha.val;
+    }
+    set alpha(val) {
+        let clampedVal = this.clampAngle(val);
+        if (this.limitAlpha) {
+            clampedVal = Math.min(clampedVal, this.maxAlpha);
+            clampedVal = Math.max(clampedVal, this.minAlpha);
+        }
+        this.memoizedAlpha.val = clampedVal;
+    }
+    get beta() {
+        return this.memoizedBeta.val;
+    }
+    set beta(val) {
+        let clampedVal = this.clampAngle(val);
+        if (this.limitBeta) {
+            clampedVal = Math.min(clampedVal, this.maxBeta);
+            clampedVal = Math.max(clampedVal, this.minBeta);
+        }
+        this.memoizedBeta.val = clampedVal;
+    }
+    get radius() {
+        return this.memoizedRadius.val;
+    }
+    set radius(val) {
+        let clampedVal = Math.max(val, 0);
+        if (this.limitRadius) {
+            clampedVal = Math.min(clampedVal, this.maxRadius);
+            clampedVal = Math.max(clampedVal, this.minRadius);
+        }
+        this.memoizedRadius.val = clampedVal;
+    }
+    get target() {
+        return this.memoizedTarget.getVector();
+    }
+    set target(val) {
+        const targetVals = val.asArray();
+        if (this.limitTarget) {
+            const maxVals = this.maxTargetPosition.asArray();
+            const minVals = this.minTargetPosition.asArray();
+            for (let i = 0; i < 3; i++) {
+                let v = targetVals[i];
+                v = Math.min(v, maxVals[i]);
+                v = Math.max(v, minVals[i]);
+                targetVals[i] = v;
+            }
+        }
+        this.memoizedTarget.setVector(new _1.Vector3(targetVals[0], targetVals[1], targetVals[2]));
+    }
+    get direction() {
+        const yLength = -Math.sin(this.degToRad(this.beta));
+        const horizontalLenght = Math.cos(this.degToRad(this.beta));
+        const alphaRadians = this.degToRad(this.alpha);
+        const xLength = -horizontalLenght * Math.sin(alphaRadians);
+        const zLength = horizontalLenght * Math.cos(alphaRadians);
+        return new _1.Vector3(xLength, yLength, zLength);
+    }
+    get cameraPosition() {
+        const localOffset = this.direction.copy();
+        localOffset.setLength(-this.radius);
+        return this.target.add(localOffset);
+    }
+    degToRad(degrees) {
+        return (degrees * Math.PI) / 180;
+    }
+    clampAngle(angle) {
+        const isNegative = angle < 0 ? true : false;
+        const absAngle = Math.abs(angle);
+        const revolutions = Math.floor(absAngle / 360);
+        let angleWithoutRevolutions = absAngle - revolutions * 360;
+        if (angleWithoutRevolutions > 180) {
+            angleWithoutRevolutions = angleWithoutRevolutions - 360;
+        }
+        if (isNegative) {
+            angleWithoutRevolutions *= -1;
+        }
+        return angleWithoutRevolutions;
+    }
+}

package/lib/Entities/MouseInput.js

@@ -10,6 +10,7 @@ class MouseInputImp {
     constructor() {
         this.controllers = [];
         this.maxClickMovement = 5; // pixels
+        this.isPressed = false;
         this._eventElement = undefined;
         this.setEventElement = (eventElement) => {
             if (this._eventElement)
@@ -47,6 +48,7 @@ class MouseInputImp {
                     c.onDown(e);
                 }
             });
+            this.isPressed = true;
             this.pressEvent = e;
         };
         this.onMouseUp = (e) => {
@@ -56,6 +58,7 @@ class MouseInputImp {
                     c.onUp(e);
                 }
             });
+            this.isPressed = false;
             if (!this.pressEvent)
                 return;
             const deltaX = this.pressEvent.screenX - e.screenX;
@@ -88,7 +91,7 @@ class MouseInputImp {
         };
         this.onMouseOut = (e) => {
             e.preventDefault();
-            if (!this.pressEvent)
+            if (!this.isPressed)
                 return;
             this.controllers.forEach((c) => {
                 if (c.onUp) {
@@ -96,6 +99,7 @@ class MouseInputImp {
                 }
             });
             this.pressEvent = undefined;
+            this.isPressed = false;
         };
         this.onWheel = (e) => {
             e.preventDefault();

package/lib/Entities/OrbitCamera.d.ts

@@ -3,14 +3,73 @@ export declare type OnOrbitCameraChange = () => void;
 export interface CameraLerper {
     cancelLerp: () => void;
 }
+export interface CameraData {
+    defaultAlpha?: number;
+    defaultBeta?: number;
+    defaultRadius?: number;
+    defaultTarget?: {
+        x: number;
+        y: number;
+        z: number;
+    };
+    nearClip?: number;
+    farClip?: number;
+    alphaLimit?: {
+        min: number;
+        max: number;
+    };
+    betaLimit?: {
+        min: number;
+        max: number;
+    };
+    radiusLimit?: {
+        min: number;
+        max: number;
+    };
+    targetLimit?: {
+        min: {
+            x: number;
+            y: number;
+            z: number;
+        };
+        max: {
+            x: number;
+            y: number;
+            z: number;
+        };
+    };
+    dollyRollSensitivity?: number;
+    dollyPixelSensitivity?: number;
+    orbitPixelSensitivity?: number;
+    dollyPinchSensitivity?: number;
+}
 export interface OrbitCamera {
     alpha: number;
     beta: number;
     radius: number;
     target: Vector3;
+    nearClip: number;
+    farClip: number;
+    defaultAlpha: number;
+    defaultBeta: number;
+    defaultRadius: number;
+    defaultTarget: Vector3;
+    dollyRollSensitivity: number;
+    dollyPixelSensitivity: number;
+    dollyPinchSensitivity: number;
+    orbitPixelSensitivity: number;
+    setAlphaLimits: (min: number, max: number) => void;
+    clearAlphaLimits: () => void;
+    setBetaLimits: (min: number, max: number) => void;
+    clearBetaLimits: () => void;
+    setRadiusLimits: (min: number, max: number) => void;
+    clearRadiusLimits: () => void;
+    setTargetLimits: (min: Vector3, max: Vector3) => void;
+    clearTargetLimits: () => void;
     registerLerp: (lerper: CameraLerper) => void;
     lerpCompleted: () => void;
     cancelLerp: () => void;
+    applyData: (data: CameraData) => void;
     addObserver: (observer: OnOrbitCameraChange) => void;
     removeObserver: (observer: OnOrbitCameraChange) => void;
 }

package/lib/Entities/OrbitCamera.js

@@ -8,11 +8,108 @@ function makeOrbitCamera() {
 exports.makeOrbitCamera = makeOrbitCamera;
 class OrbitCameraImp {
     constructor() {
+        this.farClip = 100;
+        this.nearClip = 0.01;
+        this.defaultAlpha = 0;
+        this.defaultBeta = 30;
+        this.defaultRadius = 8;
+        this.defaultTarget = _1.Vector3.Zero();
+        this.orbitPixelSensitivity = 0.5;
+        this.dollyPixelSensitivity = 0.01;
+        this.dollyRollSensitivity = 0.001;
+        this.dollyPinchSensitivity = 0.005;
+        this.limitRadius = false;
+        this.minRadius = 0;
+        this.maxRadius = 0;
+        this.limitAlpha = false;
+        this.minAlpha = 0;
+        this.maxAlpha = 0;
+        this.limitBeta = false;
+        this.minBeta = 0;
+        this.maxBeta = 0;
+        this.limitTarget = false;
+        this.maxTargetPosition = _1.Vector3.Zero();
+        this.minTargetPosition = _1.Vector3.Zero();
         this.observers = new _1.ObserverList();
         this.memoizedAlpha = new _1.MemoizedNumber(0, this.observers.notify);
         this.memoizedBeta = new _1.MemoizedNumber(0, this.observers.notify);
         this.memoizedRadius = new _1.MemoizedNumber(1, this.observers.notify);
         this.memoizedTarget = new _1.MemoizedVector3(_1.Vector3.Zero(), this.observers.notify);
+        this.setRadiusLimits = (min, max) => {
+            if (min < 0) {
+                throw new Error("[Orbit Camera] Mininum Radius must be greater >= 0");
+            }
+            if (max < min) {
+                throw new Error("[Orbit Camera] Max radius must be >= min radius");
+            }
+            this.maxRadius = max;
+            this.minRadius = min;
+            this.limitRadius = true;
+            this.radius = this.radius;
+        };
+        this.clearRadiusLimits = () => {
+            this.maxRadius = 0;
+            this.minRadius = 0;
+            this.limitRadius = false;
+        };
+        this.setAlphaLimits = (min, max) => {
+            if (min > max) {
+                throw new Error("[Orbit Camera] Max alpha must be >= min alpha");
+            }
+            if (min < -180) {
+                throw new Error("[Orbit Camera] Min alpha must be >= -180");
+            }
+            if (max > 180) {
+                throw new Error("[Orbit Camera] Max alpha must be <= 180");
+            }
+            this.maxAlpha = max;
+            this.minAlpha = min;
+            this.limitAlpha = true;
+            this.alpha = this.alpha;
+        };
+        this.clearAlphaLimits = () => {
+            this.maxAlpha = 0;
+            this.minAlpha = 0;
+            this.limitAlpha = false;
+        };
+        this.setBetaLimits = (min, max) => {
+            if (min > max) {
+                throw new Error("[Orbit Camera] Max beta must be >= min beta");
+            }
+            if (min < -180) {
+                throw new Error("[Orbit Camera] Min beta must be >= -180");
+            }
+            if (max > 180) {
+                throw new Error("[Orbit Camera] Max beta must be <= 180");
+            }
+            this.maxBeta = max;
+            this.minBeta = min;
+            this.limitBeta = true;
+            this.beta = this.beta;
+        };
+        this.clearBetaLimits = () => {
+            this.maxBeta = 0;
+            this.minBeta = 0;
+            this.limitBeta = false;
+        };
+        this.setTargetLimits = (min, max) => {
+            const minArray = min.asArray();
+            const maxArray = max.asArray();
+            for (let i = 0; i < 3; i++) {
+                if (minArray[i] > maxArray[i]) {
+                    throw new Error("[Orbit Camera] Min target must be less than the max target");
+                }
+            }
+            this.maxTargetPosition = max;
+            this.minTargetPosition = min;
+            this.limitTarget = true;
+            this.target = this.target;
+        };
+        this.clearTargetLimits = () => {
+            this.maxTargetPosition = _1.Vector3.Zero();
+            this.minTargetPosition = _1.Vector3.Zero();
+            this.limitTarget = false;
+        };
         this.registerLerp = (lerper) => {
             if (this.currentLerp) {
                 this.currentLerp.cancelLerp();
@@ -27,6 +124,52 @@ class OrbitCameraImp {
             (_a = this.currentLerp) === null || _a === void 0 ? void 0 : _a.cancelLerp();
             this.currentLerp = undefined;
         };
+        this.applyData = (data) => {
+            if (data.defaultAlpha !== undefined) {
+                this.defaultAlpha = data.defaultAlpha;
+            }
+            if (data.defaultBeta !== undefined) {
+                this.defaultBeta = data.defaultBeta;
+            }
+            if (data.defaultRadius !== undefined) {
+                this.defaultRadius = data.defaultRadius;
+            }
+            if (data.defaultTarget !== undefined) {
+                const { x, y, z } = data.defaultTarget;
+                this.defaultTarget = new _1.Vector3(x, y, z);
+            }
+            if (data.nearClip !== undefined) {
+                this.nearClip = data.nearClip;
+            }
+            if (data.farClip !== undefined) {
+                this.farClip = data.farClip;
+            }
+            if (data.alphaLimit !== undefined) {
+                this.setAlphaLimits(data.alphaLimit.min, data.alphaLimit.max);
+            }
+            if (data.betaLimit !== undefined) {
+                this.setBetaLimits(data.betaLimit.min, data.betaLimit.max);
+            }
+            if (data.radiusLimit !== undefined) {
+                this.setRadiusLimits(data.radiusLimit.min, data.radiusLimit.max);
+            }
+            if (data.targetLimit !== undefined) {
+                const { max, min } = data.targetLimit;
+                this.setTargetLimits(new _1.Vector3(min.x, min.y, min.z), new _1.Vector3(max.x, max.y, max.z));
+            }
+            if (data.dollyRollSensitivity !== undefined) {
+                this.dollyRollSensitivity = data.dollyRollSensitivity;
+            }
+            if (data.dollyPixelSensitivity !== undefined) {
+                this.dollyPixelSensitivity = data.dollyPixelSensitivity;
+            }
+            if (data.dollyPinchSensitivity !== undefined) {
+                this.dollyPinchSensitivity = data.dollyPinchSensitivity;
+            }
+            if (data.orbitPixelSensitivity !== undefined) {
+                this.orbitPixelSensitivity = data.orbitPixelSensitivity;
+            }
+        };
         this.addObserver = (observer) => {
             this.observers.add(observer);
         };
@@ -38,25 +181,51 @@ class OrbitCameraImp {
         return this.memoizedAlpha.val;
     }
     set alpha(val) {
-        this.memoizedAlpha.val = this.clampAngle(val);
+        let clampedVal = this.clampAngle(val);
+        if (this.limitAlpha) {
+            clampedVal = Math.min(clampedVal, this.maxAlpha);
+            clampedVal = Math.max(clampedVal, this.minAlpha);
+        }
+        this.memoizedAlpha.val = clampedVal;
     }
     get beta() {
         return this.memoizedBeta.val;
     }
     set beta(val) {
-        this.memoizedBeta.val = this.clampAngle(val);
+        let clampedVal = this.clampAngle(val);
+        if (this.limitBeta) {
+            clampedVal = Math.min(clampedVal, this.maxBeta);
+            clampedVal = Math.max(clampedVal, this.minBeta);
+        }
+        this.memoizedBeta.val = clampedVal;
     }
     get radius() {
         return this.memoizedRadius.val;
     }
     set radius(val) {
-        this.memoizedRadius.val = val < 0 ? 0 : val;
+        let clampedVal = Math.max(val, 0);
+        if (this.limitRadius) {
+            clampedVal = Math.min(clampedVal, this.maxRadius);
+            clampedVal = Math.max(clampedVal, this.minRadius);
+        }
+        this.memoizedRadius.val = clampedVal;
     }
     get target() {
         return this.memoizedTarget.getVector();
     }
     set target(val) {
-        this.memoizedTarget.setVector(val);
+        const targetVals = val.asArray();
+        if (this.limitTarget) {
+            const maxVals = this.maxTargetPosition.asArray();
+            const minVals = this.minTargetPosition.asArray();
+            for (let i = 0; i < 3; i++) {
+                let v = targetVals[i];
+                v = Math.min(v, maxVals[i]);
+                v = Math.max(v, minVals[i]);
+                targetVals[i] = v;
+            }
+        }
+        this.memoizedTarget.setVector(new _1.Vector3(targetVals[0], targetVals[1], targetVals[2]));
     }
     clampAngle(angle) {
         const isNegative = angle < 0 ? true : false;

package/lib/Entities/index.d.ts

@@ -10,7 +10,7 @@ export * from "./MemoizedString";
 export * from "./MemoizedVector2";
 export * from "./MemoizedVector3";
 export * from "./ObserverList";
-export * from "./OrbitCamera";
+export * from "./FocusCamera";
 export * from "./ParametricLine";
 export * from "./ParametricPlane";
 export * from "./StateMachine";

package/lib/Entities/index.js

@@ -22,7 +22,7 @@ __exportStar(require("./MemoizedString"), exports);
 __exportStar(require("./MemoizedVector2"), exports);
 __exportStar(require("./MemoizedVector3"), exports);
 __exportStar(require("./ObserverList"), exports);
-__exportStar(require("./OrbitCamera"), exports);
+__exportStar(require("./FocusCamera"), exports);
 __exportStar(require("./ParametricLine"), exports);
 __exportStar(require("./ParametricPlane"), exports);
 __exportStar(require("./StateMachine"), exports);

package/lib/Interface/Controllers/makeAppHandler.d.ts

@@ -9,4 +9,4 @@ export interface AppHandlerFunctions {
     setState: (finalState: string, duration?: number) => void;
     setDevicePreview: (x: number, y: number) => void;
 }
-export declare function makeAppHandler(functions: AppHandlerFunctions): Handler;
+export declare function makeAppHandler(functions: AppHandlerFunctions, verbose?: boolean): Handler;