@vived/app 4.13.0 → 4.14.0

package/lib/Components/Transform3D/UC/RayPanScaleTransform.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeRayPanScaleTransformUC = exports.RayPanScaleTransformUC = void 0;
+const AppObject_1 = require("../../../AppObject");
+const ValueObjects_1 = require("../../../ValueObjects");
+const Babylon_1 = require("../../Babylon");
+const Dispatcher_1 = require("../../Dispatcher");
+const Entities_1 = require("../Entities");
+class RayPanScaleTransformUC extends AppObject_1.AppObjectUC {
+}
+exports.RayPanScaleTransformUC = RayPanScaleTransformUC;
+RayPanScaleTransformUC.type = "RayPanScaleTransformUC";
+function makeRayPanScaleTransformUC(appObject) {
+    return new RayPanScaleTransformUCImp(appObject);
+}
+exports.makeRayPanScaleTransformUC = makeRayPanScaleTransformUC;
+class RayPanScaleTransformUCImp extends RayPanScaleTransformUC {
+    constructor(appObject) {
+        super(appObject, RayPanScaleTransformUC.type);
+        this.enabled = true;
+        this.sensitivity = 1;
+        this.allowUpdate = false;
+        this.initialScale = 1;
+        this.pickOffset = ValueObjects_1.Vector3.Zero();
+        this.panPlane = ValueObjects_1.ParametricPlane.XY();
+        this.lastRayLength = 0;
+        this.initialize = (ray) => {
+            var _a, _b;
+            this.allowUpdate = false;
+            if (!this.transform)
+                return;
+            const pick = Babylon_1.sceneRayPick(ray, this.appObjects);
+            this.panPlane = ValueObjects_1.ParametricPlane.FromPointNormal((_a = pick === null || pick === void 0 ? void 0 : pick.worldPickPoint) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero(), ValueObjects_1.Vector3.Backward());
+            const pickPoint = (_b = this.panPlane.intersectLine(ray)) !== null && _b !== void 0 ? _b : ValueObjects_1.Vector3.Zero();
+            this.lastRayLength = ValueObjects_1.ParametricLine.GetDistanceToPoint(ray, pickPoint);
+            this.pickOffset = this.transform.worldPointToLocal(pickPoint);
+            this.initialScale = this.transform.worldScale.x;
+            this.allowUpdate = true;
+        };
+        this.update = (ray) => {
+            var _a;
+            if (!this.enabled)
+                return;
+            if (!this.allowUpdate)
+                return;
+            if (!this.transform)
+                return;
+            const pick = (_a = this.panPlane.intersectLine(ray)) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
+            this.updateScale(ray, pick);
+            this.updatePosition(pick);
+        };
+        this.finish = () => {
+            if (!this.transform)
+                return;
+            if (!this.allowUpdate)
+                return;
+            if (this.initialScale !== this.transform.worldScale.x) {
+                Dispatcher_1.dispatchStateChange(this.appObjects);
+            }
+            this.allowUpdate = false;
+        };
+        this.transform = appObject.getComponent(Entities_1.Transform3D.type);
+        if (!this.transform) {
+            this.error("App Object does not have a Transform3D Entity");
+        }
+    }
+    updatePosition(pick) {
+        if (!this.transform)
+            return;
+        const originalPickOffset = this.transform.localPointToWorld(this.pickOffset);
+        const movement = ValueObjects_1.Vector3.Subtract(pick, originalPickOffset);
+        let wPos = ValueObjects_1.Vector3.Add(movement, this.transform.worldPosition);
+        if (this.minX !== undefined && wPos.x < this.minX) {
+            wPos = new ValueObjects_1.Vector3(this.minX, wPos.y, wPos.z);
+        }
+        if (this.maxX !== undefined && wPos.x > this.maxX) {
+            wPos = new ValueObjects_1.Vector3(this.maxX, wPos.y, wPos.z);
+        }
+        if (this.minY !== undefined && wPos.y < this.minY) {
+            wPos = new ValueObjects_1.Vector3(wPos.x, this.minY, wPos.z);
+        }
+        if (this.maxY !== undefined && wPos.y > this.maxY) {
+            wPos = new ValueObjects_1.Vector3(wPos.x, this.maxY, wPos.z);
+        }
+        this.transform.worldPosition = wPos;
+    }
+    updateScale(ray, pick) {
+        if (!this.transform)
+            return;
+        const rayLength = ValueObjects_1.ParametricLine.GetDistanceToPoint(ray, pick);
+        const rayDelta = rayLength - this.lastRayLength;
+        const localPickOffset = this.transform.worldPointToLocal(pick);
+        const currentScale = this.transform.worldScale.x;
+        const scaleDelta = rayDelta * this.sensitivity * currentScale;
+        let newScale = currentScale + scaleDelta;
+        if (this.minScale !== undefined && newScale < this.minScale) {
+            newScale = this.minScale;
+        }
+        if (this.maxScale !== undefined && newScale > this.maxScale) {
+            newScale = this.maxScale;
+        }
+        this.transform.worldScale = new ValueObjects_1.Vector3(newScale, newScale, newScale);
+        const worldPickOffset = this.transform.localPointToWorld(localPickOffset);
+        const bump = ValueObjects_1.Vector3.Subtract(pick, worldPickOffset);
+        this.transform.worldPosition = ValueObjects_1.Vector3.Add(bump, this.transform.worldPosition);
+        this.lastRayLength = rayLength;
+    }
+}

