@vived/app 2.50.1 → 3.0.0

package/lib/Entities/SceneModelMesh.d.ts

@@ -1,64 +1,23 @@
-import { Vector3, Vector3DTO } from "../ValueObjects";
 import { ObservableEntity } from "./ObservableEntity";
-import { SceneObject } from "./SceneObject";
-export declare enum Color {
-    GREEN = "Green",
-    PINK = "Pink",
-    YELLOW = "Yellow",
-    RED = "Red",
-    BLUE = "Blue",
-    WHITE = "White",
-    PURPLE = "Purple",
-    BLACK = "Black",
-    ORANGE = "Orange"
-}
-export interface SceneModelMeshStateDTO {
-    id: string;
-    shown: boolean;
-    position: Vector3DTO;
-    overlayColor: Color | undefined;
-}
 export declare abstract class SceneModelMesh extends ObservableEntity {
     abstract readonly id: string;
     abstract label: string;
     abstract meshPaths: string[];
-    abstract sceneObject: SceneObject | undefined;
-    abstract shown: boolean;
-    abstract position: Vector3;
-    abstract overlayColor: Color | undefined;
-    abstract get canBeStuck(): boolean;
-    abstract stick(durationMS: number, easeFn: (val: number) => number, onStickComplete?: () => void): void;
-    abstract moveTo(position: Vector3, durationMS: number, easeFn: (val: number) => number, onStickComplete?: () => void): void;
     abstract addMeshPath(path: string): void;
     abstract hasMeshPath(path: string): boolean;
     abstract removeMeshPath(path: string): void;
     abstract toData(): SceneModelObjectDTO;
     abstract applyData(data: SceneModelObjectDTO): void;
-    abstract getState(): SceneModelMeshStateDTO | null;
 }
 export declare function makeSceneModelMesh(id: string): SceneModelMeshImp;
 declare class SceneModelMeshImp extends SceneModelMesh {
     readonly id: string;
-    private _sceneObject;
-    get sceneObject(): SceneObject | undefined;
-    set sceneObject(so: SceneObject | undefined);
-    get position(): Vector3;
-    set position(p: Vector3);
-    private _overlayColor;
-    get overlayColor(): Color | undefined;
-    set overlayColor(overlayColor: Color | undefined);
-    get canBeStuck(): boolean;
-    moveTo(position: Vector3, durationMS: number, easeFn: (val: number) => number, onMoveComplete?: () => void): void;
-    stick: (durationMS: number, easeFn: (val: number) => number, onStickComplete?: (() => void) | undefined) => void;
-    get shown(): boolean;
-    set shown(s: boolean);
-    private _label;
-    get label(): string;
-    set label(label: string);
     private _meshPaths;
     get meshPaths(): string[];
     set meshPaths(paths: string[]);
-    getState(): SceneModelMeshStateDTO | null;
+    private memoizedLabel;
+    get label(): string;
+    set label(val: string);
     addMeshPath: (path: string) => void;
     hasMeshPath: (path: string) => boolean;
     removeMeshPath: (path: string) => void;

package/lib/Entities/SceneModelMesh.js

@@ -1,21 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeSceneModelMesh = exports.SceneModelMesh = exports.Color = void 0;
-const ValueObjects_1 = require("../ValueObjects");
+exports.makeSceneModelMesh = exports.SceneModelMesh = void 0;
 const MemoizedString_1 = require("./Memoized/MemoizedString");
 const ObservableEntity_1 = require("./ObservableEntity");
-var Color;
-(function (Color) {
-    Color["GREEN"] = "Green";
-    Color["PINK"] = "Pink";
-    Color["YELLOW"] = "Yellow";
-    Color["RED"] = "Red";
-    Color["BLUE"] = "Blue";
-    Color["WHITE"] = "White";
-    Color["PURPLE"] = "Purple";
-    Color["BLACK"] = "Black";
-    Color["ORANGE"] = "Orange";
-})(Color = exports.Color || (exports.Color = {}));
 class SceneModelMesh extends ObservableEntity_1.ObservableEntity {
 }
 exports.SceneModelMesh = SceneModelMesh;
@@ -26,12 +13,8 @@ exports.makeSceneModelMesh = makeSceneModelMesh;
 class SceneModelMeshImp extends SceneModelMesh {
     constructor(id) {
         super();
-        this._overlayColor = undefined;
-        this.stick = (durationMS, easeFn, onStickComplete) => {
-            this.moveTo(ValueObjects_1.Vector3.Zero(), durationMS, easeFn, onStickComplete);
-        };
-        this._label = new MemoizedString_1.MemoizedString("", this.notify);
         this._meshPaths = [];
+        this.memoizedLabel = new MemoizedString_1.MemoizedString("", this.notify);
         this.addMeshPath = (path) => {
             if (this._meshPaths.includes(path))
                 return;
@@ -63,89 +46,6 @@ class SceneModelMeshImp extends SceneModelMesh {
         };
         this.id = id;
     }
-    get sceneObject() {
-        return this._sceneObject;
-    }
-    set sceneObject(so) {
-        if (this._sceneObject) {
-            this._sceneObject.removeObserver(this.notify);
-        }
-        this._sceneObject = so;
-        if (this._sceneObject) {
-            this._sceneObject.addObserver(this.notify);
-        }
-    }
-    get position() {
-        if (!this._sceneObject) {
-            console.warn("Scene Mesh doea not have a scene object");
-            return ValueObjects_1.Vector3.Zero();
-        }
-        else {
-            return this._sceneObject.transform.localPosition;
-        }
-    }
-    set position(p) {
-        if (!this._sceneObject) {
-            console.warn("Scene Mesh doea not have a scene object");
-            return;
-        }
-        this._sceneObject.transform.localPosition = p;
-    }
-    get overlayColor() {
-        return this._overlayColor;
-    }
-    set overlayColor(overlayColor) {
-        if (this._overlayColor !== overlayColor) {
-            this._overlayColor = overlayColor;
-            this.notify();
-        }
-    }
-    get canBeStuck() {
-        if (!this._sceneObject) {
-            console.warn("Scene Mesh doea not have a scene object");
-            return false;
-        }
-        if (ValueObjects_1.Vector3.Equal(this._sceneObject.transform.localPosition, ValueObjects_1.Vector3.Zero())) {
-            return false;
-        }
-        else {
-            return true;
-        }
-    }
-    moveTo(position, durationMS, easeFn, onMoveComplete) {
-        if (!this._sceneObject) {
-            console.warn("Scene Mesh doea not have a scene object");
-            return;
-        }
-        if (ValueObjects_1.Vector3.Equal(position, this.position)) {
-            if (onMoveComplete)
-                onMoveComplete();
-            return;
-        }
-        this._sceneObject.transform.lerp(durationMS, easeFn, position, undefined, undefined, onMoveComplete);
-    }
-    get shown() {
-        if (!this._sceneObject) {
-            console.warn("Scene Mesh doea not have a scene object");
-            return false;
-        }
-        else {
-            return this._sceneObject.shown;
-        }
-    }
-    set shown(s) {
-        if (!this._sceneObject) {
-            console.warn("Scene Mesh doea not have a scene object");
-            return;
-        }
-        this._sceneObject.shown = s;
-    }
-    get label() {
-        return this._label.val;
-    }
-    set label(label) {
-        this._label.val = label;
-    }
     get meshPaths() {
         return [...this._meshPaths];
     }
@@ -166,17 +66,10 @@ class SceneModelMeshImp extends SceneModelMesh {
         this._meshPaths = paths;
         this.notify();
     }
-    getState() {
-        if (ValueObjects_1.Vector3.Equal(this.position, ValueObjects_1.Vector3.Zero()) && this.shown) {
-            return null;
-        }
-        else {
-            return {
-                id: this.id,
-                position: this.position.dto,
-                shown: this.shown,
-                overlayColor: this.overlayColor,
-            };
-        }
+    get label() {
+        return this.memoizedLabel.val;
+    }
+    set label(val) {
+        this.memoizedLabel.val = val;
     }
 }

package/lib/Types/ChannelModelData.d.ts

@@ -0,0 +1,68 @@
+export interface ChannelModelDataMeshDTOv1 {
+    version: number;
+    id: string;
+    meshPaths: string[];
+    label: string;
+}
+export interface ChannelModelDataMeshDTOv0 {
+    id: string;
+    meshPaths: string[];
+    label: string;
+}
+export declare type ChannelModelDTO = ChannelModelDTOv0 | ChannelModelDTOv1;
+export interface ChannelModelDTOv0 {
+    version: number;
+    objects: ChannelModelDataMeshDTOv0[];
+    name: string;
+    description: string;
+    bounds_min: {
+        x: number;
+        y: number;
+        z: number;
+    };
+    bounds_max: {
+        x: number;
+        y: number;
+        z: number;
+    };
+    defaultPosition: {
+        x: number;
+        y: number;
+        z: number;
+    };
+    defaultRotation: {
+        x: number;
+        y: number;
+        z: number;
+        w: number;
+    };
+    defaultScale: number;
+}
+export interface ChannelModelDTOv1 {
+    version: number;
+    objects: ChannelModelDataMeshDTOv1[];
+    name: string;
+    bounds_min: {
+        x: number;
+        y: number;
+        z: number;
+    };
+    bounds_max: {
+        x: number;
+        y: number;
+        z: number;
+    };
+    defaultPosition: {
+        x: number;
+        y: number;
+        z: number;
+    };
+    defaultRotation: {
+        x: number;
+        y: number;
+        z: number;
+        w: number;
+    };
+    defaultScale: number;
+}
+export declare function convertChannelModelDataV0toV1(v0: ChannelModelDTOv0): ChannelModelDTOv1;

package/lib/Types/ChannelModelData.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertChannelModelDataV0toV1 = void 0;
+function convertChannelModelDataV0toV1(v0) {
+    const { objects, name, bounds_max, bounds_min, defaultPosition, defaultRotation, defaultScale } = v0;
+    const objectsV2 = objects.map(obj => {
+        const { id, label, meshPaths } = obj;
+        return {
+            version: 1,
+            id, label, meshPaths
+        };
+    });
+    return {
+        version: 1,
+        objects: objectsV2,
+        name,
+        bounds_max,
+        bounds_min, defaultPosition, defaultRotation, defaultScale
+    };
+}
+exports.convertChannelModelDataV0toV1 = convertChannelModelDataV0toV1;

package/lib/Types/EaseFn.d.ts

@@ -0,0 +1 @@
+export declare type EaseFn = (p: number) => number;

package/lib/Types/EaseFn.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/Types/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./EaseFn";
+export * from "./ChannelModelData";

package/lib/Types/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("./EaseFn"), exports);
+__exportStar(require("./ChannelModelData"), exports);

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

@@ -1,5 +1,2 @@
 export * from "./modelDataLoader";
 export * from "./loadNewModel";
-export * from "./SerializeActiveModel";
-export * from "./SetMeshesEnabledHook";
-export * from "./SetSceneModelMeshOverlayColor";

package/lib/UseCases/SceneModel/index.js

@@ -12,6 +12,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./modelDataLoader"), exports);
 __exportStar(require("./loadNewModel"), exports);
-__exportStar(require("./SerializeActiveModel"), exports);
-__exportStar(require("./SetMeshesEnabledHook"), exports);
-__exportStar(require("./SetSceneModelMeshOverlayColor"), exports);

package/lib/UseCases/SceneModel/loadNewModel.d.ts

@@ -1,2 +1,2 @@
-import { AppDispatcher, SceneModel, SceneModelMeshStateDTO, SceneModelRepo, SceneObjectsRepo, SceneRoot } from "../../Entities";
-export declare function makeLoadNewModel(sceneModelRepo: SceneModelRepo, sceneObjectRepo: SceneObjectsRepo, sceneRoot: SceneRoot, appDispatcher: AppDispatcher): (modelID: string, initialStateLookup: Map<string, SceneModelMeshStateDTO>) => Promise<SceneModel>;
+import { AppDispatcher, SceneModel, SceneModelRepo, SceneObjectsRepo, SceneRoot } from "../../Entities";
+export declare function makeLoadNewModel(sceneModelRepo: SceneModelRepo, sceneObjectRepo: SceneObjectsRepo, sceneRoot: SceneRoot, appDispatcher: AppDispatcher): (modelID: string) => Promise<SceneModel>;

package/lib/UseCases/SceneModel/loadNewModel.js

@@ -11,9 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeLoadNewModel = void 0;
 const Entities_1 = require("../../Entities");
-const ValueObjects_1 = require("../../ValueObjects");
 function makeLoadNewModel(sceneModelRepo, sceneObjectRepo, sceneRoot, appDispatcher) {
-    return function loadNewModel(modelID, initialStateLookup) {
+    return function loadNewModel(modelID) {
         return __awaiter(this, void 0, void 0, function* () {
             let sceneModel = sceneModelRepo.get(modelID);
             if (sceneModel === undefined) {
@@ -39,21 +38,20 @@ function makeLoadNewModel(sceneModelRepo, sceneObjectRepo, sceneRoot, appDispatc
                 const dataDTO = yield sceneModelRepo.dataLoader(modelID);
                 sceneModel.applyData(dataDTO);
                 sceneModel.getAllMeshes().forEach((meshObject) => {
-                    var _a;
-                    let so = sceneObjectRepo.get(meshObject.id);
-                    if (!so) {
-                        so = Entities_1.makeSceneObject(meshObject.id);
-                        sceneObjectRepo.add(meshObject.id, so);
-                    }
-                    so.transform.parent = (_a = sceneRoot.sceneObject) === null || _a === void 0 ? void 0 : _a.transform;
-                    meshObject.sceneObject = so;
-                    const initialState = initialStateLookup.get(meshObject.id);
-                    meshObject.position = initialState
-                        ? ValueObjects_1.Vector3.FromDTO(initialState.position)
-                        : ValueObjects_1.Vector3.Zero();
-                    meshObject.shown = initialState ? initialState.shown : true;
-                    so.transform.localRotation = ValueObjects_1.Quaternion.Identity();
-                    so.transform.localScale = ValueObjects_1.Vector3.One();
+                    // let so = sceneObjectRepo.get(meshObject.id);
+                    // if (!so) {
+                    //   so = makeSceneObject(meshObject.id);
+                    //   sceneObjectRepo.add(meshObject.id, so);
+                    // }
+                    // so.transform.parent = sceneRoot.sceneObject?.transform;
+                    // meshObject.sceneObject = so;
+                    // const initialState = initialStateLookup.get(meshObject.id);
+                    // meshObject.position = initialState
+                    //   ? Vector3.FromDTO(initialState.position)
+                    //   : Vector3.Zero();
+                    // meshObject.shown = initialState ? initialState.shown : true;
+                    // so.transform.localRotation = Quaternion.Identity();
+                    // so.transform.localScale = Vector3.One();
                 });
                 yield sceneModelRepo.modelLoader(modelID);
                 sceneModel.state = Entities_1.SceneModelState.READY;

package/lib/UseCases/index.d.ts

@@ -2,8 +2,8 @@ export * from "./setDevicePreview";
 export * from "./Handlers";
 export * from "./QuestionChallenge";
 export * from "./SceneModel";
-export * from "./SceneObjects";
 export * from "./LerpVector3";
 export * from "./SceneRoot";
 export * from "./HoverLabels/trySetHoverLabel";
 export * from "./HoverLabels/SerializeAllowHoverLabel";
+export * from "./setupStandardAppObjects";

package/lib/UseCases/index.js

@@ -14,8 +14,8 @@ __exportStar(require("./setDevicePreview"), exports);
 __exportStar(require("./Handlers"), exports);
 __exportStar(require("./QuestionChallenge"), exports);
 __exportStar(require("./SceneModel"), exports);
-__exportStar(require("./SceneObjects"), exports);
 __exportStar(require("./LerpVector3"), exports);
 __exportStar(require("./SceneRoot"), exports);
 __exportStar(require("./HoverLabels/trySetHoverLabel"), exports);
 __exportStar(require("./HoverLabels/SerializeAllowHoverLabel"), exports);
+__exportStar(require("./setupStandardAppObjects"), exports);

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/lib/ValueObjects/Quaternion.d.ts

@@ -54,6 +54,7 @@ export declare class Quaternion {
      * @returns The resulting Quaterion
      */
     static FromAngleAxis(axis: Vector3, angle: Angle): Quaternion;
+    static FromDirectionVector(direction: Vector3): Quaternion;
     /**
      * Froms up a Quaternion from the Yaw-Pitch-Roll (Tait-Bryan) convetion
      * @param yaw defines the rotation around the y axis

package/lib/ValueObjects/Quaternion.js

@@ -4,7 +4,6 @@ exports.Quaternion = void 0;
 const Angle_1 = require("./Angle");
 const Matrix_1 = require("./Matrix");
 const Vector3_1 = require("./Vector3");
-;
 class Quaternion {
     constructor(x, y, z, w) {
         this.x = x;
@@ -100,6 +99,27 @@ class Quaternion {
         const z = axisUnit.z * sin;
         return new Quaternion(x, y, z, w);
     }
+    static FromDirectionVector(direction) {
+        if (direction.magnitued === 0) {
+            return Quaternion.Identity();
+        }
+        const dirUnit = direction.unit;
+        if (dirUnit.x === 0 && dirUnit.z === 0) {
+            if (dirUnit.y > 0) {
+                return Quaternion.FromYawPitchRoll(Angle_1.Angle.FromDegrees(0), Angle_1.Angle.FromDegrees(-90), Angle_1.Angle.FromDegrees(0));
+            }
+            else {
+                return Quaternion.FromYawPitchRoll(Angle_1.Angle.FromDegrees(0), Angle_1.Angle.FromDegrees(90), Angle_1.Angle.FromDegrees(0));
+            }
+        }
+        const yawRadians = -Math.atan2(dirUnit.z, dirUnit.x) + Math.PI / 2;
+        const len = Math.sqrt(dirUnit.x * dirUnit.x + dirUnit.z * dirUnit.z);
+        const pitchRadians = -Math.atan2(dirUnit.y, len);
+        const yaw = Angle_1.Angle.FromRadians(yawRadians);
+        const pitch = Angle_1.Angle.FromRadians(pitchRadians);
+        const roll = Angle_1.Angle.FromRadians(0);
+        return Quaternion.FromYawPitchRoll(yaw, pitch, roll);
+    }
     /**
      * Froms up a Quaternion from the Yaw-Pitch-Roll (Tait-Bryan) convetion
      * @param yaw defines the rotation around the y axis

package/lib/index.d.ts

@@ -7,3 +7,6 @@ export { AppEntities };
 import * as AppValueObjects from "./ValueObjects";
 export { AppValueObjects };
 export * from "./Utilities";
+import * as AOComponents from "./AppObjectComponents";
+export { AOComponents };
+export * from "./AppObject";

package/lib/index.js

@@ -10,7 +10,7 @@ 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 });
-exports.AppValueObjects = exports.AppEntities = exports.AppUCs = exports.AppPMs = void 0;
+exports.AOComponents = exports.AppValueObjects = exports.AppEntities = exports.AppUCs = exports.AppPMs = void 0;
 const AppPMs = require("./PresentationManagers");
 exports.AppPMs = AppPMs;
 const AppUCs = require("./UseCases");
@@ -20,3 +20,6 @@ exports.AppEntities = AppEntities;
 const AppValueObjects = require("./ValueObjects");
 exports.AppValueObjects = AppValueObjects;
 __exportStar(require("./Utilities"), exports);
+const AOComponents = require("./AppObjectComponents");
+exports.AOComponents = AOComponents;
+__exportStar(require("./AppObject"), exports);

package/package.json

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

package/lib/Entities/FocusCamera.d.ts

@@ -1,70 +0,0 @@
-import { Vector3 } from "../ValueObjects";
-export declare type OnFocusCameraChange = () => void;
-export interface FocusCameraLerper {
-    cancelLerp: () => void;
-}
-export interface FocusCameraData {
-    defaultAlpha?: number;
-    defaultBeta?: number;
-    defaultRadius?: number;
-    defaultTarget?: {
-        x: number;
-        y: number;
-        z: number;
-    };
-    nearClip?: number;
-    farClip?: number;
-    alphaLimit?: {
-        min: number;
-        max: number;
-    };
-    betaLimit?: {
-        min: number;
-        max: number;
-    };
-    radiusLimit?: {
-        min: number;
-        max: number;
-    };
-    targetLimit?: {
-        min: {
-            x: number;
-            y: number;
-            z: number;
-        };
-        max: {
-            x: number;
-            y: number;
-            z: number;
-        };
-    };
-}
-export interface FocusCamera {
-    alpha: number;
-    beta: number;
-    radius: number;
-    target: Vector3;
-    direction: Vector3;
-    cameraPosition: Vector3;
-    nearClip: number;
-    farClip: number;
-    defaultAlpha: number;
-    defaultBeta: number;
-    defaultRadius: number;
-    defaultTarget: Vector3;
-    setAlphaLimits: (min: number, max: number) => void;
-    clearAlphaLimits: () => void;
-    setBetaLimits: (min: number, max: number) => void;
-    clearBetaLimits: () => void;
-    setRadiusLimits: (min: number, max: number) => void;
-    clearRadiusLimits: () => void;
-    setTargetLimits: (min: Vector3, max: Vector3) => void;
-    clearTargetLimits: () => void;
-    registerLerp: (lerper: FocusCameraLerper) => void;
-    lerpCompleted: () => void;
-    cancelLerp: () => void;
-    applyData: (data: FocusCameraData) => void;
-    addObserver: (observer: OnFocusCameraChange) => void;
-    removeObserver: (observer: OnFocusCameraChange) => void;
-}
-export declare function makeFocusCamera(): FocusCamera;