@vived/app 4.1.0 → 4.3.0

package/lib/UseCases/SceneObjects/PeelSceneObject.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PeelSceneObject = void 0;
+const ValueObjects_1 = require("../../ValueObjects");
+class PeelSceneObject {
+    constructor(babylon, sceneObjectRepo) {
+        this.babylon = babylon;
+        this.sceneObjectRepo = sceneObjectRepo;
+        this._didPeel = false;
+        this._peelingSceneObject = undefined;
+        this._peelPlane = ValueObjects_1.ParametricPlane.XY();
+        this._allowPeel = false;
+        this._pickOffset = ValueObjects_1.Vector3.Zero();
+        this.tryInitializePeel = (pickRay) => {
+            var _a, _b;
+            this._allowPeel = false;
+            this._didPeel = false;
+            this._peelingSceneObject = undefined;
+            const sceneObjectID = this.babylon.sceneObjectRayPick(pickRay);
+            if (!sceneObjectID)
+                return;
+            const sceneObject = this.sceneObjectRepo.get(sceneObjectID);
+            if (!sceneObject)
+                return;
+            this._peelingSceneObject = sceneObject;
+            const scenePick = this.babylon.sceneRayPick(pickRay);
+            if (!scenePick)
+                return;
+            const pickPlaneDirection = ValueObjects_1.Vector3.Backward();
+            const planePickPos = (_a = scenePick.worldPickPoint) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
+            this._peelPlane = ValueObjects_1.ParametricPlane.FromPointNormal(planePickPos, pickPlaneDirection);
+            const pick = (_b = this._peelPlane.intersectLine(pickRay)) !== null && _b !== void 0 ? _b : ValueObjects_1.Vector3.Zero();
+            this._rootPos = this._peelingSceneObject.transform.worldPosition;
+            this._pickOffset = ValueObjects_1.Vector3.Subtract(this._rootPos, pick);
+            this._allowPeel = true;
+        };
+        this.updatePeel = (pickRay) => {
+            var _a;
+            if (!this._allowPeel)
+                return;
+            if (!this._peelingSceneObject)
+                return;
+            const pick = (_a = this._peelPlane.intersectLine(pickRay)) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
+            this._peelingSceneObject.transform.worldPosition = ValueObjects_1.Vector3.Add(pick, this._pickOffset);
+            this._didPeel = true;
+        };
+        this.stopPeel = () => {
+            this._allowPeel = false;
+            this._didPeel = false;
+            this._peelingSceneObject = undefined;
+            this._rootPos = undefined;
+        };
+    }
+    get didPeel() {
+        return this._didPeel;
+    }
+    get peelingSceneObject() {
+        return this._peelingSceneObject;
+    }
+}
+exports.PeelSceneObject = PeelSceneObject;

package/lib/UseCases/SceneObjects/index.d.ts

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

package/lib/UseCases/SceneObjects/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("./PeelSceneObject"), exports);

package/lib/UseCases/SceneRoot/SerializeSceneRoot.d.ts

@@ -0,0 +1,33 @@
+import { SerializedSystem, StateMachine } from "../../Entities";
+import { SceneRoot } from "../../Entities/SceneRoot";
+export declare class SerializeSceneRoot implements SerializedSystem {
+    name: string;
+    seriliziationVersion: number;
+    private sceneRoot;
+    private stateMachine;
+    getSystemState(): object;
+    applySystemState(serializedState: object, version: number, transitionTime: number): void;
+    applyDefaultState(transitionDuration: number): void;
+    private applyV2Data;
+    private applyV1Data;
+    constructor(sceneRoot: SceneRoot, stateMachine: StateMachine);
+}
+export interface SceneRootDataV1 {
+    position: [number, number, number];
+    rotation: [number, number, number, number];
+    scale: [number, number, number];
+}
+export interface SceneRootDataV2 {
+    position: {
+        x: number;
+        y: number;
+        z: number;
+    };
+    rotation: {
+        x: number;
+        y: number;
+        z: number;
+        w: number;
+    };
+    scale: number;
+}