package/lib/Components/Transform3D/UC/ScaleTransform.d.ts

@@ -0,0 +1,16 @@
+import { AppObject, AppObjectUC } from "../../../AppObject";
+import { ParametricLine, Vector2 } from "../../../ValueObjects";
+export declare abstract class ScaleTransformUC extends AppObjectUC {
+    static readonly type = "ScaleTransformUC";
+    abstract raySensitivity: number;
+    abstract pixelSensitivity: number;
+    abstract enabled: boolean;
+    abstract minScale?: number;
+    abstract maxScale?: number;
+    abstract initializeRay: (ray: ParametricLine) => void;
+    abstract updateRay: (ray: ParametricLine) => void;
+    abstract initializePixel: (pixel: Vector2) => void;
+    abstract updatePixel: (pixel: Vector2) => void;
+    abstract finish: () => void;
+}
+export declare function makeScaleTransformUC(appObject: AppObject): ScaleTransformUC;

package/lib/Components/Transform3D/UC/ScaleTransform.js

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeScaleTransformUC = exports.ScaleTransformUC = void 0;
+const AppObject_1 = require("../../../AppObject");
+const ValueObjects_1 = require("../../../ValueObjects");
+const Babylon_1 = require("../../Babylon");
+const Dispatcher_1 = require("../../Dispatcher");
+const Entities_1 = require("../Entities");
+class ScaleTransformUC extends AppObject_1.AppObjectUC {
+}
+exports.ScaleTransformUC = ScaleTransformUC;
+ScaleTransformUC.type = "ScaleTransformUC";
+function makeScaleTransformUC(appObject) {
+    return new ScaleTransformUCImp(appObject);
+}
+exports.makeScaleTransformUC = makeScaleTransformUC;
+class ScaleTransformUCImp extends ScaleTransformUC {
+    constructor(appObject) {
+        super(appObject, ScaleTransformUC.type);
+        this.raySensitivity = 1;
+        this.pixelSensitivity = 0.1;
+        this.enabled = true;
+        this.lastPosition = 0;
+        this.pickPoint = ValueObjects_1.Vector3.Zero();
+        this.initialScale = 1;
+        this.isScaling = false;
+        this.initializeRay = (ray) => {
+            this.lastPosition = ray.origin.z;
+            this.doInitialize(ray);
+        };
+        this.updateRay = (ray) => {
+            if (!this.isScaling)
+                return;
+            if (!this.transform)
+                return;
+            if (!this.enabled)
+                return;
+            const movement = this.lastPosition - ray.origin.z;
+            const currentScale = this.transform.worldScale.x;
+            const scaleDelta = movement * this.raySensitivity * currentScale;
+            this.bumpScaleAboutPoint(scaleDelta, this.pickPoint);
+            this.lastPosition = ray.origin.z;
+        };
+        this.initializePixel = (initialPixelPos) => {
+            this.lastPosition = initialPixelPos.y;
+            const ray = Babylon_1.pixelToSceneRay(initialPixelPos, this.appObjects);
+            this.doInitialize(ray);
+        };
+        this.updatePixel = (pixelPosition) => {
+            if (!this.enabled)
+                return;
+            if (!this.transform)
+                return;
+            if (!this.isScaling)
+                return;
+            const pixelChange = pixelPosition.y - this.lastPosition;
+            this.lastPosition = pixelPosition.y;
+            const currentScale = this.transform.worldScale.x;
+            const scaleDelta = pixelChange * this.pixelSensitivity * currentScale;
+            this.bumpScaleAboutPoint(scaleDelta, this.pickPoint);
+        };
+        this.finish = () => {
+            if (!this.transform)
+                return;
+            if (!this.isScaling)
+                return;
+            if (this.initialScale !== this.transform.worldScale.x) {
+                Dispatcher_1.dispatchStateChange(this.appObjects);
+            }
+            this.isScaling = false;
+        };
+        this.bumpScaleAboutPoint = (amount, worldPoint) => {
+            if (!this.transform)
+                return;
+            const localPickOffset = this.transform.worldPointToLocal(worldPoint);
+            const currentScale = this.transform.worldScale.x;
+            let newScale = currentScale + amount;
+            if (this.minScale !== undefined && newScale < this.minScale) {
+                newScale = this.minScale;
+            }
+            if (this.maxScale !== undefined && newScale > this.maxScale) {
+                newScale = this.maxScale;
+            }
+            this.transform.worldScale = new ValueObjects_1.Vector3(newScale, newScale, newScale);
+            const worldPickOffset = this.transform.localPointToWorld(localPickOffset);
+            const bump = ValueObjects_1.Vector3.Subtract(worldPoint, worldPickOffset);
+            this.transform.worldPosition = ValueObjects_1.Vector3.Add(bump, this.transform.worldPosition);
+        };
+        this.transform = appObject.getComponent(Entities_1.Transform3D.type);
+        if (!this.transform) {
+            this.error("App Object does not have a Transform3D Entity");
+        }
+    }
+    doInitialize(ray) {
+        var _a;
+        this.isScaling = false;
+        if (!this.transform)
+            return;
+        const pick = Babylon_1.sceneRayPick(ray, this.appObjects);
+        this.pickPoint = (_a = pick === null || pick === void 0 ? void 0 : pick.worldPickPoint) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
+        this.initialScale = this.transform.worldScale.x;
+        this.isScaling = true;
+    }
+}

