@vived/app 4.34.9 → 4.34.11

package/lib/Components/Callouts/Entities/CalloutRepo.d.ts

@@ -8,6 +8,7 @@ export declare abstract class CalloutRepo extends AppObjectEntityRepo<CalloutEnt
     abstract calloutFactory(id: string): CalloutEntity;
     abstract makeCallout(id?: string): CalloutEntity;
     abstract deleteCallout(id: string): void;
+    abstract applySurrogateTransform(transform: Transform3D): void;
     static get(appObj: AppObject): CalloutRepo | undefined;
     static getById(id: string, appObjects: AppObjectRepo): CalloutRepo | undefined;
     static addIfMissing(appObject: AppObject): CalloutRepo;

package/lib/Components/Callouts/Entities/CalloutRepo.js

@@ -32,12 +32,15 @@ exports.makeCalloutRepoEntity = makeCalloutRepoEntity;
 class CalloutRepoImp extends CalloutRepo {
     constructor(appObject) {
         super(appObject, CalloutRepo.type);
+        this.applySurrogateTransform = (transform) => {
+            this._transform = transform;
+        };
         this.makeCallout = (id) => {
             const idToUse = id !== null && id !== void 0 ? id : generateUniqueID_1.generateUniqueID();
             const callout = this.calloutFactory(idToUse);
             callout.inRepo = this;
-            callout.rootTransform.parent = this.transform;
-            callout.labelTransform.parent = this.transform;
+            callout.rootTransform.parent = this._transform;
+            callout.labelTransform.parent = this._transform;
             this.add(callout);
             return callout;
         };
@@ -45,7 +48,10 @@ class CalloutRepoImp extends CalloutRepo {
             const ao = this.appObjects.getOrCreate(id);
             return CalloutEntity_1.makeCalloutEntity(ao);
         };
-        this.transform = Transform3D_1.Transform3D.addIfMissing(appObject);
+        this._transform = Transform3D_1.Transform3D.addIfMissing(appObject);
+    }
+    get transform() {
+        return this._transform;
     }
     deleteCallout(id) {
         const callout = this.getForAppObject(id);

package/lib/Components/Callouts/UC/LookAtCameraUC.js

@@ -31,8 +31,8 @@ class LookAtCameraUCIMP extends LookAtCameraUC {
                 return;
             }
             const worldDir = ValueObjects_1.Vector3.Subtract(this.cameraPos, this.callout.labelTransform.worldPosition);
-            const localDir = parent.worldDirectionToLocal(worldDir);
-            const desiredQ = ValueObjects_1.Quaternion.FromDirectionVector(localDir);
+            // const localDir = parent.worldDirectionToLocal(worldDir);
+            const desiredQ = ValueObjects_1.Quaternion.FromDirectionVector(worldDir);
             if (ValueObjects_1.Quaternion.Close(this.targetQ, desiredQ)) {
                 return;
             }
@@ -43,7 +43,7 @@ class LookAtCameraUCIMP extends LookAtCameraUC {
         };
         this.stopSlerping = () => {
             if (this.callout) {
-                this.callout.labelTransform.localRotation = this.targetQ;
+                this.callout.labelTransform.worldRotation = this.targetQ;
             }
             if (this.slerpInterval) {
                 clearInterval(this.slerpInterval);
@@ -75,9 +75,9 @@ class LookAtCameraUCIMP extends LookAtCameraUC {
         const transform = (_a = this.callout) === null || _a === void 0 ? void 0 : _a.labelTransform;
         if (!transform)
             return;
-        let previousError = ValueObjects_1.Quaternion.AngleBetween(transform.localRotation, this.targetQ).degrees;
+        let previousError = ValueObjects_1.Quaternion.AngleBetween(transform.worldRotation, this.targetQ).degrees;
         this.slerpInterval = setInterval(() => {
-            const error = ValueObjects_1.Quaternion.AngleBetween(transform.localRotation, this.targetQ).degrees;
+            const error = ValueObjects_1.Quaternion.AngleBetween(transform.worldRotation, this.targetQ).degrees;
             if (error < 0.15) {
                 this.stopSlerping();
                 return;
@@ -96,8 +96,8 @@ class LookAtCameraUCIMP extends LookAtCameraUC {
             if (slerpPercent > 1) {
                 slerpPercent = 1;
             }
-            const slerpedQ = ValueObjects_1.Quaternion.Slerp(transform.localRotation, this.targetQ, slerpPercent);
-            transform.localRotation = slerpedQ;
+            const slerpedQ = ValueObjects_1.Quaternion.Slerp(transform.worldRotation, this.targetQ, slerpPercent);
+            transform.worldRotation = slerpedQ;
             previousError = error;
         }, 10);
     }

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

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

package/lib/Components/Label/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("./setupLabel"), exports);

package/lib/Components/Label/Factories/setupLabel.d.ts

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

package/lib/Components/Label/Factories/setupLabel.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupLabel = void 0;
+const UC_1 = require("../UC");
+function setupLabel(appObjects) {
+    const ao = appObjects.getOrCreate("Label");
+    // UCs
+    UC_1.makeSerializeCustomLabels(ao);
+    return ao;
+}
+exports.setupLabel = setupLabel;

package/lib/Components/Label/UC/SerializeCustomLabels.d.ts

@@ -0,0 +1,26 @@
+import { AppObject, AppObjectUC } from "../../../AppObject";
+import { SerializedSystem } from "../../StateMachine";
+export declare abstract class SerializeCustomLabels extends AppObjectUC implements SerializedSystem {
+    static readonly type = "SerializeCustomLabels";
+    name: string;
+    abstract seriliziationVersion: number;
+    abstract getSystemState(): object;
+    abstract applySystemState(state: object, version: number, transitionDuration: number): void;
+    abstract applyDefaultState(transitionDuration: number): void;
+}
+export declare function makeSerializeCustomLabels(appObject: AppObject): SerializeCustomLabels;
+export declare class SerializeCustomLabelsImp extends SerializeCustomLabels {
+    seriliziationVersion: number;
+    getSystemState(): object;
+    applySystemState(state: object, version: number, durationS: number): Promise<void> | void;
+    private applyStateV1;
+    applyDefaultState(): void;
+    constructor(appObj: AppObject);
+}
+export interface SerializedCustomLabelsV1 {
+    customLabels: SerializedCustomLabelV1[];
+}
+export interface SerializedCustomLabelV1 {
+    objectId: string;
+    customLabel: string;
+}

package/lib/Components/Label/UC/SerializeCustomLabels.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SerializeCustomLabelsImp = exports.makeSerializeCustomLabels = exports.SerializeCustomLabels = void 0;
+const AppObject_1 = require("../../../AppObject");
+const StateMachine_1 = require("../../StateMachine");
+const Entities_1 = require("../Entities");
+class SerializeCustomLabels extends AppObject_1.AppObjectUC {
+    constructor() {
+        super(...arguments);
+        this.name = "serialize-custom-labels";
+    }
+}
+exports.SerializeCustomLabels = SerializeCustomLabels;
+SerializeCustomLabels.type = "SerializeCustomLabels";
+function makeSerializeCustomLabels(appObject) {
+    return new SerializeCustomLabelsImp(appObject);
+}
+exports.makeSerializeCustomLabels = makeSerializeCustomLabels;
+class SerializeCustomLabelsImp extends SerializeCustomLabels {
+    constructor(appObj) {
+        super(appObj, SerializeCustomLabels.type);
+        this.seriliziationVersion = 1;
+        const stateMachine = this.appObjects.getSingleton(StateMachine_1.StateMachineEntity.type);
+        if (stateMachine) {
+            stateMachine.registerSerializedSystem(this);
+        }
+        else {
+            this.warn("Unable to find StateMachineEntity");
+        }
+    }
+    getSystemState() {
+        const customLabels = [];
+        const allLabels = this.appObjects.getAllComponents(Entities_1.LabelEntity.type);
+        allLabels.forEach((label) => {
+            if (label.hasCustomLabel)
+                customLabels.push({
+                    objectId: label.appObject.id,
+                    customLabel: label.custom,
+                });
+        });
+        const state = {
+            customLabels,
+        };
+        return state;
+    }
+    applySystemState(state, version, durationS) {
+        if (version === 1) {
+            return this.applyStateV1(state, durationS);
+        }
+        else {
+            this.applyDefaultState();
+        }
+    }
+    applyStateV1(state, durationS) {
+        const { customLabels } = state;
+        if (!customLabels || customLabels.length === 0) {
+            this.applyDefaultState();
+            return;
+        }
+        // Create a Map for faster lookups
+        const customLabelsLookup = new Map();
+        customLabels.forEach((customLabel) => {
+            customLabelsLookup.set(customLabel.objectId, customLabel.customLabel);
+        });
+        const allLabels = this.appObjects.getAllComponents(Entities_1.LabelEntity.type);
+        allLabels.forEach((label) => {
+            var _a;
+            const appObjectId = label.appObject.id;
+            label.custom = (_a = customLabelsLookup.get(appObjectId)) !== null && _a !== void 0 ? _a : "";
+        });
+        customLabelsLookup.forEach((customLabel, objectId) => {
+            const appObject = this.appObjects.getOrCreate(objectId);
+            if (appObject) {
+                const label = Entities_1.LabelEntity.addIfMissing(appObject);
+                label.custom = customLabel;
+            }
+        });
+    }
+    applyDefaultState() {
+        const allLabels = this.appObjects.getAllComponents(Entities_1.LabelEntity.type);
+        allLabels.forEach((label) => {
+            label.custom = "";
+        });
+    }
+}
+exports.SerializeCustomLabelsImp = SerializeCustomLabelsImp;

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

@@ -1,2 +1,3 @@
 export * from "./ClearCustomLabelUC";
 export * from "./SetCustomLabelUC";
+export * from "./SerializeCustomLabels";

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

@@ -12,3 +12,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ClearCustomLabelUC"), exports);
 __exportStar(require("./SetCustomLabelUC"), exports);
+__exportStar(require("./SerializeCustomLabels"), exports);

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

@@ -1,6 +1,7 @@
 export * from "./Adapters";
 export * from "./Controller";
 export * from "./Entities";
+export * from "./Factories";
 export * from "./Mocks";
 export * from "./PM";
 export * from "./UC";

package/lib/Components/Label/index.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Adapters"), exports);
 __exportStar(require("./Controller"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Factories"), exports);
 __exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);
 __exportStar(require("./UC"), exports);

package/lib/Components/Landmarks/Entities/LandmarkRepo.d.ts

@@ -4,10 +4,11 @@ import { LandmarkEntity } from "./LandmarkEntity";
 export declare type LandmarkFactory = (id: string) => LandmarkEntity;
 export declare abstract class LandmarkRepo extends AppObjectEntityRepo<LandmarkEntity> {
     static readonly type = "LANDMARK_REPO";
-    abstract readonly transform: Transform3D;
+    abstract get transform(): Transform3D;
     abstract landmarkFactory(id: string): LandmarkEntity;
     abstract createLandmark(id?: string): LandmarkEntity;
     abstract deleteLandmark(id: string): void;
+    abstract applySurrogateTransform(transform: Transform3D): void;
     static get(appObj: AppObject): LandmarkRepo | undefined;
     static getByID(id: string, appObjects: AppObjectRepo): LandmarkRepo | undefined;
     static addIfMissing(appObject: AppObject): LandmarkRepo;

package/lib/Components/Landmarks/Entities/LandmarkRepo.js

@@ -43,7 +43,13 @@ class LandmarkRepoImp extends LandmarkRepo {
             const ao = this.appObjects.getOrCreate(id);
             return LandmarkEntity_1.makeLandmarkEntity(ao);
         };
-        this.transform = Transform3D_1.Transform3D.addIfMissing(this.appObject);
+        this._transform = Transform3D_1.Transform3D.addIfMissing(this.appObject);
+    }
+    get transform() {
+        return this._transform;
+    }
+    applySurrogateTransform(transform) {
+        this._transform = transform;
     }
     deleteLandmark(id) {
         const landmark = this.getForAppObject(id);

package/lib/Components/Selection/PM/SelectableStatePM.d.ts

@@ -5,6 +5,7 @@ export interface SelectableStateVM {
     isSelected: boolean;
     isPressed: boolean;
     isHovered: boolean;
+    somethingElseIsSelected: boolean;
 }
 export declare const defaultSelectableStateVM: SelectableStateVM;
 export declare abstract class SelectableStatePM extends AppObjectPM<SelectableStateVM> {

package/lib/Components/Selection/PM/SelectableStatePM.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSelectableStatePM = exports.SelectableStatePM = exports.defaultSelectableStateVM = void 0;
 const AppObjectPM_1 = require("../../../AppObject/AppObjectPM");
-const Selectable_1 = require("../Entities/Selectable");
+const Entities_1 = require("../Entities");
 exports.defaultSelectableStateVM = {
     isHovered: false,
     isPressed: false,
     isSelected: false,
+    somethingElseIsSelected: false,
 };
 class SelectableStatePM extends AppObjectPM_1.AppObjectPM {
     static get(id, appObjects) {
@@ -23,28 +24,39 @@ function makeSelectableStatePM(appObject) {
 exports.makeSelectableStatePM = makeSelectableStatePM;
 class SelectableStatePMImp extends SelectableStatePM {
     constructor(appObject) {
-        var _a;
+        var _a, _b;
         super(appObject, SelectableStatePM.type);
         this.onSelectionChange = () => {
-            if (!this.selectable)
+            if (!this.selectable || !this.selection)
                 return;
+            let somethingElseIsSelected = false;
+            const selectedObject = this.selection.selectedObjectId;
+            if (selectedObject !== null && selectedObject !== this.appObject.id) {
+                somethingElseIsSelected = true;
+            }
             const vm = {
                 isHovered: this.selectable.hovered,
                 isPressed: this.selectable.pressed,
                 isSelected: this.selectable.selected,
+                somethingElseIsSelected,
             };
             this.doUpdateView(vm);
         };
         this.dispose = () => {
-            var _a;
+            var _a, _b;
             super.dispose();
             (_a = this.selectable) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onSelectionChange);
+            (_b = this.selection) === null || _b === void 0 ? void 0 : _b.removeChangeObserver(this.onSelectionChange);
         };
         (_a = this.selectable) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onSelectionChange);
+        (_b = this.selection) === null || _b === void 0 ? void 0 : _b.addChangeObserver(this.onSelectionChange);
         this.onSelectionChange();
     }
     get selectable() {
-        return this.getCachedLocalComponent(Selectable_1.Selectable.type);
+        return this.getCachedLocalComponent(Entities_1.Selectable.type);
+    }
+    get selection() {
+        return this.getCachedSingleton(Entities_1.Selection.type);
     }
     vmsAreEqual(a, b) {
         if (a.isHovered !== b.isHovered)
@@ -53,6 +65,8 @@ class SelectableStatePMImp extends SelectableStatePM {
             return false;
         if (a.isSelected !== b.isSelected)
             return false;
+        if (a.somethingElseIsSelected !== b.somethingElseIsSelected)
+            return false;
         return true;
     }
 }

package/package.json

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