@vived/app 2.11.0 → 2.14.0

package/lib/Entities/Babylon.d.ts

@@ -1,5 +1,4 @@
-import { ParametricLine, Vector3 } from ".";
-import { Vector2 } from "./Vector2";
+import { ParametricLine, Vector2, Vector3 } from "../ValueObjects";
 export declare type OnBabylonChange = () => void;
 export interface ScenePick {
     mouseRay: ParametricLine;

package/lib/Entities/Babylon.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeBabylon = void 0;
-const _1 = require(".");
+const ValueObjects_1 = require("../ValueObjects");
 const MemoizedBoolean_1 = require("./MemoizedBoolean");
 const MemoizedVector2_1 = require("./MemoizedVector2");
 const ObserverList_1 = require("./ObserverList");
-const Vector2_1 = require("./Vector2");
 function makeBabylon() {
     return new BabylonImp();
 }
@@ -15,13 +14,13 @@ class BabylonImp {
         this.scenePick = () => {
             console.warn("orignal scene picker");
             return {
-                mouseRay: _1.ParametricLine.Forward(),
+                mouseRay: ValueObjects_1.ParametricLine.Forward(),
                 hit: false,
             };
         };
         this.sceneRay = () => {
             console.warn("orignal scene ray");
-            return _1.ParametricLine.Forward();
+            return ValueObjects_1.ParametricLine.Forward();
         };
         this.observers = new ObserverList_1.ObserverList();
         this.updateCanvasSize = () => {
@@ -79,7 +78,7 @@ class BabylonImp {
             this.sceneRay = rayer;
         };
         this.memoizedShowInspector = new MemoizedBoolean_1.MemoizedBoolean(false, this.observers.notify);
-        this.memoizedCanvasSize = new MemoizedVector2_1.MemoizedVector2(Vector2_1.Vector2.One(), this.observers.notify);
+        this.memoizedCanvasSize = new MemoizedVector2_1.MemoizedVector2(ValueObjects_1.Vector2.one(), this.observers.notify);
     }
     get showInspector() {
         return this.memoizedShowInspector.val;
@@ -91,9 +90,9 @@ class BabylonImp {
         return this._renderCanvas;
     }
     get canvasSize() {
-        return this.memoizedCanvasSize.getVector();
+        return this.memoizedCanvasSize.val;
     }
     set canvasSize(val) {
-        this.memoizedCanvasSize.setVector(val);
+        this.memoizedCanvasSize.val = val;
     }
 }

package/lib/Entities/DevicePreview.d.ts

@@ -1,4 +1,4 @@
-import { Vector2 } from ".";
+import { Vector2 } from "../ValueObjects";
 export declare type OnDevicePreviewChange = () => void;
 export interface DevicePreview {
     useDevicePreview: boolean;

package/lib/Entities/DevicePreview.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeDevicePreview = void 0;
 const _1 = require(".");
+const ValueObjects_1 = require("../ValueObjects");
 function makeDevicePreview() {
     return new DevicePreviewImp();
 }
@@ -10,21 +11,20 @@ class DevicePreviewImp {
     constructor() {
         this.observers = new _1.ObserverList();
         this._usePreview = false;
-        this._previewSize = _1.Vector2.Zero();
+        this._previewSize = ValueObjects_1.Vector2.zero();
         this.setDevicePreview = (x, y) => {
             if (this._usePreview &&
                 this._previewSize.x === x &&
                 this._previewSize.y === y)
                 return;
             this._usePreview = true;
-            this._previewSize.x = x;
-            this._previewSize.y = y;
+            this._previewSize = new ValueObjects_1.Vector2(x, y);
             this.observers.notify();
         };
         this.clearDevicePreview = () => {
             if (!this._usePreview)
                 return;
-            this._previewSize = _1.Vector2.Zero();
+            this._previewSize = ValueObjects_1.Vector2.zero();
             this._usePreview = false;
             this.observers.notify();
         };
@@ -39,6 +39,6 @@ class DevicePreviewImp {
         return this._usePreview;
     }
     get previewSize() {
-        return this._previewSize.copy();
+        return this._previewSize;
     }
 }

package/lib/Entities/FocusCamera.d.ts

@@ -1,4 +1,4 @@
-import { Vector3 } from ".";
+import { Vector3 } from "../ValueObjects";
 export declare type OnFocusCameraChange = () => void;
 export interface FocusCameraLerper {
     cancelLerp: () => void;

package/lib/Entities/FocusCamera.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeFocusCamera = void 0;
 const _1 = require(".");
+const ValueObjects_1 = require("../ValueObjects");
 function makeFocusCamera() {
     return new FocusCameraImp();
 }
@@ -13,7 +14,7 @@ class FocusCameraImp {
         this.defaultAlpha = 0;
         this.defaultBeta = 30;
         this.defaultRadius = 8;
-        this.defaultTarget = _1.Vector3.Zero();
+        this.defaultTarget = ValueObjects_1.Vector3.zero();
         this.limitRadius = false;
         this.minRadius = 0;
         this.maxRadius = 0;
@@ -24,13 +25,13 @@ class FocusCameraImp {
         this.minBeta = 0;
         this.maxBeta = 0;
         this.limitTarget = false;
-        this.maxTargetPosition = _1.Vector3.Zero();
-        this.minTargetPosition = _1.Vector3.Zero();
+        this.maxTargetPosition = ValueObjects_1.Vector3.zero();
+        this.minTargetPosition = ValueObjects_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.memoizedTarget = new _1.MemoizedVector3(ValueObjects_1.Vector3.zero(), this.observers.notify);
         this.setRadiusLimits = (min, max) => {
             if (min < 0) {
                 throw new Error("[Orbit Camera] Mininum Radius must be greater >= 0");
@@ -89,8 +90,8 @@ class FocusCameraImp {
             this.limitBeta = false;
         };
         this.setTargetLimits = (min, max) => {
-            const minArray = min.asArray();
-            const maxArray = max.asArray();
+            const minArray = min.array;
+            const maxArray = max.array;
             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");
@@ -102,8 +103,8 @@ class FocusCameraImp {
             this.target = this.target;
         };
         this.clearTargetLimits = () => {
-            this.maxTargetPosition = _1.Vector3.Zero();
-            this.minTargetPosition = _1.Vector3.Zero();
+            this.maxTargetPosition = ValueObjects_1.Vector3.zero();
+            this.minTargetPosition = ValueObjects_1.Vector3.zero();
             this.limitTarget = false;
         };
         this.registerLerp = (lerper) => {
@@ -132,7 +133,7 @@ class FocusCameraImp {
             }
             if (data.defaultTarget !== undefined) {
                 const { x, y, z } = data.defaultTarget;
-                this.defaultTarget = new _1.Vector3(x, y, z);
+                this.defaultTarget = new ValueObjects_1.Vector3(x, y, z);
             }
             if (data.nearClip !== undefined) {
                 this.nearClip = data.nearClip;
@@ -151,7 +152,7 @@ class FocusCameraImp {
             }
             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.setTargetLimits(new ValueObjects_1.Vector3(min.x, min.y, min.z), new ValueObjects_1.Vector3(max.x, max.y, max.z));
             }
         };
         this.addObserver = (observer) => {
@@ -195,13 +196,13 @@ class FocusCameraImp {
         this.memoizedRadius.val = clampedVal;
     }
     get target() {
-        return this.memoizedTarget.getVector();
+        return this.memoizedTarget.val;
     }
     set target(val) {
-        const targetVals = val.asArray();
+        const targetVals = val.array;
         if (this.limitTarget) {
-            const maxVals = this.maxTargetPosition.asArray();
-            const minVals = this.minTargetPosition.asArray();
+            const maxVals = this.maxTargetPosition.array;
+            const minVals = this.minTargetPosition.array;
             for (let i = 0; i < 3; i++) {
                 let v = targetVals[i];
                 v = Math.min(v, maxVals[i]);
@@ -209,7 +210,7 @@ class FocusCameraImp {
                 targetVals[i] = v;
             }
         }
-        this.memoizedTarget.setVector(new _1.Vector3(targetVals[0], targetVals[1], targetVals[2]));
+        this.memoizedTarget.val = ValueObjects_1.Vector3.fromArray(targetVals);
     }
     get direction() {
         const yLength = -Math.sin(this.degToRad(this.beta));
@@ -217,12 +218,11 @@ class FocusCameraImp {
         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);
+        return new ValueObjects_1.Vector3(xLength, yLength, zLength);
     }
     get cameraPosition() {
-        const localOffset = this.direction.copy();
-        localOffset.setLength(-this.radius);
-        return this.target.add(localOffset);
+        const localOffset = ValueObjects_1.Vector3.newVectorOfLength(this.direction, -this.radius);
+        return ValueObjects_1.Vector3.add(this.target, localOffset);
     }
     degToRad(degrees) {
         return (degrees * Math.PI) / 180;

package/lib/Entities/KeyboardInput.js

@@ -20,8 +20,8 @@ class KeyboardInputImp {
                 return;
             this._eventElement.removeEventListener("keydown", this.submitKeyDown);
             this._eventElement.removeEventListener("keyup", this.submitKeyUp);
+            this._eventElement = undefined;
         };
-        this.pressedKeys = [];
         this.submitKeyDown = (e) => {
             e.preventDefault();
             this.controllers.forEach((c) => {

package/lib/Entities/MemoizedVector2.d.ts

@@ -1,12 +1,8 @@
-import { Vector2 } from "./Vector2";
+import { Vector2 } from "../ValueObjects";
 export declare class MemoizedVector2 {
     private _val;
-    get x(): number;
-    set x(x: number);
-    get y(): number;
-    set y(y: number);
-    getVector(): Vector2;
-    setVector(vec: Vector2): void;
+    get val(): Vector2;
+    set val(v: Vector2);
     private onChangeCallback;
     constructor(initialValue: Vector2, onChangeCallback: () => void);
 }

package/lib/Entities/MemoizedVector2.js

@@ -1,36 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoizedVector2 = void 0;
+const ValueObjects_1 = require("../ValueObjects");
 class MemoizedVector2 {
     constructor(initialValue, onChangeCallback) {
-        this._val = initialValue.copy();
+        this._val = initialValue;
         this.onChangeCallback = onChangeCallback;
     }
-    get x() {
-        return this._val.x;
+    get val() {
+        return this._val;
     }
-    set x(x) {
-        if (this._val.x === x)
+    set val(v) {
+        if (ValueObjects_1.Vector2.equal(v, this._val))
             return;
-        this._val.x = x;
-        this.onChangeCallback();
-    }
-    get y() {
-        return this._val.y;
-    }
-    set y(y) {
-        if (this._val.y === y)
-            return;
-        this._val.y = y;
-        this.onChangeCallback();
-    }
-    getVector() {
-        return this._val.copy();
-    }
-    setVector(vec) {
-        if (vec.x === this._val.x && vec.y === this._val.y)
-            return;
-        this._val = vec.copy();
+        this._val = v;
         this.onChangeCallback();
     }
 }

package/lib/Entities/MemoizedVector3.d.ts

@@ -1,14 +1,8 @@
-import { Vector3 } from "./Vector3";
+import { Vector3 } from "../ValueObjects/Vector3";
 export declare class MemoizedVector3 {
     private _val;
-    get x(): number;
-    set x(x: number);
-    get y(): number;
-    set y(y: number);
-    get z(): number;
-    set z(z: number);
-    getVector(): Vector3;
-    setVector(vec: Vector3): void;
+    get val(): Vector3;
+    set val(v: Vector3);
     private onChangeCallback;
     constructor(initialValue: Vector3, onChangeCallback: () => void);
 }

package/lib/Entities/MemoizedVector3.js

@@ -1,45 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoizedVector3 = void 0;
+const Vector3_1 = require("../ValueObjects/Vector3");
 class MemoizedVector3 {
     constructor(initialValue, onChangeCallback) {
-        this._val = initialValue.copy();
+        this._val = initialValue;
         this.onChangeCallback = onChangeCallback;
     }
-    get x() {
-        return this._val.x;
+    get val() {
+        return this._val;
     }
-    set x(x) {
-        if (this._val.x === x)
+    set val(v) {
+        if (Vector3_1.Vector3.equal(v, this._val))
             return;
-        this._val.x = x;
-        this.onChangeCallback();
-    }
-    get y() {
-        return this._val.y;
-    }
-    set y(y) {
-        if (this._val.y === y)
-            return;
-        this._val.y = y;
-        this.onChangeCallback();
-    }
-    get z() {
-        return this._val.z;
-    }
-    set z(z) {
-        if (this._val.z === z)
-            return;
-        this._val.z = z;
-        this.onChangeCallback();
-    }
-    getVector() {
-        return this._val.copy();
-    }
-    setVector(vec) {
-        if (vec.x === this._val.x && vec.y === this._val.y && vec.z === this._val.z)
-            return;
-        this._val = vec.copy();
+        this._val = v;
         this.onChangeCallback();
     }
 }

package/lib/Entities/MouseInput.d.ts

@@ -1,9 +1,15 @@
+import { Vector2 } from "../ValueObjects";
+export interface MouseInputEvent {
+    position: Vector2;
+    button: number;
+    event: MouseEvent;
+}
 export interface MouseController {
-    onClick?: (e: MouseEvent) => void;
-    onDown?: (e: MouseEvent) => void;
-    onUp?: (e: MouseEvent) => void;
-    onMove?: (e: MouseEvent) => void;
-    onWheel?: (e: WheelEvent) => void;
+    onClick?: (e: MouseInputEvent) => void;
+    onDown?: (e: MouseInputEvent) => void;
+    onUp?: (e: MouseInputEvent) => void;
+    onMove?: (e: MouseInputEvent) => void;
+    onWheel?: (e: MouseInputEvent) => void;
 }
 export interface MouseInput {
     eventElement: HTMLElement | undefined;

package/lib/Entities/MouseInput.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMouseInput = void 0;
-const _1 = require(".");
+const ValueObjects_1 = require("../ValueObjects");
 function makeMouseInput() {
     return new MouseInputImp();
 }
@@ -43,9 +43,10 @@ class MouseInputImp {
         };
         this.onMouseDown = (e) => {
             e.preventDefault();
+            const inputEvt = this.makeMouseInputEvent(e);
             this.controllers.forEach((c) => {
                 if (c.onDown) {
-                    c.onDown(e);
+                    c.onDown(inputEvt);
                 }
             });
             this.isPressed = true;
@@ -53,9 +54,10 @@ class MouseInputImp {
         };
         this.onMouseUp = (e) => {
             e.preventDefault();
+            const inputEvt = this.makeMouseInputEvent(e);
             this.controllers.forEach((c) => {
                 if (c.onUp) {
-                    c.onUp(e);
+                    c.onUp(inputEvt);
                 }
             });
             this.isPressed = false;
@@ -63,11 +65,11 @@ class MouseInputImp {
                 return;
             const deltaX = this.pressEvent.screenX - e.screenX;
             const deltaY = this.pressEvent.screenY - e.screenY;
-            const delta = new _1.Vector2(deltaX, deltaY);
+            const delta = new ValueObjects_1.Vector2(deltaX, deltaY);
             if (delta.magnitued < this.maxClickMovement) {
                 this.controllers.forEach((c) => {
                     if (c.onClick) {
-                        c.onClick(e);
+                        c.onClick(inputEvt);
                     }
                 });
             }
@@ -75,16 +77,17 @@ class MouseInputImp {
         };
         this.onMouseMove = (e) => {
             e.preventDefault();
+            const inputEvt = this.makeMouseInputEvent(e);
             this.controllers.forEach((c) => {
                 if (c.onMove) {
-                    c.onMove(e);
+                    c.onMove(inputEvt);
                 }
             });
             if (!this.pressEvent)
                 return;
             const deltaX = this.pressEvent.screenX - e.screenX;
             const deltaY = this.pressEvent.screenY - e.screenY;
-            const delta = new _1.Vector2(deltaX, deltaY);
+            const delta = new ValueObjects_1.Vector2(deltaX, deltaY);
             if (delta.magnitued > this.maxClickMovement) {
                 this.pressEvent = undefined;
             }
@@ -93,9 +96,10 @@ class MouseInputImp {
             e.preventDefault();
             if (!this.isPressed)
                 return;
+            const inputEvt = this.makeMouseInputEvent(e);
             this.controllers.forEach((c) => {
                 if (c.onUp) {
-                    c.onUp(e);
+                    c.onUp(inputEvt);
                 }
             });
             this.pressEvent = undefined;
@@ -103,9 +107,10 @@ class MouseInputImp {
         };
         this.onWheel = (e) => {
             e.preventDefault();
+            const inputEvt = this.makeMouseInputEvent(e);
             this.controllers.forEach((c) => {
                 if (c.onWheel) {
-                    c.onWheel(e);
+                    c.onWheel(inputEvt);
                 }
             });
         };
@@ -113,4 +118,14 @@ class MouseInputImp {
     get eventElement() {
         return this._eventElement;
     }
+    makeMouseInputEvent(event) {
+        const px = event.offsetX;
+        const py = event.offsetY;
+        const button = event.button;
+        return {
+            position: new ValueObjects_1.Vector2(px, py),
+            button,
+            event,
+        };
+    }
 }

package/lib/Entities/ParametricLine.d.ts

@@ -1,4 +1,4 @@
-import { Vector3 } from "./Vector3";
+import { Vector3 } from "../ValueObjects/Vector3";
 export interface LineParameters {
     x0: number;
     y0: number;

package/lib/Entities/ParametricLine.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParametricLine = void 0;
-const Vector3_1 = require("./Vector3");
+const Vector3_1 = require("../ValueObjects/Vector3");
 class ParametricLine {
     constructor(parameters) {
         this.x0 = parameters.x0;
@@ -12,7 +12,7 @@ class ParametricLine {
         this.c = parameters.c;
     }
     static FromTwoPoint(p1, p2) {
-        const dir = p2.subtract(p1).unit;
+        const dir = Vector3_1.Vector3.subtract(p2, p1).unit;
         return this.FromPointDirection(p1, dir);
     }
     static FromPointDirection(point, direction) {
@@ -26,32 +26,32 @@ class ParametricLine {
         });
     }
     static Forward() {
-        const p = Vector3_1.Vector3.Zero();
+        const p = Vector3_1.Vector3.zero();
         const d = new Vector3_1.Vector3(0, 0, 1);
         return this.FromPointDirection(p, d);
     }
     static Backward() {
-        const p = Vector3_1.Vector3.Zero();
+        const p = Vector3_1.Vector3.zero();
         const d = new Vector3_1.Vector3(0, 0, -1);
         return this.FromPointDirection(p, d);
     }
     static Up() {
-        const p = Vector3_1.Vector3.Zero();
+        const p = Vector3_1.Vector3.zero();
         const d = new Vector3_1.Vector3(0, 1, 0);
         return this.FromPointDirection(p, d);
     }
     static Down() {
-        const p = Vector3_1.Vector3.Zero();
+        const p = Vector3_1.Vector3.zero();
         const d = new Vector3_1.Vector3(0, -1, 0);
         return this.FromPointDirection(p, d);
     }
     static Left() {
-        const p = Vector3_1.Vector3.Zero();
+        const p = Vector3_1.Vector3.zero();
         const d = new Vector3_1.Vector3(-1, 0, 0);
         return this.FromPointDirection(p, d);
     }
     static Right() {
-        const p = Vector3_1.Vector3.Zero();
+        const p = Vector3_1.Vector3.zero();
         const d = new Vector3_1.Vector3(1, 0, 0);
         return this.FromPointDirection(p, d);
     }

package/lib/Entities/ParametricPlane.d.ts

@@ -1,5 +1,5 @@
 import { ParametricLine } from "./ParametricLine";
-import { Vector3 } from "./Vector3";
+import { Vector3 } from "../ValueObjects/Vector3";
 export interface PlaneParameters {
     a: number;
     b: number;
@@ -7,13 +7,13 @@ export interface PlaneParameters {
     d: number;
 }
 export declare class ParametricPlane {
+    private point;
+    private normal;
     static FromPointNormal(point: Vector3, normal: Vector3): ParametricPlane;
     static FromThreePoints(A: Vector3, B: Vector3, C: Vector3): ParametricPlane;
     static XY(): ParametricPlane;
     static ZX(): ParametricPlane;
     static YZ(): ParametricPlane;
-    private point;
-    private normal;
     getParameters(): PlaneParameters;
     intersectLine(line: ParametricLine): Vector3 | undefined;
     constructor(point: Vector3, normal: Vector3);

package/lib/Entities/ParametricPlane.js

@@ -1,34 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParametricPlane = void 0;
-const Vector3_1 = require("./Vector3");
+const Vector3_1 = require("../ValueObjects/Vector3");
 class ParametricPlane {
     constructor(point, normal) {
-        this.point = point.copy();
-        this.normal = normal.copy();
+        this.point = point;
+        this.normal = normal;
     }
     static FromPointNormal(point, normal) {
         return new ParametricPlane(point, normal);
     }
     static FromThreePoints(A, B, C) {
         const point = A;
-        const AB = B.subtract(A);
-        const AC = C.subtract(A);
-        const normal = AB.cross(AC);
+        const AB = Vector3_1.Vector3.subtract(B, A);
+        const AC = Vector3_1.Vector3.subtract(C, A);
+        const normal = Vector3_1.Vector3.cross(AB, AC);
         return new ParametricPlane(point, normal);
     }
     static XY() {
-        const p = Vector3_1.Vector3.Zero();
+        const p = Vector3_1.Vector3.zero();
         const n = new Vector3_1.Vector3(0, 0, 1);
         return new ParametricPlane(p, n);
     }
     static ZX() {
-        const p = Vector3_1.Vector3.Zero();
+        const p = Vector3_1.Vector3.zero();
         const n = new Vector3_1.Vector3(0, 1, 0);
         return new ParametricPlane(p, n);
     }
     static YZ() {
-        const p = Vector3_1.Vector3.Zero();
+        const p = Vector3_1.Vector3.zero();
         const n = new Vector3_1.Vector3(1, 0, 0);
         return new ParametricPlane(p, n);
     }
@@ -36,7 +36,7 @@ class ParametricPlane {
         const a = this.normal.x;
         const b = this.normal.y;
         const c = this.normal.z;
-        let d = this.point.dot(this.normal);
+        let d = Vector3_1.Vector3.dot(this.point, this.normal);
         if (d !== 0) {
             d *= -1;
         }