@vived/app 4.29.0 → 4.31.0

package/lib/Components/Stylus/index.js

@@ -12,6 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Adapters"), exports);
 __exportStar(require("./Entity"), exports);
+__exportStar(require("./Factories"), exports);
 __exportStar(require("./Mocks"), exports);
 __exportStar(require("./PMs"), exports);
 __exportStar(require("./UCs"), exports);

package/lib/Components/Tools/Factories/index.d.ts

@@ -0,0 +1 @@
+export * from "./setupTools";

package/lib/Components/Tools/Factories/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./setupTools"), exports);

package/lib/Components/Tools/Factories/setupTools.d.ts

@@ -0,0 +1,3 @@
+import { AppObject, AppObjectRepo } from "../../../AppObject";
+import { ToolData } from "../Entities";
+export declare function setupTools(appObjects: AppObjectRepo, toolData: ToolData[]): AppObject;

package/lib/Components/Tools/Factories/setupTools.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupTools = void 0;
+const Controller_1 = require("../Controller");
+const Entities_1 = require("../Entities");
+const toolFactory_1 = require("./toolFactory");
+function setupTools(appObjects, toolData) {
+    const ao = appObjects.getOrCreate("ToolRepo");
+    const toolRepo = Entities_1.makeToolRepo(ao);
+    toolRepo.toolFactory = toolFactory_1.makeToolFactory(appObjects);
+    toolRepo.setupToolsFromData(toolData);
+    new Controller_1.ToolHotkeys(ao);
+    return ao;
+}
+exports.setupTools = setupTools;

package/lib/Components/Tools/Factories/toolFactory.d.ts

@@ -0,0 +1,3 @@
+import { AppObjectRepo } from "../../../AppObject";
+import { ToolEntity } from "../Entities";
+export declare function makeToolFactory(appObjects: AppObjectRepo): (id: string) => ToolEntity;

package/lib/Components/Tools/Factories/toolFactory.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeToolFactory = void 0;
+const Entities_1 = require("../Entities");
+const PM_1 = require("../PM");
+function makeToolFactory(appObjects) {
+    return function toolFactory(id) {
+        const ao = appObjects.getOrCreate(id);
+        const toolEntity = Entities_1.makeToolEntity(ao);
+        PM_1.makeToolPM(ao);
+        return toolEntity;
+    };
+}
+exports.makeToolFactory = makeToolFactory;

package/lib/Components/TouchController/Factories/index.d.ts

@@ -0,0 +1 @@
+export * from "./setupTouchInput";

package/lib/Components/TouchController/Factories/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./setupTouchInput"), exports);

package/lib/Components/TouchController/Factories/setupTouchInput.d.ts

@@ -0,0 +1,2 @@
+import { AppObjectRepo } from "../../../AppObject";
+export declare function setupTouchInput(appObject: AppObjectRepo): void;

package/lib/Components/TouchController/Factories/setupTouchInput.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupTouchInput = void 0;
+const Entities_1 = require("../Entities");
+function setupTouchInput(appObject) {
+    const ao = appObject.getOrCreate("TouchInput");
+    Entities_1.makeTouchInput(ao);
+}
+exports.setupTouchInput = setupTouchInput;

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

@@ -1,5 +1,7 @@
 import { AppObject, AppObjectRepo, AppObjectUC } from "../../../AppObject";