package/lib/UseCases/SceneRoot/SerializeSceneRoot.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SerializeSceneRoot = void 0;
+const ValueObjects_1 = require("../../ValueObjects");
+class SerializeSceneRoot {
+    constructor(sceneRoot, stateMachine) {
+        this.name = "sceneRoot";
+        this.seriliziationVersion = 2;
+        this.sceneRoot = sceneRoot;
+        this.stateMachine = stateMachine;
+        stateMachine.registerSerializedSystem(this);
+    }
+    getSystemState() {
+        const data = {
+            position: this.sceneRoot.position.dto,
+            rotation: this.sceneRoot.rotation.dto,
+            scale: this.sceneRoot.scale,
+        };
+        return data;
+    }
+    applySystemState(serializedState, version, transitionTime) {
+        try {
+            if (version === 1) {
+                const castState = serializedState;
+                this.applyV1Data(castState, transitionTime);
+            }
+            else if (version === 2) {
+                const castState = serializedState;
+                this.applyV2Data(castState, transitionTime);
+            }
+            else {
+                console.warn(`[SerializeSceneRoot] Unsupported version number ${version}. Defaulting`);
+                this.applyDefaultState(transitionTime);
+            }
+        }
+        catch (e) {
+            console.warn(`[SerializeSceneRoot] Caught when deserializing ${e}. Defaulting`);
+            this.applyDefaultState(transitionTime);
+        }
+    }
+    applyDefaultState(transitionDuration) {
+        this.sceneRoot.lerpToDefault(transitionDuration * 1000, this.stateMachine.transitionEaseFunction);
+    }
+    applyV2Data(data, transitionTime) {
+        if (!this.sceneRoot.sceneObject) {
+            console.warn("[SerializeSceneRoot] scene root does not have a scene object");
+            return {};
+        }
+        const pos = ValueObjects_1.Vector3.FromDTO(data.position);
+        const rot = ValueObjects_1.Quaternion.FromDTO(data.rotation);
+        const scale = new ValueObjects_1.Vector3(data.scale, data.scale, data.scale);
+        const rootTransform = this.sceneRoot.sceneObject.transform;
+        rootTransform.lerp(transitionTime * 1000, this.stateMachine.transitionEaseFunction, pos, rot, scale);
+    }
+    applyV1Data(data, transitionTime) {
+        if (!this.sceneRoot.sceneObject) {
+            console.warn("[SerializeSceneRoot] scene root does not have a scene object");
+            return {};
+        }
+        const pos = ValueObjects_1.Vector3.FromArray(data.position);
+        const rot = ValueObjects_1.Quaternion.FromArray(data.rotation);
+        const scale = ValueObjects_1.Vector3.FromArray(data.scale);
+        const rootTransform = this.sceneRoot.sceneObject.transform;
+        rootTransform.lerp(transitionTime * 1000, this.stateMachine.transitionEaseFunction, pos, rot, scale);
+    }
+}
+exports.SerializeSceneRoot = SerializeSceneRoot;

package/lib/UseCases/SceneRoot/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./SerializeSceneRoot";
+export * from "./setupSceneRoot";

package/lib/UseCases/SceneRoot/index.js

@@ -0,0 +1,14 @@
+"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("./SerializeSceneRoot"), exports);
+__exportStar(require("./setupSceneRoot"), exports);

package/lib/UseCases/SceneRoot/setupSceneRoot.d.ts

@@ -0,0 +1,2 @@
+import { DefaultSceneRootData, SceneObjectsRepo, SceneRoot } from "../../Entities";
+export declare function setupSceneRoot(defaultData: DefaultSceneRootData, sceneRoot: SceneRoot, sceneObjectRepo: SceneObjectsRepo): void;

package/lib/UseCases/SceneRoot/setupSceneRoot.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupSceneRoot = void 0;
+const Entities_1 = require("../../Entities");
+function setupSceneRoot(defaultData, sceneRoot, sceneObjectRepo) {
+    sceneRoot.applyDefaultData(defaultData);
+    const so = Entities_1.makeSceneObject(Entities_1.SCENE_ROOT_ID);
+    sceneRoot.sceneObject = so;
+    sceneObjectRepo.add(Entities_1.SCENE_ROOT_ID, so);
+}
+exports.setupSceneRoot = setupSceneRoot;

