@vived/app 4.25.0 → 4.26.1

package/lib/Components/Landmarks/UseCases/TryAddNewLandmarkUC.js

@@ -6,8 +6,8 @@ const ValueObjects_1 = require("../../../ValueObjects");
 const Babylon_1 = require("../../Babylon");
 const Dispatcher_1 = require("../../Dispatcher");
 const Label_1 = require("../../Label");
+const Entities_1 = require("../Entities");
 const LandmarkGlobals_1 = require("../Entities/LandmarkGlobals");
-const AddLandmarkUC_1 = require("./AddLandmarkUC");
 const AddLandmarkUndoRedo_1 = require("./AddLandmarkUndoRedo");
 class TryAddNewLandmarkUC extends AppObject_1.AppObjectUC {
     static get(appObj) {
@@ -21,35 +21,39 @@ function makeTryAddLandmarkUC(appObject) {
 }
 exports.makeTryAddLandmarkUC = makeTryAddLandmarkUC;
 class TryAddNewLandmarkUCImp extends TryAddNewLandmarkUC {
+    get globals() {
+        return this.getCachedSingleton(LandmarkGlobals_1.LandmarkGlobals.type);
+    }
+    allow() {
+        return true;
+    }
     addFromRay(ray) {
-        const scenePick = Babylon_1.sceneRayPick(ray, this.appObjects);
-        if (!scenePick ||
-            !scenePick.worldPickPoint ||
-            !scenePick.normal ||
-            !scenePick.appObjectID) {
+        if (!this.allow()) {
             return;
         }
-        const pickAO = scenePick.appObjectID;
-        const addLandmarkUC = this.appObjects.getAppObjectComponent(pickAO, AddLandmarkUC_1.AddLandmarkUC.type);
-        if (!addLandmarkUC) {
+        const scenePick = Babylon_1.sceneRayPick(ray, this.appObjects);
+        const appObjectID = scenePick === null || scenePick === void 0 ? void 0 : scenePick.appObjectID;
+        if (!appObjectID ||
+            !scenePick ||
+            !(scenePick === null || scenePick === void 0 ? void 0 : scenePick.worldPickPoint) ||
+            !(scenePick === null || scenePick === void 0 ? void 0 : scenePick.normal)) {
             return;
         }
-        const newLandmark = addLandmarkUC.addNew();
-        if (!newLandmark) {
-            this.warn("Failed to add landmark");
+        const landmarkRepo = Entities_1.LandmarkRepo.getByID(appObjectID, this.appObjects);
+        if (!landmarkRepo) {
             return;
         }
+        const newLandmark = landmarkRepo.createLandmark();
         newLandmark.transform.worldPosition = scenePick.worldPickPoint;
         newLandmark.transform.worldRotation = ValueObjects_1.Quaternion.FromDirectionVector(scenePick.normal);
-        const globals = this.appObjects.getSingleton(LandmarkGlobals_1.LandmarkGlobals.type);
-        if (globals) {
-            newLandmark.size = globals.lastSize;
-            newLandmark.overlayColor.overlayColor = globals.lastColor;
+        if (this.globals) {
+            newLandmark.size = this.globals.lastSize;
+            newLandmark.overlayColor.overlayColor = this.globals.lastColor;
         }
-        const label = this.appObjects.getAppObjectComponent(pickAO, Label_1.LabelEntity.type);
+        const label = Label_1.LabelEntity.getByID(appObjectID, this.appObjects);
         newLandmark.label.default = label ? label.default : "";
         newLandmark.selectable.selected = true;
-        new AddLandmarkUndoRedo_1.AddLandmarkUndoRedo(newLandmark.data, this.appObject);
+        new AddLandmarkUndoRedo_1.AddLandmarkUndoRedo(newLandmark.data, this.appObjects);
         Dispatcher_1.dispatchStateChange(this.appObjects);
         return newLandmark;
     }

package/lib/Components/Landmarks/UseCases/TryPreviewLandmarkUC.d.ts

@@ -2,14 +2,9 @@ import { AppObject, AppObjectUC } from "../../../AppObject";
 import { ParametricLine } from "../../../ValueObjects";
 export declare abstract class TryPreviewLandmarkUC extends AppObjectUC {
     static readonly type = "TryPreviewLandmarkUC";
+    abstract allow(): boolean;
     abstract tryPreviewLandmark: (ray: ParametricLine, pressed: boolean) => boolean | undefined;
+    abstract hidePreview: () => void;
     static get(appObj: AppObject): TryPreviewLandmarkUC | undefined;
 }
-export declare function makeTryPreviewLandmark(appObject: AppObject): TryPreviewLandmarkUCImp;
-declare class TryPreviewLandmarkUCImp extends TryPreviewLandmarkUC {
-    private previewLandmark?;
-    private hidePreview;
-    tryPreviewLandmark: (ray: ParametricLine, pressed: boolean) => false | undefined;
-    constructor(appObject: AppObject);
-}
-export {};
+export declare function makeTryPreviewLandmark(appObject: AppObject): TryPreviewLandmarkUC;

package/lib/Components/Landmarks/UseCases/TryPreviewLandmarkUC.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTryPreviewLandmark = exports.TryPreviewLandmarkUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const ValueObjects_1 = require("../../../ValueObjects");
-const App_1 = require("../../App");
 const Babylon_1 = require("../../Babylon");
-const LandmarkGlobals_1 = require("../Entities/LandmarkGlobals");
+const LandmarkEntity_1 = require("../Entities/LandmarkEntity");
 const LandmarkRepo_1 = require("../Entities/LandmarkRepo");
 class TryPreviewLandmarkUC extends AppObject_1.AppObjectUC {
     static get(appObj) {
@@ -21,14 +20,17 @@ function makeTryPreviewLandmark(appObject) {
 exports.makeTryPreviewLandmark = makeTryPreviewLandmark;
 class TryPreviewLandmarkUCImp extends TryPreviewLandmarkUC {
     constructor(appObject) {
-        var _a;
         super(appObject, TryPreviewLandmarkUC.type);
+        this.hidePreview = () => {
+            if (!this.landmark)
+                return;
+            this.landmark.hideable.isHidden = true;
+        };
         this.tryPreviewLandmark = (ray, pressed) => {
-            if (!this.previewLandmark) {
+            if (!this.landmark) {
                 return false;
             }
-            const baseApp = this.appObjects.getSingleton(App_1.BaseAppState.type);
-            if (!baseApp || !baseApp.isAuthoring) {
+            if (!this.allow()) {
                 this.hidePreview();
                 return false;
             }
@@ -45,19 +47,16 @@ class TryPreviewLandmarkUCImp extends TryPreviewLandmarkUC {
                 this.hidePreview();
                 return;
             }
-            this.previewLandmark.hideable.isHidden = false;
-            this.previewLandmark.position = scenePick.worldPickPoint;
-            this.previewLandmark.rotation = ValueObjects_1.Quaternion.FromDirectionVector(scenePick.normal);
-            this.previewLandmark.selectable.pressed = pressed;
+            this.landmark.hideable.isHidden = false;
+            this.landmark.position = scenePick.worldPickPoint;
+            this.landmark.rotation = ValueObjects_1.Quaternion.FromDirectionVector(scenePick.normal);
+            this.landmark.selectable.pressed = pressed;
         };
-        this.previewLandmark = (_a = this.appObject.getComponent(LandmarkGlobals_1.LandmarkGlobals.type)) === null || _a === void 0 ? void 0 : _a.previewLandmark;
-        if (!this.previewLandmark) {
-            console.warn("No preview landmark");
-        }
     }
-    hidePreview() {
-        if (!this.previewLandmark)
-            return;
-        this.previewLandmark.hideable.isHidden = true;
+    get landmark() {
+        return this.getCachedLocalComponent(LandmarkEntity_1.LandmarkEntity.type);
+    }
+    allow() {
+        return true;
     }
 }

package/lib/Components/Landmarks/UseCases/index.d.ts

@@ -1,5 +1,5 @@
-export * from "./AddLandmarkUC";
 export * from "./AddLandmarkUndoRedo";
+export * from "./DeleteAllLandmarksUC";
 export * from "./DeleteLandmarkUC";
 export * from "./DeleteLandmarkUndoRedo";
 export * from "./SerializeLandmarks";

package/lib/Components/Landmarks/UseCases/index.js

@@ -10,8 +10,8 @@ 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("./AddLandmarkUC"), exports);
 __exportStar(require("./AddLandmarkUndoRedo"), exports);
+__exportStar(require("./DeleteAllLandmarksUC"), exports);
 __exportStar(require("./DeleteLandmarkUC"), exports);
 __exportStar(require("./DeleteLandmarkUndoRedo"), exports);
 __exportStar(require("./SerializeLandmarks"), exports);

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

@@ -1,4 +1,6 @@
+export * from "./Adapters";
 export * from "./Controller";
 export * from "./Entities";
+export * from "./Mocks";
 export * from "./PM";
 export * from "./UseCases";

package/lib/Components/Landmarks/index.js

@@ -10,7 +10,9 @@ 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("./Adapters"), exports);
 __exportStar(require("./Controller"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);
 __exportStar(require("./UseCases"), exports);

package/lib/Components/OverlayColor/Adapters/overlayColorAdapter.js

@@ -15,10 +15,8 @@ exports.overlayColorAdapter = {
     },
     unsubscribe: (id, appObjects, setVM) => {
         const pm = OverlayColorPM_1.OverlayColorPM.getForID(id, appObjects);
-        if (!pm) {
-            appObjects.submitError("overlayColorAdapter", "Unable to find OverlayColorPM");
-            return;
+        if (pm) {
+            pm.removeView(setVM);
         }
-        pm.removeView(setVM);
     },
 };

package/lib/Components/Selection/Adapters/selectableStateAdapter.js

@@ -14,10 +14,8 @@ exports.selectableStateAdapter = {
     },
     unsubscribe: (id, appObjects, setVM) => {
         const pm = SelectableStatePM_1.SelectableStatePM.get(id, appObjects);
-        if (!pm) {
-            appObjects.submitError("selectableStateAdapter", "Unable to find SelectableStatePM");
-            return;
+        if (pm) {
+            pm.removeView(setVM);
         }
-        pm.removeView(setVM);
     },
 };

package/lib/Components/Transform3D/Adapters/transform3dAdapter.js

@@ -14,10 +14,8 @@ exports.transform3dAdapter = {
     },
     unsubscribe: (id, appObjects, setVM) => {
         const pm = Transform3DPM_1.Transform3DPM.getForID(id, appObjects);
-        if (!pm) {
-            appObjects.submitError("transform3dAdapter", "Unable to find PM");
-            return;
+        if (pm) {
+            pm.removeView(setVM);
         }
-        pm.removeView(setVM);
     },
 };

package/package.json

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