-import { ParametricLine, Vector2 } from "../../../ValueObjects";
+import { ParametricLine, ParametricPlane, Vector2, Vector3 } from "../../../ValueObjects";
+import { UndoRedoEntity } from "../../UndoRedo";
+import { Transform3D } from "../Entities";
 export declare abstract class PanTransformUC extends AppObjectUC {
     static readonly type = "PanTransformUC";
     abstract minX?: number;
@@ -18,3 +20,28 @@ export declare abstract class PanTransformUC extends AppObjectUC {
     static get(id: string, appObjects: AppObjectRepo): PanTransformUC | undefined;
 }
 export declare function makePanTransformUC(appObject: AppObject): PanTransformUC;
+export declare class PanTransformUCImp extends PanTransformUC {
+    minX?: number | undefined;
+    maxX?: number | undefined;
+    minY?: number | undefined;
+    maxY?: number | undefined;
+    enabled: boolean;
+    protected panPlane: ParametricPlane;
+    dispatchStateChangeOnComplete: boolean;
+    submitUndoOnComplete: boolean;
+    protected pickOffset: Vector3;
+    protected initialPosition: Vector3;
+    protected hasBeenInitialized: boolean;
+    protected get transformNode(): Transform3D | undefined;
+    protected get undoRedo(): UndoRedoEntity | undefined;
+    protected get dispatchStateChange(): (() => void) | undefined;
+    initializePixel: (initialPixelPos: Vector2) => void;
+    updatePixel: (pixelPosition: Vector2) => void;
+    initializeRay: (ray: ParametricLine) => void;
+    updateRay: (ray: ParametricLine) => void;
+    protected enforceBoundaries(wPos: Vector3): Vector3;
+    finish: () => void;
+    protected submitDispatchAndUndo(): void;
+    cancelPan: () => void;
+    constructor(appObject: AppObject);
+}

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

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makePanTransformUC = exports.PanTransformUC = void 0;
+exports.PanTransformUCImp = exports.makePanTransformUC = exports.PanTransformUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const ValueObjects_1 = require("../../../ValueObjects");
 const Babylon_1 = require("../../Babylon");
 const Dispatcher_1 = require("../../Dispatcher");
 const UndoRedo_1 = require("../../UndoRedo");
 const Entities_1 = require("../Entities");
-const MoveTransformUndoRedo_1 = require("./MoveTransformUndoRedo");
 class PanTransformUC extends AppObject_1.AppObjectUC {
     static get(id, appObjects) {
         var _a;
@@ -49,7 +48,7 @@ class PanTransformUCImp extends PanTransformUC {
             const rootPos = this.transformNode.worldPosition;
             this.pickOffset = ValueObjects_1.Vector3.Subtract(rootPos, pick);
             this.hasBeenInitialized = true;
-            this.initialPosition = this.transformNode.worldPosition;
+            this.initialPosition = this.transformNode.localPosition;
         };
         this.updateRay = (ray) => {
             var _a;
@@ -60,44 +59,17 @@ class PanTransformUCImp extends PanTransformUC {
             if (!this.enabled)
                 return;
             const pick = (_a = this.panPlane.intersectLine(ray)) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
-            let wPos = ValueObjects_1.Vector3.Add(pick, this.pickOffset);
-            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.transformNode.worldPosition = wPos;
+            const wPos = ValueObjects_1.Vector3.Add(pick, this.pickOffset);
+            const clampedPos = this.enforceBoundaries(wPos);
+            this.transformNode.worldPosition = clampedPos;
         };
         this.finish = () => {
-            var _a, _b;
-            if (!this.transformNode)
-                return;
             if (!this.hasBeenInitialized)
                 return;
             if (!this.enabled)
                 return;
             this.hasBeenInitialized = false;
-            if (ValueObjects_1.Vector3.Equal(this.initialPosition, (_a = this.transformNode) === null || _a === void 0 ? void 0 : _a.worldPosition))
-                return;
-            if (this.dispatchStateChangeOnComplete) {
-                Dispatcher_1.dispatchStateChange(this.appObjects);
-            }
-            if (this.submitUndoOnComplete) {
-                const undoDTO = {
-                    endPosition: this.transformNode.localPosition,
-                    endRotation: this.transformNode.localRotation,
-                    startPosition: this.initialPosition,
-                    startRotation: this.transformNode.localRotation,
-                };
-                (_b = this.undoRedo) === null || _b === void 0 ? void 0 : _b.submitAction(new MoveTransformUndoRedo_1.MoveTransformUndoRedo(undoDTO, this.transformNode, this.appObjects));
-            }
+            this.submitDispatchAndUndo();
         };
         this.cancelPan = () => {
             this.hasBeenInitialized = false;
@@ -109,4 +81,50 @@ class PanTransformUCImp extends PanTransformUC {
     get undoRedo() {
         return this.getCachedSingleton(UndoRedo_1.UndoRedoEntity.type);
     }
+    get dispatchStateChange() {
+        var _a;
+        return (_a = this.getCachedSingleton(Dispatcher_1.DispatchStateChangeUC.type)) === null || _a === void 0 ? void 0 : _a.doDispatch;
+    }
+    enforceBoundaries(wPos) {
+        let pos = wPos;
+        if (this.minX !== undefined && pos.x < this.minX) {
+            pos = new ValueObjects_1.Vector3(this.minX, pos.y, pos.z);
+        }
+        if (this.maxX !== undefined && pos.x > this.maxX) {
+            pos = new ValueObjects_1.Vector3(this.maxX, pos.y, pos.z);
+        }
+        if (this.minY !== undefined && pos.y < this.minY) {
+            pos = new ValueObjects_1.Vector3(pos.x, this.minY, pos.z);
+        }
+        if (this.maxY !== undefined && pos.y > this.maxY) {
+            pos = new ValueObjects_1.Vector3(pos.x, this.maxY, pos.z);
+        }
+        return pos;
+    }
+    submitDispatchAndUndo() {
+        var _a;
+        const dispatch = this.dispatchStateChange;
+        const transform = this.transformNode;
+        if (!transform || !dispatch)
+            return;
+        if (ValueObjects_1.Vector3.Equal(this.initialPosition, transform.localPosition))
+            return;
+        if (this.dispatchStateChangeOnComplete) {
+            dispatch();
+        }
+        if (this.submitUndoOnComplete) {
+            const redoPos = transform.localPosition;
+            (_a = this.undoRedo) === null || _a === void 0 ? void 0 : _a.submitAction({
+                undoAction: () => {
+                    transform.localPosition = this.initialPosition;
+                    dispatch();
+                },
+                redoAction: () => {
+                    transform.localPosition = redoPos;
+                    dispatch();
+                },
+            });
+        }
+    }
 }
+exports.PanTransformUCImp = PanTransformUCImp;

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

@@ -1,5 +1,6 @@
 import { AppObject, AppObjectUC } from "../../../AppObject";
 import { ParametricLine, Vector2 } from "../../../ValueObjects";
+import { SceneRayPickUC } from "../../Babylon";
 import { PanTransformUC } from "./PanTransformUC";
 export declare abstract class TryPanTransformUC extends AppObjectUC {
     static readonly type = "TryPanTransformUC";
@@ -14,8 +15,8 @@ export declare abstract class TryPanTransformUC extends AppObjectUC {
 export declare function makeTryPanTransformUC(appObject: AppObject): TryPanTransformUC;
 export declare class TryPanTransformUCImp extends TryPanTransformUC {
     protected panUC?: PanTransformUC;
-    private get pixelToRay();
-    private get rayPickUC();
+    protected get pixelToRay(): ((pixelPos: Vector2) => ParametricLine) | undefined;
+    protected get rayPickUC(): SceneRayPickUC | undefined;
     allow: () => boolean;
     tryWithPixel: (pixel: Vector2) => boolean;
     moveWithPixel: (pixel: Vector2) => void;

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

@@ -5,6 +5,5 @@ export * from "./PanTransformUC";
 export * from "./PinchTransform";
 export * from "./RayPanScaleTransform";
 export * from "./ScaleTransform";
-export * from "./StickTransformUC";
 export * from "./StylusMoveTransformUC";
 export * from "./TryPanTransformUC";

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

@@ -17,6 +17,5 @@ __exportStar(require("./PanTransformUC"), exports);
 __exportStar(require("./PinchTransform"), exports);
 __exportStar(require("./RayPanScaleTransform"), exports);
 __exportStar(require("./ScaleTransform"), exports);
-__exportStar(require("./StickTransformUC"), exports);
 __exportStar(require("./StylusMoveTransformUC"), exports);
 __exportStar(require("./TryPanTransformUC"), exports);

package/lib/Components/UndoRedo/Factories/index.d.ts

@@ -0,0 +1 @@
+export * from "./setupUndoRedo";

package/lib/Components/UndoRedo/Factories/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./setupUndoRedo"), exports);

package/lib/Components/UndoRedo/Factories/setupUndoRedo.d.ts

@@ -0,0 +1,2 @@
+import { AppObject, AppObjectRepo } from "../../../AppObject";
+export declare function setupUndoRedo(appObjects: AppObjectRepo): AppObject;

package/lib/Components/UndoRedo/Factories/setupUndoRedo.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupUndoRedo = void 0;
+const Entities_1 = require("../Entities");
+const PM_1 = require("../PM");
+const UCs_1 = require("../UCs");
+function setupUndoRedo(appObjects) {
+    const ao = appObjects.getOrCreate("UndoRedo");
+    // Entity
+    const undoRedo = Entities_1.makeUndoRedoEntity(ao);
+    // UCs
+    new UCs_1.UndoRedoToolStatesHook(ao);
+    // PMs
+    PM_1.makeHasUndoPM(ao);
+    PM_1.makeHasRedoPM(ao);
+    return ao;
+}
+exports.setupUndoRedo = setupUndoRedo;

package/lib/Components/UndoRedo/UCs/UndoRedoButtonStatesHook.d.ts

@@ -0,0 +1,11 @@
+import { AppObject, AppObjectUC } from "../../../AppObject";
+export declare class UndoRedoToolStatesHook extends AppObjectUC {
+    static type: string;
+    private get baseApp();
+    private get undoRedo();
+    private get toolRepo();
+    private undoTool?;
+    private redoTool?;
+    onUndoRedoChange: () => void;
+    constructor(appObject: AppObject);
+}

package/lib/Components/UndoRedo/UCs/UndoRedoButtonStatesHook.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UndoRedoToolStatesHook = void 0;
+const AppObject_1 = require("../../../AppObject");
+const BaseAppState_1 = require("../../BaseApp/Entity/BaseAppState");
+const Entities_1 = require("../../Tools/Entities");
+const Entities_2 = require("../Entities");
+class UndoRedoToolStatesHook extends AppObject_1.AppObjectUC {
+    constructor(appObject) {
+        var _a, _b, _c, _d;
+        super(appObject, UndoRedoToolStatesHook.type);
+        this.onUndoRedoChange = () => {
+            if (!this.baseApp)
+                return;
+            if (!this.undoRedo)
+                return;
+            if (this.redoTool) {
+                if (this.baseApp.isAuthoring) {
+                    this.redoTool.state = this.undoRedo.hasRedo
+                        ? Entities_1.ToolState.ENABLED
+                        : Entities_1.ToolState.DISABLED;
+                }
+                else {
+                    this.redoTool.state = Entities_1.ToolState.HIDDEN;
+                }
+            }
+            if (this.undoTool) {
+                if (this.baseApp.isAuthoring) {
+                    this.undoTool.state = this.undoRedo.hasUndo
+                        ? Entities_1.ToolState.ENABLED
+                        : Entities_1.ToolState.DISABLED;
+                }
+                else {
+                    this.undoTool.state = Entities_1.ToolState.HIDDEN;
+                }
+            }
+        };
+        this.undoTool = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.getTool("UNDO");
+        this.redoTool = (_b = this.toolRepo) === null || _b === void 0 ? void 0 : _b.getTool("REDO");
+        (_c = this.undoRedo) === null || _c === void 0 ? void 0 : _c.addChangeObserver(this.onUndoRedoChange);
+        (_d = this.baseApp) === null || _d === void 0 ? void 0 : _d.addChangeObserver(this.onUndoRedoChange);
+        this.onUndoRedoChange();
+    }
+    get baseApp() {
+        return this.getCachedSingleton(BaseAppState_1.BaseAppState.type);
+    }
+    get undoRedo() {
+        return this.getCachedSingleton(Entities_2.UndoRedoEntity.type);
+    }
+    get toolRepo() {
+        return this.getCachedSingleton(Entities_1.ToolRepository.type);
+    }
+}
+exports.UndoRedoToolStatesHook = UndoRedoToolStatesHook;
+UndoRedoToolStatesHook.type = "UndoRedoToolStatesHook";

package/lib/Components/UndoRedo/UCs/index.d.ts

@@ -0,0 +1 @@
+export * from "./UndoRedoButtonStatesHook";

package/lib/Components/UndoRedo/UCs/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./UndoRedoButtonStatesHook"), exports);

package/lib/Components/index.d.ts

@@ -25,6 +25,7 @@ export * from "./RequestHandler";
 export * from "./SceneRoot";
 export * from "./Selection";
 export * from "./StateMachine";
+export * from "./Stick";
 export * from "./StoredView";
 export * from "./Stylus";
 export * from "./ThemeColors";

package/lib/Components/index.js

@@ -37,6 +37,7 @@ __exportStar(require("./RequestHandler"), exports);
 __exportStar(require("./SceneRoot"), exports);
 __exportStar(require("./Selection"), exports);
 __exportStar(require("./StateMachine"), exports);
+__exportStar(require("./Stick"), exports);
 __exportStar(require("./StoredView"), exports);
 __exportStar(require("./Stylus"), exports);
 __exportStar(require("./ThemeColors"), exports);

package/package.json

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