package/lib/UseCases/index.d.ts

@@ -0,0 +1,7 @@
+export * from "./setDevicePreview";
+export * from "./Handlers";
+export * from "./QuestionChallenge";
+export * from "./LerpVector3";
+export * from "./HoverLabels/trySetHoverLabel";
+export * from "./HoverLabels/SerializeAllowHoverLabel";
+export * from "./setupStandardAppObjects";

package/lib/UseCases/index.js

@@ -0,0 +1,19 @@
+"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("./setDevicePreview"), exports);
+__exportStar(require("./Handlers"), exports);
+__exportStar(require("./QuestionChallenge"), exports);
+__exportStar(require("./LerpVector3"), exports);
+__exportStar(require("./HoverLabels/trySetHoverLabel"), exports);
+__exportStar(require("./HoverLabels/SerializeAllowHoverLabel"), exports);
+__exportStar(require("./setupStandardAppObjects"), exports);

package/lib/UseCases/setDevicePreview.d.ts

@@ -0,0 +1,2 @@
+import { DevicePreview } from "../Entities";
+export declare function makeSetDevicePreview(devicePreview: DevicePreview): (x: number, y: number) => void;

package/lib/UseCases/setDevicePreview.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeSetDevicePreview = void 0;
+function makeSetDevicePreview(devicePreview) {
+    return function setDevicePreview(x, y) {
+        if (x <= 0 || y <= 0) {
+            devicePreview.clearDevicePreview();
+        }
+        else {
+            devicePreview.setDevicePreview(x, y);
+        }
+    };
+}
+exports.makeSetDevicePreview = makeSetDevicePreview;

package/lib/UseCases/setupStandardAppObjects.d.ts

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

package/lib/UseCases/setupStandardAppObjects.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupStandardAppObjects = void 0;
+const ChannelModel_1 = require("../AppObjectComponents/ChannelModel");
+function setupStandardAppObjects(appObjects) {
+    const appObj = appObjects.getOrCreate("StandardAppObjects");
+    ChannelModel_1.ChannelModelRepo.addToAO(appObj);
+    return appObj;
+}
+exports.setupStandardAppObjects = setupStandardAppObjects;

package/package.json

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

package/lib/Components/App/UC/submitError.d.ts

@@ -1,2 +0,0 @@
-import { AppObjectRepo } from "../../../AppObject/AppObjectRepo";
-export declare function submitError(sender: string, message: string, appObjects: AppObjectRepo, showAlert?: boolean): void;

package/lib/Components/App/UC/submitError.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.submitError = void 0;
-const Dispatcher_1 = require("../../Dispatcher");
-const LogUC_1 = require("../../Dispatcher/UC/LogUC");
-function submitError(sender, message, appObjects, showAlert = true) {
-    const logUC = LogUC_1.LogUC.get(appObjects);
-    if (logUC) {
-        logUC.error(sender, message);
-    }
-    else {
-        console.error(`[${sender}]: ${message}`);
-    }
-    if (!showAlert)
-        return;
-    const alert = Dispatcher_1.ShowAlertUC.get(appObjects);
-    if (!alert)
-        return;
-    alert.showAlert({
-        title: "Error",
-        closeButtonLabel: "Close",
-        closeCallback: () => {
-            // done
-        },
-        message: `[${sender}]: ${message}`
-    });
-}
-exports.submitError = submitError;

package/lib/Components/App/UC/submitFatal.d.ts

@@ -1,2 +0,0 @@
-import { AppObjectRepo } from "../../../AppObject/AppObjectRepo";
-export declare function submitFatal(sender: string, message: string, appObjects: AppObjectRepo, showAlert?: boolean): void;

