@vived/app 2.11.0 → 2.14.0

package/lib/Entities/TouchInput.d.ts

@@ -1,9 +1,20 @@
-import { Vector2 } from ".";
+import { Vector2 } from "../ValueObjects";
+export interface TouchInputEvent {
+    touchCount: number;
+    touchCenter: Vector2;
+    touches: TouchData[];
+    event: TouchEvent;
+}
+export interface TouchData {
+    id: number;
+    position: Vector2;
+    touch?: Touch;
+}
 export interface TouchController {
-    onTouchStart?: (e: TouchEvent) => void;
-    onTouchMove?: (e: TouchEvent) => void;
-    onTouchEnd?: (e: TouchEvent) => void;
-    onTouchCancel?: (e: TouchEvent) => void;
+    onTouchStart?: (e: TouchInputEvent) => void;
+    onTouchMove?: (e: TouchInputEvent) => void;
+    onTouchEnd?: (e: TouchInputEvent) => void;
+    onTouchCancel?: (e: TouchInputEvent) => void;
 }
 export interface TouchInput {
     eventElement: HTMLElement | undefined;
@@ -11,9 +22,6 @@ export interface TouchInput {
     setEventElement: (eventElement: HTMLElement) => void;
     clearInputElement: () => void;
     updateInputElementBounds: () => void;
-    getTouchOffsetPosition: (touch: Touch) => Vector2;
-    getDistatnceBetweenTouches: (touch1: Touch, touch2: Touch) => number;
-    getTouchsCenter: (touches: TouchList) => Vector2;
     registerController: (controller: TouchController) => void;
     removeController: (controller: TouchController) => void;
 }

package/lib/Entities/TouchInput.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTouchInput = void 0;
-const _1 = require(".");
+const ValueObjects_1 = require("../ValueObjects");
 function makeTouchInput() {
     return new TouchInputImp();
 }
@@ -18,31 +18,11 @@ class TouchInputImp {
         this.getTouchOffsetPosition = (touch) => {
             if (!this.eventElementBounds) {
                 console.warn("No target bounds");
-                return _1.Vector2.Zero();
+                return ValueObjects_1.Vector2.zero();
             }
             const x = touch.clientX - this.eventElementBounds.x;
             const y = touch.clientY - this.eventElementBounds.y;
-            return new _1.Vector2(x, y);
-        };
-        this.getDistatnceBetweenTouches = (touch1, touch2) => {
-            const t1 = this.getTouchOffsetPosition(touch1);
-            const t2 = this.getTouchOffsetPosition(touch2);
-            const delta = t2.subtract(t1);
-            return delta.magnitued;
-        };
-        this.getTouchsCenter = (touches) => {
-            const touchCount = touches.length;
-            if (touchCount === 0)
-                return _1.Vector2.Zero();
-            let sumX = 0;
-            let sumY = 0;
-            for (let i = 0; i < touchCount; i++) {
-                const touch = touches[i];
-                const touchPos = this.getTouchOffsetPosition(touch);
-                sumX += touchPos.x;
-                sumY += touchPos.y;
-            }
-            return new _1.Vector2(sumX / touches.length, sumY / touches.length);
+            return new ValueObjects_1.Vector2(x, y);
         };
         this.setEventElement = (eventElement) => {
             if (this._eventElement)
@@ -56,33 +36,37 @@ class TouchInputImp {
         };
         this.onTouchStart = (e) => {
             e.preventDefault();
+            const touchInput = this.createTouchInputEvent(e);
             this.controllers.forEach((c) => {
                 if (c.onTouchStart) {
-                    c.onTouchStart(e);
+                    c.onTouchStart(touchInput);
                 }
             });
         };
         this.onTouchMove = (e) => {
             e.preventDefault();
+            const touchInput = this.createTouchInputEvent(e);
             this.controllers.forEach((c) => {
                 if (c.onTouchMove) {
-                    c.onTouchMove(e);
+                    c.onTouchMove(touchInput);
                 }
             });
         };
         this.onTouchEnd = (e) => {
             e.preventDefault();
+            const touchInput = this.createTouchInputEvent(e);
             this.controllers.forEach((c) => {
                 if (c.onTouchEnd) {
-                    c.onTouchEnd(e);
+                    c.onTouchEnd(touchInput);
                 }
             });
         };
         this.onTouchCancel = (e) => {
             e.preventDefault();
+            const touchInput = this.createTouchInputEvent(e);
             this.controllers.forEach((c) => {
                 if (c.onTouchCancel) {
-                    c.onTouchCancel(e);
+                    c.onTouchCancel(touchInput);
                 }
             });
         };
@@ -108,4 +92,49 @@ class TouchInputImp {
     get eventElement() {
         return this._eventElement;
     }
+    createTouchInputEvent(event) {
+        const touches = [];
+        const touchCount = event.touches.length;
+        let minX = 0;
+        let maxX = 0;
+        let minY = 0;
+        let maxY = 0;
+        for (let i = 0; i < touchCount; i++) {
+            const touch = event.touches[i];
+            const position = this.getTouchOffsetPosition(touch);
+            touches.push({
+                id: touch.identifier,
+                touch,
+                position,
+            });
+            if (i === 0) {
+                minX = position.x;
+                maxX = position.x;
+                minY = position.y;
+                maxY = position.y;
+            }
+            else {
+                minX = Math.min(minX, position.x);
+                maxX = Math.max(maxX, position.x);
+                minY = Math.min(minY, position.y);
+                maxY = Math.max(maxY, position.y);
+            }
+        }
+        let cntX = 0;
+        let cntY = 0;
+        if (touchCount === 1) {
+            cntX = maxX;
+            cntY = maxY;
+        }
+        else {
+            cntX = minX + (maxX - minX) / 2;
+            cntY = minY + (maxY - minY) / 2;
+        }
+        return {
+            touchCenter: new ValueObjects_1.Vector2(cntX, cntY),
+            touchCount,
+            touches,
+            event,
+        };
+    }
 }

package/lib/Entities/index.d.ts

@@ -1,9 +1,7 @@
 export * from "./Babylon";
 export * from "./BaseApp";
-export * from "./Color";
 export * from "./DevicePreview";
 export * from "./KeyboardInput";
-export * from "./LineSegment2D";
 export * from "./MemoizedBoolean";
 export * from "./MemoizedNumber";
 export * from "./MemoizedString";
@@ -11,11 +9,7 @@ export * from "./MemoizedVector2";
 export * from "./MemoizedVector3";
 export * from "./ObserverList";
 export * from "./FocusCamera";
-export * from "./ParametricLine";
-export * from "./ParametricPlane";
 export * from "./StateMachine";
 export * from "./UndoRedo";
-export * from "./Vector2";
-export * from "./Vector3";
 export * from "./MouseInput";
 export * from "./TouchInput";

package/lib/Entities/index.js

@@ -12,10 +12,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Babylon"), exports);
 __exportStar(require("./BaseApp"), exports);
-__exportStar(require("./Color"), exports);
 __exportStar(require("./DevicePreview"), exports);
 __exportStar(require("./KeyboardInput"), exports);
-__exportStar(require("./LineSegment2D"), exports);
 __exportStar(require("./MemoizedBoolean"), exports);
 __exportStar(require("./MemoizedNumber"), exports);
 __exportStar(require("./MemoizedString"), exports);
@@ -23,11 +21,7 @@ __exportStar(require("./MemoizedVector2"), exports);
 __exportStar(require("./MemoizedVector3"), exports);
 __exportStar(require("./ObserverList"), exports);
 __exportStar(require("./FocusCamera"), exports);
-__exportStar(require("./ParametricLine"), exports);
-__exportStar(require("./ParametricPlane"), exports);
 __exportStar(require("./StateMachine"), exports);
 __exportStar(require("./UndoRedo"), exports);
-__exportStar(require("./Vector2"), exports);
-__exportStar(require("./Vector3"), exports);
 __exportStar(require("./MouseInput"), exports);
 __exportStar(require("./TouchInput"), exports);

package/lib/PresentationManagers/FocusCameraPM.d.ts

@@ -1,4 +1,5 @@
-import { FocusCamera, Vector3 } from "../Entities";
+import { FocusCamera } from "../Entities";
+import { Vector3 } from "../ValueObjects";
 export interface FocusCameraVM {
     alphaEuler: Vector3;
     betaEuler: Vector3;

package/lib/PresentationManagers/FocusCameraPM.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FocusCameraPM = void 0;
-const Entities_1 = require("../Entities");
 const Utilities_1 = require("../Utilities");
+const ValueObjects_1 = require("../ValueObjects");
 class FocusCameraPM {
     constructor(orbitCamera, view) {
         this.doUpdateView = () => {
             const { alpha, beta, radius, target } = this.orbitCam;
             const alphaRadians = Utilities_1.degreesToRadians(alpha);
-            const alphaEuler = new Entities_1.Vector3(0, alphaRadians, 0);
+            const alphaEuler = new ValueObjects_1.Vector3(0, alphaRadians, 0);
             const betaRadians = Utilities_1.degreesToRadians(beta);
-            const betaEuler = new Entities_1.Vector3(betaRadians, 0, 0);
-            const cameraLocalPosition = new Entities_1.Vector3(0, 0, -radius);
+            const betaEuler = new ValueObjects_1.Vector3(betaRadians, 0, 0);
+            const cameraLocalPosition = new ValueObjects_1.Vector3(0, 0, -radius);
             this.view({
                 alphaEuler,
                 betaEuler,

package/lib/UseCases/FocusCamera/BumpDollyFocusCamera.d.ts

@@ -1,4 +1,5 @@
-import { FocusCamera, Vector3 } from "../../Entities";
+import { FocusCamera } from "../../Entities";
+import { Vector3 } from "../../ValueObjects";
 export declare class BumpDollyFocusCamera {
     private focusCamera;
     bumpDurationMS: number;

package/lib/UseCases/FocusCamera/BumpDollyFocusCamera.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BumpDollyFocusCamera = void 0;
+const ValueObjects_1 = require("../../ValueObjects");
 class BumpDollyFocusCamera {
     constructor(focusCamera) {
         this.focusCamera = focusCamera;
@@ -25,10 +26,10 @@ class BumpDollyFocusCamera {
             this.focusCamera.radius = this.initialRadius + range * percent;
             if (this.pickPoint !== undefined) {
                 const percentChange = this.focusCamera.radius / currentRadius;
-                const pickToTarget = this.focusCamera.target.subtract(this.pickPoint);
+                let pickToTarget = ValueObjects_1.Vector3.subtract(this.focusCamera.target, this.pickPoint);
                 const newLength = pickToTarget.magnitued * percentChange;
-                pickToTarget.setLength(newLength);
-                const newTargetPos = this.pickPoint.add(pickToTarget);
+                pickToTarget = ValueObjects_1.Vector3.newVectorOfLength(pickToTarget, newLength);
+                const newTargetPos = ValueObjects_1.Vector3.add(this.pickPoint, pickToTarget);
                 this.focusCamera.target = newTargetPos;
             }
             if (nomralizedTime >= 1 && this.interval) {

package/lib/UseCases/FocusCamera/LerpFocusCamera.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LerpFocusCamera = void 0;
-const Entities_1 = require("../../Entities");
+const ValueObjects_1 = require("../../ValueObjects");
 class LerpFocusCamera {
     constructor(focusCamera, easeFn, parameters) {
         var _a, _b, _c;
@@ -30,7 +30,7 @@ class LerpFocusCamera {
             const x = this.lerpX(percent);
             const y = this.lerpY(percent);
             const z = this.lerpZ(percent);
-            this.focusCamera.target = new Entities_1.Vector3(x, y, z);
+            this.focusCamera.target = new ValueObjects_1.Vector3(x, y, z);
             if (nomralizedTime >= 1) {
                 clearInterval(this.interval);
                 if (this.onComplete) {

package/lib/UseCases/FocusCamera/PinchDollyFocusCamera.d.ts

@@ -1,4 +1,5 @@
-import { FocusCamera, Vector3 } from "../../Entities";
+import { FocusCamera } from "../../Entities";
+import { Vector3 } from "../../ValueObjects";
 export declare class PinchDollyFocusCamera {
     private focusCamera;
     sensitivity: number;

package/lib/UseCases/FocusCamera/PinchDollyFocusCamera.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PinchDollyFocusCamera = void 0;
+const ValueObjects_1 = require("../../ValueObjects");
 class PinchDollyFocusCamera {
     constructor(focusCamera) {
         this.focusCamera = focusCamera;
@@ -13,10 +14,10 @@ class PinchDollyFocusCamera {
             this.focusCamera.radius = currentRadius - deltaRadius;
             if (this.pickPoint !== undefined) {
                 const percentChange = this.focusCamera.radius / currentRadius;
-                const pickToTarget = this.focusCamera.target.subtract(this.pickPoint);
+                let pickToTarget = ValueObjects_1.Vector3.subtract(this.focusCamera.target, this.pickPoint);
                 const newLength = pickToTarget.magnitued * percentChange;
-                pickToTarget.setLength(newLength);
-                const newTargetPos = this.pickPoint.add(pickToTarget);
+                pickToTarget = ValueObjects_1.Vector3.newVectorOfLength(pickToTarget, newLength);
+                const newTargetPos = ValueObjects_1.Vector3.add(this.pickPoint, pickToTarget);
                 this.focusCamera.target = newTargetPos;
             }
             this.previousDistanceBetweenTouches = distanceBetweenTouches;

package/lib/UseCases/FocusCamera/PixelDollyFocusCamera.d.ts

@@ -1,4 +1,5 @@
-import { FocusCamera, Vector2, Vector3 } from "../../Entities";
+import { FocusCamera } from "../../Entities";
+import { Vector2, Vector3 } from "../../ValueObjects";
 export declare class PixelDollyFocusCamera {
     private focusCamera;
     sensitivity: number;

package/lib/UseCases/FocusCamera/PixelDollyFocusCamera.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PixelDollyFocusCamera = void 0;
-const Entities_1 = require("../../Entities");
+const ValueObjects_1 = require("../../ValueObjects");
 class PixelDollyFocusCamera {
     constructor(focusCamera) {
         this.focusCamera = focusCamera;
         this.sensitivity = 0.05;
-        this.previousPixelPosition = Entities_1.Vector2.Zero();
+        this.previousPixelPosition = ValueObjects_1.Vector2.zero();
         this.doDolly = (pixelPosition) => {
             const pixelDeltaY = pixelPosition.y - this.previousPixelPosition.y;
             const deltaRadius = pixelDeltaY * this.sensitivity;
@@ -14,10 +14,10 @@ class PixelDollyFocusCamera {
             this.focusCamera.radius = currentRadius - deltaRadius;
             if (this.pickPoint !== undefined) {
                 const percentChange = this.focusCamera.radius / currentRadius;
-                const pickToTarget = this.focusCamera.target.subtract(this.pickPoint);
+                let pickToTarget = ValueObjects_1.Vector3.subtract(this.focusCamera.target, this.pickPoint);
                 const newLength = pickToTarget.magnitued * percentChange;
-                pickToTarget.setLength(newLength);
-                const newTargetPos = this.pickPoint.add(pickToTarget);
+                pickToTarget = ValueObjects_1.Vector3.newVectorOfLength(pickToTarget, newLength);
+                const newTargetPos = ValueObjects_1.Vector3.add(this.pickPoint, pickToTarget);
                 this.focusCamera.target = newTargetPos;
             }
             this.previousPixelPosition = pixelPosition;

package/lib/UseCases/FocusCamera/PixelOrbitFocusCamera.d.ts

@@ -1,4 +1,5 @@
-import { FocusCamera, Vector2, Vector3 } from "../../Entities";
+import { FocusCamera } from "../../Entities";
+import { Vector2, Vector3 } from "../../ValueObjects";
 export declare class PixelOrbitFocusCamera {
     private focusCamera;
     sensitivity: number;

package/lib/UseCases/FocusCamera/PixelOrbitFocusCamera.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PixelOrbitFocusCamera = void 0;
+const ValueObjects_1 = require("../../ValueObjects");
 class PixelOrbitFocusCamera {
     constructor(focusCamera) {
         this.focusCamera = focusCamera;
@@ -9,7 +10,7 @@ class PixelOrbitFocusCamera {
             if (!this.previousPixelPos) {
                 throw new Error("[PixelOrbitFocusCamera] You must initialize first!");
             }
-            const pixelChange = pixelPosition.subtract(this.previousPixelPos);
+            const pixelChange = ValueObjects_1.Vector2.subtract(pixelPosition, this.previousPixelPos);
             this.focusCamera.alpha += pixelChange.x * this.sensitivity;
             this.focusCamera.beta += pixelChange.y * this.sensitivity;
             this.previousPixelPos = pixelPosition;

package/lib/UseCases/FocusCamera/PixelPlanePanFocusCamera.d.ts

@@ -1,4 +1,5 @@
-import { Babylon, FocusCamera, ParametricPlane, Vector2 } from "../../Entities";
+import { Babylon, FocusCamera } from "../../Entities";
+import { ParametricPlane, Vector2 } from "../../ValueObjects";
 export declare class PixelPlanePanFocusCamera {
     private focusCamera;
     private babylon;

package/lib/UseCases/FocusCamera/PixelPlanePanFocusCamera.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PixelPlanePanFocusCamera = void 0;
-const Entities_1 = require("../../Entities");
+const ValueObjects_1 = require("../../ValueObjects");
 class PixelPlanePanFocusCamera {
     constructor(focusCamera, babylon) {
         this.focusCamera = focusCamera;
@@ -16,10 +16,10 @@ class PixelPlanePanFocusCamera {
             const p2 = this.plane.intersectLine(finalRay);
             if (!p1 || !p2)
                 return;
-            const delta = p2.subtract(p1);
+            const delta = ValueObjects_1.Vector3.subtract(p2, p1);
             const currentTarget = this.focusCamera.target;
-            const newTarget = new Entities_1.Vector3(currentTarget.x - delta.x, currentTarget.y - delta.y, currentTarget.z - delta.z);
-            this.focusCamera.target = new Entities_1.Vector3(newTarget.x, newTarget.y, newTarget.z);
+            const newTarget = new ValueObjects_1.Vector3(currentTarget.x - delta.x, currentTarget.y - delta.y, currentTarget.z - delta.z);
+            this.focusCamera.target = new ValueObjects_1.Vector3(newTarget.x, newTarget.y, newTarget.z);
             this.previousPixelPos = pixelPosition;
         };
         this.initializePan = (initialPixelPos, panPlane) => {

package/lib/UseCases/FocusCamera/SerializeFocusCamera.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SerializeFocusCamera = void 0;
 const _1 = require(".");
-const Entities_1 = require("../../Entities");
+const ValueObjects_1 = require("../../ValueObjects");
 class SerializeFocusCamera {
     constructor(focusCamera, stateMachine) {
         this.name = "focusCamera";
@@ -52,7 +52,7 @@ class SerializeFocusCamera {
     }
     applyV1Data(data, transitionTime) {
         const { alpha, beta, radius, target_x, target_y, target_z } = data;
-        const target = new Entities_1.Vector3(target_x, target_y, target_z);
+        const target = new ValueObjects_1.Vector3(target_x, target_y, target_z);
         if (transitionTime === 0) {
             this.applyImmediate(alpha, beta, radius, target);
         }

package/lib/Utilities/LengthConverters.d.ts

@@ -0,0 +1,4 @@
+export declare function inchesToMeters(inches: number): number;
+export declare function metersToInches(meters: number): number;
+export declare function feetToMeters(feet: number): number;
+export declare function metersToFeet(meters: number): number;

package/lib/Utilities/LengthConverters.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.metersToFeet = exports.feetToMeters = exports.metersToInches = exports.inchesToMeters = void 0;
+const inchesPerMeter = 39.3701;
+const feetPerMeter = 3.28084;
+function inchesToMeters(inches) {
+    return inches / inchesPerMeter;
+}
+exports.inchesToMeters = inchesToMeters;
+function metersToInches(meters) {
+    return meters * inchesPerMeter;
+}
+exports.metersToInches = metersToInches;
+function feetToMeters(feet) {
+    return feet / feetPerMeter;
+}
+exports.feetToMeters = feetToMeters;
+function metersToFeet(meters) {
+    return meters * feetPerMeter;
+}
+exports.metersToFeet = metersToFeet;

package/lib/Utilities/index.d.ts

@@ -1 +1,2 @@
 export * from "./degreesToRadians";
+export * from "./LengthConverters";

package/lib/Utilities/index.js

@@ -11,3 +11,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./degreesToRadians"), exports);
+__exportStar(require("./LengthConverters"), exports);

package/lib/ValueObjects/Angle.d.ts

@@ -0,0 +1,8 @@
+export declare class Angle {
+    static fromDegrees(degrees: number): Angle;
+    static fromRadians(radians: number): Angle;
+    private _degrees;
+    get degrees(): number;
+    get radians(): number;
+    private constructor();
+}

package/lib/ValueObjects/Angle.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Angle = void 0;
+class Angle {
+    constructor(degrees) {
+        this._degrees = 0;
+        this._degrees = degrees;
+    }
+    static fromDegrees(degrees) {
+        return new Angle(degrees);
+    }
+    static fromRadians(radians) {
+        return new Angle(radians * 180 / Math.PI);
+    }
+    get degrees() {
+        return this._degrees;
+    }
+    get radians() {
+        return this._degrees * Math.PI / 180;
+    }
+}
+exports.Angle = Angle;

package/lib/ValueObjects/Color.d.ts

@@ -0,0 +1,23 @@
+export declare type BasicColor = "";
+export declare class Color {
+    static RGBA(r: number, g: number, b: number, a: number): Color;
+    static RGB(r: number, g: number, b: number): Color;
+    static Hex(hex: string): Color;
+    static X11(name: string): Color;
+    static Equal(a: Color, b: Color): boolean;
+    private _r;
+    private _g;
+    private _b;
+    private _a;
+    get r(): number;
+    get g(): number;
+    get b(): number;
+    get a(): number;
+    get rPercent(): number;
+    get gPercent(): number;
+    get bPercent(): number;
+    get aPercent(): number;
+    get array(): [number, number, number, number];
+    private clampVal;
+    private constructor();
+}