package/lib/Components/Transform3D/UC/index.d.ts

@@ -1,3 +1,9 @@
+export * from "./BumpTransformScaleAboutPixelPoint";
 export * from "./DragTransformUC";
+export * from "./MoveTransformUndoRedo";
+export * from "./PanTransformUC";
+export * from "./PinchTransform";
+export * from "./RayPanScaleTransform";
+export * from "./ScaleTransform";
 export * from "./StickTransformUC";
 export * from "./StylusMoveTransformUC";

package/lib/Components/Transform3D/UC/index.js

@@ -10,6 +10,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./BumpTransformScaleAboutPixelPoint"), exports);
 __exportStar(require("./DragTransformUC"), exports);
+__exportStar(require("./MoveTransformUndoRedo"), exports);
+__exportStar(require("./PanTransformUC"), exports);
+__exportStar(require("./PinchTransform"), exports);
+__exportStar(require("./RayPanScaleTransform"), exports);
+__exportStar(require("./ScaleTransform"), exports);
 __exportStar(require("./StickTransformUC"), exports);
 __exportStar(require("./StylusMoveTransformUC"), exports);

package/lib/Components/Transform3D/index.d.ts

@@ -1,3 +1,5 @@
+export * from "./Controllers";
 export * from "./Entities";
+export * from "./Mocks";
 export * from "./UC";
 export * from "./PM";

package/lib/Components/Transform3D/index.js

@@ -10,6 +10,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Controllers"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Mocks"), exports);
 __exportStar(require("./UC"), exports);
 __exportStar(require("./PM"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vived/app",
-  "version": "4.13.0",
+  "version": "4.14.0",
   "description": "Public package for the VIVED Learning App system",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",