package/lib/Components/App/UC/submitFatal.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.submitFatal = void 0;
-const Dispatcher_1 = require("../../Dispatcher");
-const LogUC_1 = require("../../Dispatcher/UC/LogUC");
-function submitFatal(sender, message, appObjects, showAlert = true) {
-    const logUC = LogUC_1.LogUC.get(appObjects);
-    if (logUC) {
-        logUC.fatal(sender, message);
-    }
-    else {
-        console.error(`[${sender}]: ${message}`);
-    }
-    if (!showAlert)
-        return;
-    const alert = Dispatcher_1.ShowAlertUC.get(appObjects);
-    if (!alert)
-        return;
-    alert.showAlert({
-        title: "Fatal Error",
-        closeButtonLabel: "Close",
-        closeCallback: () => {
-            // done
-        },
-        message: `[${sender}]: ${message}`
-    });
-}
-exports.submitFatal = submitFatal;

package/lib/Components/App/UC/submitLog.d.ts

@@ -1,2 +0,0 @@
-import { AppObjectRepo } from "../../../AppObject/AppObjectRepo";
-export declare function submitLog(sender: string, message: string, appObjects: AppObjectRepo, showAlert?: boolean): void;

package/lib/Components/App/UC/submitLog.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.submitLog = void 0;
-const Dispatcher_1 = require("../../Dispatcher");
-const LogUC_1 = require("../../Dispatcher/UC/LogUC");
-function submitLog(sender, message, appObjects, showAlert = false) {
-    const logUC = LogUC_1.LogUC.get(appObjects);
-    if (logUC) {
-        logUC.log(sender, message);
-    }
-    else {
-        console.log(`[${sender}]: ${message}`);
-    }
-    if (!showAlert)
-        return;
-    const alert = Dispatcher_1.ShowAlertUC.get(appObjects);
-    if (!alert)
-        return;
-    alert.showAlert({
-        title: "Log",
-        closeButtonLabel: "Close",
-        closeCallback: () => {
-            // done
-        },
-        message: `[${sender}]: ${message}`
-    });
-}
-exports.submitLog = submitLog;

package/lib/Components/App/UC/submitWarning.d.ts

@@ -1,2 +0,0 @@
-import { AppObjectRepo } from "../../../AppObject/AppObjectRepo";
-export declare function submitWarning(sender: string, message: string, appObjects: AppObjectRepo, showAlert?: boolean): void;

package/lib/Components/App/UC/submitWarning.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.submitWarning = void 0;
-const Dispatcher_1 = require("../../Dispatcher");
-const LogUC_1 = require("../../Dispatcher/UC/LogUC");
-function submitWarning(sender, message, appObjects, showAlert = false) {
-    const logUC = LogUC_1.LogUC.get(appObjects);
-    if (logUC) {
-        logUC.warn(sender, message);
-    }
-    else {
-        console.warn(`[${sender}]: ${message}`);
-    }
-    if (!showAlert)
-        return;
-    const alert = Dispatcher_1.ShowAlertUC.get(appObjects);
-    if (!alert)
-        return;
-    alert.showAlert({
-        title: "Warning",
-        closeButtonLabel: "Close",
-        closeCallback: () => {
-            // done
-        },
-        message: `[${sender}]: ${message}`
-    });
-}
-exports.submitWarning = submitWarning;

package/lib/Components/Camera/Factory/CameraFactoryImp.d.ts

@@ -1,4 +0,0 @@
-import { AppObject } from "@vived/app";
-import { EntityContext } from "Entities/EntityContext";
-import { CameraFactory } from "../Entities/CameraFactory";
-export declare function makeCameraFactory(appObject: AppObject, entities: EntityContext): CameraFactory;

