@vived/app 4.34.8 → 4.34.10

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/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/lib/Components/StoredView/UC/SerializeStoredView.js

@@ -5,6 +5,7 @@ const AppObjectUC_1 = require("../../../AppObject/AppObjectUC");
 const ValueObjects_1 = require("../../../ValueObjects");
 const StateMachineEntity_1 = require("../../StateMachine/Entities/StateMachineEntity");
 const StoredView_1 = require("../Entities/StoredView");
+const RestoreStoredViewUC_1 = require("./RestoreStoredViewUC");
 class SerializeStoredView extends AppObjectUC_1.AppObjectUC {
     constructor() {
         super(...arguments);
@@ -32,6 +33,9 @@ class SerializeStoredViewImp extends SerializeStoredView {
     get storedView() {
         return this.getCachedSingleton(StoredView_1.StoredView.type);
     }
+    get restoreStoredViewUC() {
+        return this.getCachedSingleton(RestoreStoredViewUC_1.RestoreStoredViewUC.type);
+    }
     getSystemState() {
         if (!this.storedView) {
             console.warn("[SerializeStoredView] No stored view entity");
@@ -72,6 +76,7 @@ class SerializeStoredViewImp extends SerializeStoredView {
         this.storedView.hasStoredView = false;
     }
     applyV1Data(data) {
+        var _a;
         if (!this.storedView) {
             console.warn("[SerializeStoredView] No stored view entity");
             return;
@@ -82,5 +87,8 @@ class SerializeStoredViewImp extends SerializeStoredView {
         this.storedView.rotation = rot;
         this.storedView.scale = data.scale;
         this.storedView.hasStoredView = data.hasStoredView;
+        if (data.hasStoredView) {
+            (_a = this.restoreStoredViewUC) === null || _a === void 0 ? void 0 : _a.restoreStoredView();
+        }
     }
 }

package/package.json

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