@vived/app 4.18.0 → 4.19.0

package/lib/Components/ChannelModel/Entities/ChannelModel.d.ts

@@ -1,5 +1,5 @@
 import { AppObject, AppObjectEntity, AppObjectRepo } from "../../../AppObject";
-import { Quaternion, Vector3 } from "../../../ValueObjects";
+import { Quaternion, QuaternionDTO, Vector3, Vector3DTO } from "../../../ValueObjects";
 import { ChannelModelObject } from "./ChannelModelObject";
 export declare enum ChannelModelState {
     INIT = "Initialized",
@@ -27,8 +27,10 @@ export declare abstract class ChannelModelEntity extends AppObjectEntity {
     abstract get modelError(): Error | undefined;
     abstract set modelError(val: Error | undefined);
     abstract get modelObjectIds(): string[];
-    abstract get data(): ChannelModelDTOv2;
-    abstract setupFromData(data: ChannelModelDTOv0 | ChannelModelDTOv1 | ChannelModelDTOv2): void;
+    abstract get rootRotation(): Quaternion;
+    abstract set rootRotation(val: Quaternion);
+    abstract get data(): ChannelModelDTO;
+    abstract setupFromData(data: object): void;
     abstract originalCollectionID?: string;
     abstract modelObjectFactory(id: string): ChannelModelObject;
     abstract addModelObject(id?: string): ChannelModelObject;
@@ -38,6 +40,24 @@ export declare abstract class ChannelModelEntity extends AppObjectEntity {
     static get(id: string, appObjects: AppObjectRepo): ChannelModelEntity | undefined;
 }
 export declare function makeChannelModelEntity(appObject: AppObject): ChannelModelEntity;
+export interface ChannelModelDTO {
+    bounds_min: Vector3DTO;
+    bounds_max: Vector3DTO;
+    version: number;
+    objects: ChannelModelObjectDTO[];
+    name: string;
+    defaultPosition: Vector3DTO;
+    defaultRotation: QuaternionDTO;
+    defaultScale: number;
+    originalCollectionID?: string;
+    rootRotation: QuaternionDTO;
+}
+export interface ChannelModelObjectDTO {
+    id: string;
+    meshPaths: string[];
+    label: string;
+    tags: string[];
+}
 export interface ChannelModelDTOv2 {
     version: 2;
     objects: ChannelModelDataMeshDTOv2[];

package/lib/Components/ChannelModel/Entities/ChannelModel.js

@@ -38,17 +38,92 @@ class ChannelModelEntityImp extends ChannelModelEntity {
         this._defaultPosition = new Entities_1.MemoizedVector3(ValueObjects_1.Vector3.Zero(), this.notifyOnChange);
         this._defaultRotation = new Entities_1.MemoizedQuaternion(ValueObjects_1.Quaternion.Identity(), this.notifyOnChange);
         this._defaultScale = new Entities_1.MemoizedNumber(1, this.notifyOnChange);
+        this._rootRotation = new Entities_1.MemoizedQuaternion(ValueObjects_1.Quaternion.Identity(), this.notifyOnChange);
         this._state = new Entities_1.MemoizedString(ChannelModelState.INIT, this.notifyOnChange);
         this.modelObjectLookup = new Map();
+        this.modelObjectFactory = (id) => {
+            const ao = this.appObjects.getOrCreate(id);
+            return ChannelModelObject_1.makeChannelModelObject(ao);
+        };
+        this.addModelObject = (id) => {
+            const idToUse = id !== null && id !== void 0 ? id : Utilities_1.generateUniqueID();
+            const obj = this.modelObjectFactory(idToUse);
+            this.modelObjectLookup.set(idToUse, obj);
+            obj.addChangeObserver(this.notifyOnChange);
+            this.notifyOnChange();
+            return obj;
+        };
+        this.getModelObject = (id) => {
+            return this.modelObjectLookup.get(id);
+        };
+        this.hasModelObject = (id) => {
+            return this.modelObjectLookup.has(id);
+        };
+        this.modelObjects = () => {
+            return Array.from(this.modelObjectLookup.values());
+        };
         this.setupFromData = (data) => {
-            if (data.version === 2) {
-                this.setupDataV2(data);
+            if ("bounds_max" in data) {
+                this.bounds_max = ValueObjects_1.Vector3.FromDTO(data.bounds_max);
+            }
+            else {
+                this.bounds_max = ValueObjects_1.Vector3.Zero();
+            }
+            if ("bounds_min" in data) {
+                this.bounds_min = ValueObjects_1.Vector3.FromDTO(data.bounds_min);
+            }
+            else {
+                this.bounds_min = ValueObjects_1.Vector3.Zero();
+            }
+            if ("defaultPosition" in data) {
+                this.defaultPosition = ValueObjects_1.Vector3.FromDTO(data.defaultPosition);
+            }
+            else {
+                this.defaultPosition = ValueObjects_1.Vector3.Zero();
             }
-            else if (data.version === 1) {
-                this.setupDataV2(this.mapDataV1toV2(data));
+            if ("defaultRotation" in data) {
+                this.defaultRotation = ValueObjects_1.Quaternion.FromDTO(data.defaultRotation);
             }
-            else if (data.version === 0) {
-                this.setupDataV2(this.mapDataV0toV2(data));
+            else {
+                this.defaultRotation = ValueObjects_1.Quaternion.Identity();
+            }
+            if ("rootRotation" in data) {
+                this.rootRotation = ValueObjects_1.Quaternion.FromDTO(data.rootRotation);
+            }
+            else {
+                this.rootRotation = ValueObjects_1.Quaternion.Identity();
+            }
+            if ("defaultScale" in data) {
+                this.defaultScale = data.defaultScale;
+            }
+            else {
+                this.defaultScale = 1;
+            }
+            if ("name" in data) {
+                this.name = data.name;
+            }
+            else {
+                this.name = "Unnamed Channel";
+            }
+            if ("originalCollectionID" in data) {
+                this.originalCollectionID = data.originalCollectionID;
+            }
+            if ("objects" in data) {
+                const objects = data.objects;
+                objects.forEach((obj) => {
+                    if ("id" in obj) {
+                        const modelObj = this.addModelObject(obj.id);
+                        if ("label" in obj) {
+                            modelObj.label = obj.label;
+                        }
+                        if ("meshPaths" in obj) {
+                            modelObj.subMeshPaths = obj.meshPaths;
+                        }
+                        if ("tags" in obj) {
+                            modelObj.tags = obj.tags;
+                        }
+                    }
+                });
             }
         };
     }
@@ -91,6 +166,12 @@ class ChannelModelEntityImp extends ChannelModelEntity {
     set defaultScale(scale) {
         this._defaultScale.val = scale;
     }
+    get rootRotation() {
+        return this._rootRotation.val;
+    }
+    set rootRotation(rotation) {
+        this._rootRotation.val = rotation;
+    }
     get state() {
         return this._state.val;
     }
@@ -104,27 +185,6 @@ class ChannelModelEntityImp extends ChannelModelEntity {
         this._error = val;
         this._state.val = ChannelModelState.ERROR;
     }
-    modelObjectFactory(id) {
-        const ao = this.appObjects.getOrCreate(id);
-        return ChannelModelObject_1.makeChannelModelObject(ao);
-    }
-    addModelObject(id) {
-        const idToUse = id !== null && id !== void 0 ? id : Utilities_1.generateUniqueID();
-        const obj = this.modelObjectFactory(idToUse);
-        this.modelObjectLookup.set(idToUse, obj);
-        obj.addChangeObserver(this.notifyOnChange);
-        this.notifyOnChange();
-        return obj;
-    }
-    getModelObject(id) {
-        return this.modelObjectLookup.get(id);
-    }
-    hasModelObject(id) {
-        return this.modelObjectLookup.has(id);
-    }
-    modelObjects() {
-        return Array.from(this.modelObjectLookup.values());
-    }
     get modelObjectIds() {
         return Array.from(this.modelObjectLookup.keys());
     }
@@ -146,69 +206,9 @@ class ChannelModelEntityImp extends ChannelModelEntity {
             defaultScale: this._defaultScale.val,
             name: this._name.val,
             objects,
-            version: 2,
+            version: 1,
             originalCollectionID: this.originalCollectionID,
-        };
-    }
-    setupDataV2(data) {
-        const { bounds_max, bounds_min, defaultPosition, defaultRotation, defaultScale, name, objects, originalCollectionID, } = data;
-        this.bounds_max = ValueObjects_1.Vector3.FromDTO(bounds_max);
-        this.bounds_min = ValueObjects_1.Vector3.FromDTO(bounds_min);
-        this.defaultPosition = ValueObjects_1.Vector3.FromDTO(defaultPosition);
-        this.defaultRotation = ValueObjects_1.Quaternion.FromDTO(defaultRotation);
-        this.defaultScale = defaultScale;
-        this.name = name;
-        this.originalCollectionID = originalCollectionID;
-        objects.forEach((obj) => {
-            const { id, label, meshPaths, tags } = obj;
-            const modelObj = this.addModelObject(id);
-            modelObj.label = label;
-            modelObj.subMeshPaths = meshPaths;
-            modelObj.tags = tags;
-        });
-    }
-    mapDataV1toV2(data) {
-        const { bounds_max, bounds_min, defaultPosition, defaultRotation, defaultScale, name, objects, } = data;
-        const mappedObject = objects.map((obj) => {
-            const { id, label, meshPaths } = obj;
-            return {
-                id,
-                label,
-                meshPaths,
-                tags: [],
-            };
-        });
-        return {
-            bounds_max,
-            bounds_min,
-            defaultPosition,
-            defaultRotation,
-            defaultScale,
-            name,
-            objects: mappedObject,
-            version: 2,
-        };
-    }
-    mapDataV0toV2(data) {
-        const { bounds_max, bounds_min, defaultPosition, defaultRotation, defaultScale, name, objects, } = data;
-        const mappedObject = objects.map((obj) => {
-            const { id, label, meshPaths } = obj;
-            return {
-                id,
-                label,
-                meshPaths,
-                tags: [],
-            };
-        });
-        return {
-            bounds_max,
-            bounds_min,
-            defaultPosition,
-            defaultRotation,
-            defaultScale,
-            name,
-            objects: mappedObject,
-            version: 2,
+            rootRotation: this._rootRotation.val.dto,
         };
     }
 }

package/lib/Components/ChannelModel/Mocks/ChannelModelViewFactoryMock.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="jest" />
+import { AppObject, AppObjectRepo } from "../../../AppObject";
+import { ChannelModelViewFactory } from "../UC/ChannelModelViewFactory";
+export declare class ChannelModelViewFactoryMock extends ChannelModelViewFactory {
+    disposeView: jest.Mock<any, any>;
+    initializeView: jest.Mock<any, any>;
+    constructor(appObject: AppObject);
+}
+export declare function makeChannelModelViewFactoryMock(appObjects: AppObjectRepo): ChannelModelViewFactoryMock;

package/lib/Components/ChannelModel/Mocks/ChannelModelViewFactoryMock.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeChannelModelViewFactoryMock = exports.ChannelModelViewFactoryMock = void 0;
+const ChannelModelViewFactory_1 = require("../UC/ChannelModelViewFactory");
+class ChannelModelViewFactoryMock extends ChannelModelViewFactory_1.ChannelModelViewFactory {
+    constructor(appObject) {
+        super(appObject, ChannelModelViewFactory_1.ChannelModelViewFactory.type);
+        this.disposeView = jest.fn();
+        this.initializeView = jest.fn();
+    }
+}
+exports.ChannelModelViewFactoryMock = ChannelModelViewFactoryMock;
+function makeChannelModelViewFactoryMock(appObjects) {
+    return new ChannelModelViewFactoryMock(appObjects.getOrCreate("ChannelModelViewFactoryMock"));
+}
+exports.makeChannelModelViewFactoryMock = makeChannelModelViewFactoryMock;

package/lib/Components/ChannelModel/Mocks/index.d.ts

@@ -1,3 +1,3 @@
 export * from "./ChannelModelObjectPMMock";
 export * from "./ChannelModelPMMock";
-export * from "./ProcessChannelModelUCMock";
+export * from "./ChannelModelViewFactoryMock";

package/lib/Components/ChannelModel/Mocks/index.js

@@ -12,4 +12,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ChannelModelObjectPMMock"), exports);
 __exportStar(require("./ChannelModelPMMock"), exports);
-__exportStar(require("./ProcessChannelModelUCMock"), exports);
+__exportStar(require("./ChannelModelViewFactoryMock"), exports);

package/lib/Components/ChannelModel/UC/ChannelModelViewFactory.d.ts

@@ -0,0 +1,8 @@
+import { AppObjectRepo, AppObjectUC } from "../../../AppObject";
+import { ChannelModelEntity } from "../Entities";
+export declare abstract class ChannelModelViewFactory extends AppObjectUC {
+    static type: string;
+    abstract initializeView(channelModel: ChannelModelEntity): void;
+    abstract disposeView(id: string): void;
+    static get(appObjects: AppObjectRepo): ChannelModelViewFactory | undefined;
+}

package/lib/Components/ChannelModel/UC/ChannelModelViewFactory.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChannelModelViewFactory = void 0;
+const AppObject_1 = require("../../../AppObject");
+class ChannelModelViewFactory extends AppObject_1.AppObjectUC {
+    static get(appObjects) {
+        return AppObject_1.getSingletonComponent(ChannelModelViewFactory.type, appObjects);
+    }
+}
+exports.ChannelModelViewFactory = ChannelModelViewFactory;
+ChannelModelViewFactory.type = "ChannelModelViewFactory";

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

@@ -1,3 +1 @@
-export * from "./ProcessChannelModelUC";
-export * from "./SelectChannelModelUC";
-export * from "./SetupChannelModelUC";
+export * from "./ChannelModelViewFactory";

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

@@ -10,6 +10,4 @@ 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("./ProcessChannelModelUC"), exports);
-__exportStar(require("./SelectChannelModelUC"), exports);
-__exportStar(require("./SetupChannelModelUC"), exports);
+__exportStar(require("./ChannelModelViewFactory"), exports);

package/package.json

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