package/lib/Components/Camera/Factory/CameraFactoryImp.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeCameraFactory = void 0;
-const AppObjectComponents_1 = require("@vived/app/lib/AppObjectComponents");
-const CameraEntity_1 = require("../Entities/CameraEntity");
-const CameraFactory_1 = require("../Entities/CameraFactory");
-const CameraPM_1 = require("../PM/CameraPM");
-function makeCameraFactory(appObject, entities) {
-    return new CameraFactoryImp(appObject, entities);
-}
-exports.makeCameraFactory = makeCameraFactory;
-class CameraFactoryImp extends CameraFactory_1.CameraFactory {
-    constructor(appObject, entities) {
-        super(appObject, CameraFactory_1.CameraFactory.type);
-        this.entities = entities;
-        this.setupCamera = () => {
-            const appObjects = this.entities.appObjects;
-            const cameraEntityAo = appObjects.getOrCreate(CameraFactory_1.CameraFactory.entityAppObjectId);
-            new AppObjectComponents_1.Transform3D(cameraEntityAo);
-            const cameraEntity = CameraEntity_1.makeCameraEntity(cameraEntityAo);
-            CameraPM_1.makeCameraPM(cameraEntityAo);
-            return cameraEntity;
-        };
-    }
-}

package/lib/Components/Dispatcher/Mocks/MockLogUC.d.ts

@@ -1,10 +0,0 @@
-/// <reference types="jest" />
-import { AppObject } from "../../../AppObject/AppObject";
-import { LogUC } from "../UC/LogUC";
-export declare class MockLogUC extends LogUC {
-    log: jest.Mock<any, any>;
-    warn: jest.Mock<any, any>;
-    error: jest.Mock<any, any>;
-    fatal: jest.Mock<any, any>;
-    constructor(appObject: AppObject);
-}

package/lib/Components/Dispatcher/Mocks/MockLogUC.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockLogUC = void 0;
-const LogUC_1 = require("../UC/LogUC");
-class MockLogUC extends LogUC_1.LogUC {
-    constructor(appObject) {
-        super(appObject, LogUC_1.LogUC.type);
-        this.log = jest.fn();
-        this.warn = jest.fn();
-        this.error = jest.fn();
-        this.fatal = jest.fn();
-    }
-}
-exports.MockLogUC = MockLogUC;

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

@@ -1,2 +0,0 @@
-export * from "./setupTool";
-export * from "./setupToolRepo";

package/lib/Components/Tools/Factory/setupTool.d.ts

@@ -1,3 +0,0 @@
-import { AppObjectRepo } from "../../../AppObject/AppObjectRepo";
-import { ToolData, ToolEntity } from "../Entities/ToolEntity";
-export declare function setupTool<ToolTypes>(toolData: ToolData<ToolTypes>, appObjects: AppObjectRepo): ToolEntity<ToolTypes>;

package/lib/Components/Tools/Factory/setupTool.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupTool = void 0;
-const ToolEntity_1 = require("../Entities/ToolEntity");
-const ToolPM_1 = require("../PM/ToolPM");
-function setupTool(toolData, appObjects) {
-    const tool = appObjects.getOrCreate(toolData.label);
-    const toolEntity = ToolEntity_1.makeToolEntity(toolData, tool);
-    const pm = new ToolPM_1.ToolPM(tool);
-    return toolEntity;
-}
-exports.setupTool = setupTool;

package/lib/Components/Tools/Factory/setupToolRepo.d.ts

@@ -1,4 +0,0 @@
-import { AppObjectRepo } from "../../../AppObject/AppObjectRepo";
-import { ToolData } from "../Entities/ToolEntity";
-import { ToolRepository } from "../Entities/ToolRepository";
-export declare function setupToolRepo<ToolTypes>(data: ToolData<ToolTypes>[], appObjects: AppObjectRepo): ToolRepository<ToolTypes>;

package/lib/Components/Tools/Factory/setupToolRepo.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupToolRepo = void 0;
-const ToolHotkeys_1 = require("../Controller/ToolHotkeys");
-const ToolRepository_1 = require("../Entities/ToolRepository");
-function setupToolRepo(data, appObjects) {
-    const toolRepo = appObjects.getOrCreate("ToolRepo");
-    const entity = ToolRepository_1.makeToolRepo(toolRepo);
-    entity.setupToolsFromData(data);
-    new ToolHotkeys_1.ToolHotkeys(toolRepo);
-    return entity;
-}
-exports.setupToolRepo = setupToolRepo;