@vived/app 4.33.2 → 4.34.0

package/lib/Components/Callouts/Factories/setupCallouts.d.ts

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

package/lib/Components/Callouts/Factories/setupCallouts.js

@@ -6,6 +6,7 @@ const calloutRepoFactory_1 = require("./calloutRepoFactory");
 const Controller_1 = require("../Controller");
 const Entities_1 = require("../Entities");
 const UC_1 = require("../UC");
+const Tools_1 = require("../../Tools");
 function setupCallouts(appObjects) {
     const calloutsAO = appObjects.getOrCreate("Callouts");
     const globals = Entities_1.makeCalloutGlobals(calloutsAO);
@@ -20,5 +21,19 @@ function setupCallouts(appObjects) {
     new Controller_1.TouchAddCalloutTC(calloutsAO);
     new Transform3D_1.TryMousePanTransformMC(calloutsAO);
     new Transform3D_1.TryTouchPanTransformTC(calloutsAO);
+    // Setup Tool
+    const toolRepo = Tools_1.ToolRepository.get(appObjects);
+    if (!toolRepo) {
+        appObjects.submitWarning("setupCallouts", "Unable to find tool repo");
+        return calloutsAO;
+    }
+    toolRepo.makeToolFromData({
+        toolType: "CALLOUT",
+        isDefault: false,
+        label: "Callout",
+        shortcutLabel: "c",
+        hotkeys: [{ keyCode: "KeyC" }],
+    });
+    return calloutsAO;
 }
 exports.setupCallouts = setupCallouts;

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

@@ -4,6 +4,7 @@ exports.makeTryAddCalloutUC = exports.TryAddCalloutUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const UC_1 = require("../../Babylon/UC");
 const Selection_1 = require("../../Selection/Entities/Selection");
+const Tools_1 = require("../../Tools");
 const PanTransformUC_1 = require("../../Transform3D/UC/PanTransformUC");
 const CreateCalloutUC_1 = require("./CreateCalloutUC");
 class TryAddCalloutUC extends AppObject_1.AppObjectUC {
@@ -21,7 +22,11 @@ class TryAddCalloutImpUC extends TryAddCalloutUC {
     constructor(appObject) {
         super(appObject, TryAddCalloutUC.type);
         this.allow = () => {
-            return true;
+            var _a, _b;
+            if (((_b = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.activeTool) === null || _b === void 0 ? void 0 : _b.toolType) === "CALLOUT") {
+                return true;
+            }
+            return false;
         };
         this.moveWithPixel = (pixel) => {
             if (!this.pixelToRay) {
@@ -100,7 +105,12 @@ class TryAddCalloutImpUC extends TryAddCalloutUC {
         var _a;
         return (_a = this.getCachedSingleton(UC_1.PixelToSceneRayUC.type)) === null || _a === void 0 ? void 0 : _a.pixelToSceneRay;
     }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
     initializeWithPixel(pixel) {
+        if (!this.allow())
+            return false;
         if (!this.pixelToRay) {
             this.error("Missing component");
             return false;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTryPanLabelUC = void 0;
 const SceneRayPickUC_1 = require("../../Babylon/UC/SceneRayPickUC");
+const Tools_1 = require("../../Tools");
 const UC_1 = require("../../Transform3D/UC");
 const CalloutEntity_1 = require("../Entities/CalloutEntity");
 function makeTryPanLabelUC(appObject) {
@@ -11,6 +12,14 @@ exports.makeTryPanLabelUC = makeTryPanLabelUC;
 class TryPanLabelUC extends UC_1.TryPanTransformUCImp {
     constructor() {
         super(...arguments);
+        this.allow = () => {
+            var _a, _b, _c, _d;
+            if (((_b = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.activeTool) === null || _b === void 0 ? void 0 : _b.toolType) !== "PEEL" &&
+                ((_d = (_c = this.toolRepo) === null || _c === void 0 ? void 0 : _c.activeTool) === null || _d === void 0 ? void 0 : _d.toolType) !== "CALLOUT") {
+                return false;
+            }
+            return true;
+        };
         this.tryWithRay = (pickRay) => {
             var _a;
             this.panUC = undefined;
@@ -35,4 +44,7 @@ class TryPanLabelUC extends UC_1.TryPanTransformUCImp {
             return true;
         };
     }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
 }

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

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

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

package/lib/Components/FramedScreen/Factories/setupFramedScreen.d.ts

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

package/lib/Components/FramedScreen/Factories/setupFramedScreen.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupFramedScreen = void 0;
+const UpdateTouchInputBound_1 = require("../../TouchController/UC/UpdateTouchInputBound");
+const EmulateDisplaySizeHook_1 = require("../../zSpace/UC/EmulateDisplaySizeHook");
+const Entities_1 = require("../Entities");
+const PM_1 = require("../PM");
+function setupFramedScreen(appObjects, containers) {
+    const frameScreenAO = appObjects.getOrCreate("FramedScreen");
+    const framedScreen = Entities_1.makeFramedScreen(frameScreenAO);
+    PM_1.makeFramedScreenSizePM(frameScreenAO);
+    let canvas;
+    containers.forEach((containerName) => {
+        const container = makeContainer(containerName, framedScreen, appObjects);
+        if (containerName === "renderCanvas") {
+            canvas = container;
+        }
+    });
+    if (canvas) {
+        new UpdateTouchInputBound_1.UpdateTouchInputBoundUC(canvas.appObject);
+        EmulateDisplaySizeHook_1.makeEmulateDisplaySizeHook(canvas.appObject);
+    }
+    else {
+        appObjects.submitWarning("setupFramedScreen", "Expected a renderCanvas id but never got one");
+    }
+    return frameScreenAO;
+}
+exports.setupFramedScreen = setupFramedScreen;
+function makeContainer(id, screen, appObjects) {
+    const ao = appObjects.getOrCreate(id);
+    const entity = Entities_1.makeFramedScreenContainer(ao);
+    PM_1.makeFramedContainerPM(ao);
+    screen.addContainer(entity);
+    return entity;
+}

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

@@ -1,4 +1,5 @@
 export * from "./Adapters";
 export * from "./Entities";
+export * from "./Factories";
 export * from "./Mocks";
 export * from "./PM";

package/lib/Components/FramedScreen/index.js

@@ -12,5 +12,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Adapters"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Factories"), exports);
 __exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);

package/lib/Components/Hideable/Controllers/HideMC.js

@@ -9,6 +9,9 @@ class HideMC extends AppObject_1.AppObjectController {
         var _a;
         super(appObject, HideMC.type);
         this.allow = (e) => {
+            if (e.button !== 0) {
+                return false;
+            }
             return true;
         };
         this.onClick = (e) => {

package/lib/Components/Hideable/Factories/setupHideable.js

@@ -18,7 +18,7 @@ function setupHideable(appObjects) {
         appObjects.submitWarning("setupHideable", "Unable to find tool repo");
         return ao;
     }
-    toolRepo.setupToolFromData({
+    toolRepo.makeToolFromData({
         toolType: "HIDE",
         isDefault: false,
         label: "Hide",

package/lib/Components/Hideable/Mocks/TryHideWithPickUCMock.d.ts

@@ -2,6 +2,7 @@
 import { AppObject, AppObjectRepo } from "../../../AppObject";
 import { TryHideWithPickUC } from "../UCs/TryHideWithPickUC";
 export declare class TryHideWithPickUCMock extends TryHideWithPickUC {
+    allow: jest.Mock<any, any>;
     tryPixelPick: jest.Mock<any, any>;
     tryRayPick: jest.Mock<any, any>;
     constructor(appObject: AppObject);

package/lib/Components/Hideable/Mocks/TryHideWithPickUCMock.js

@@ -5,6 +5,7 @@ const TryHideWithPickUC_1 = require("../UCs/TryHideWithPickUC");
 class TryHideWithPickUCMock extends TryHideWithPickUC_1.TryHideWithPickUC {
     constructor(appObject) {
         super(appObject, TryHideWithPickUC_1.TryHideWithPickUC.type);
+        this.allow = jest.fn();
         this.tryPixelPick = jest.fn();
         this.tryRayPick = jest.fn();
     }

package/lib/Components/Hideable/UCs/TryHideWithPickUC.d.ts

@@ -2,6 +2,7 @@ import { AppObject, AppObjectRepo, AppObjectUC } from "../../../AppObject";
 import { ParametricLine, Vector2 } from "../../../ValueObjects";
 export declare abstract class TryHideWithPickUC extends AppObjectUC {
     static type: string;
+    abstract allow(): boolean;
     abstract tryRayPick(ray: ParametricLine): void;
     abstract tryPixelPick(pixel: Vector2): void;
     static get(appObjects: AppObjectRepo): TryHideWithPickUC | undefined;

package/lib/Components/Hideable/UCs/TryHideWithPickUC.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTryHideWithPickUC = exports.TryHideWithPickUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const Babylon_1 = require("../../Babylon");
+const Tools_1 = require("../../Tools");
 const HideUC_1 = require("./HideUC");
 class TryHideWithPickUC extends AppObject_1.AppObjectUC {
     static get(appObjects) {
@@ -18,8 +19,18 @@ exports.makeTryHideWithPickUC = makeTryHideWithPickUC;
 class TryHideWithPickUCImp extends TryHideWithPickUC {
     constructor(appObject) {
         super(appObject, TryHideWithPickUC.type);
+        this.allow = () => {
+            var _a;
+            const hideTool = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.getTool("HIDE");
+            if ((hideTool === null || hideTool === void 0 ? void 0 : hideTool.state) !== Tools_1.ToolState.ACTIVE) {
+                return false;
+            }
+            return true;
+        };
         this.tryPixelPick = (pixel) => {
             var _a;
+            if (!this.allow())
+                return;
             if (!this.pixelPick) {
                 return;
             }
@@ -30,6 +41,8 @@ class TryHideWithPickUCImp extends TryHideWithPickUC {
         };
         this.tryRayPick = (pickRay) => {
             var _a;
+            if (!this.allow())
+                return;
             if (!this.rayPick) {
                 return;
             }
@@ -48,6 +61,9 @@ class TryHideWithPickUCImp extends TryHideWithPickUC {
         var _a;
         return (_a = this.getCachedSingleton(Babylon_1.ScenePixelPickUC.type)) === null || _a === void 0 ? void 0 : _a.scenePixelPick;
     }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
     hideObjectByID(id) {
         var _a;
         const appObj = this.appObjects.get(id);

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

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

package/lib/Components/Hideable/index.js

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

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

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

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

package/lib/Components/HoverLabel/Factories/setupHoverLabel.d.ts

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

package/lib/Components/HoverLabel/Factories/setupHoverLabel.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupHoverLabel = void 0;
+const ValueObjects_1 = require("../../../ValueObjects");
+const Stylus_1 = require("../../Stylus");
+const Transform3D_1 = require("../../Transform3D");
+const Controllers_1 = require("../Controllers");
+const Entities_1 = require("../Entities");
+const PM_1 = require("../PM");
+const UseCases_1 = require("../UseCases");
+function setupHoverLabel(appObjects) {
+    const hoverLabelAO = appObjects.getOrCreate("HoverLabel");
+    // Entity
+    const hoverLabelEntity = Entities_1.makeHoverLabelEntity(hoverLabelAO);
+    // UC
+    UseCases_1.makeTryShowHoverLabel(hoverLabelAO);
+    UseCases_1.makeToggleAllowHoverLabel(hoverLabelAO);
+    new UseCases_1.SerializeAllowHoverLabel(hoverLabelAO);
+    // PM
+    PM_1.makeWorldHoverLabelPM(hoverLabelAO);
+    PM_1.makeScreenHoverLabelPM(hoverLabelAO);
+    PM_1.makeAllowHoverLabelPM(hoverLabelAO);
+    Transform3D_1.makeTransform3DPM(hoverLabelAO);
+    // Controller
+    Controllers_1.makeHoverLabelMouse(hoverLabelAO);
+    Controllers_1.makeHoverLabelTouch(hoverLabelAO);
+    Controllers_1.makeStylusHoverLabelController(hoverLabelAO);
+    const stylus = Stylus_1.StylusEntity.get(appObjects);
+    if (!stylus) {
+        appObjects.submitError("setupHoverLabel", "StylusEntity needs to be setup before Hover Label");
+    }
+    else {
+        hoverLabelEntity.transform.parent = stylus.transform;
+        hoverLabelEntity.transform.localPosition = ValueObjects_1.Vector3.Zero();
+        hoverLabelEntity.transform.localRotation = ValueObjects_1.Quaternion.Identity();
+        hoverLabelEntity.transform.localScale = ValueObjects_1.Vector3.One();
+    }
+}
+exports.setupHoverLabel = setupHoverLabel;

package/lib/Components/HoverLabel/UseCases/TryShowHoverLabel.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTryShowHoverLabel = exports.TryShowHoverLabel = void 0;
 const AppObject_1 = require("../../../AppObject");
 const Babylon_1 = require("../../Babylon");
+const Callouts_1 = require("../../Callouts");
 const Label_1 = require("../../Label");
 const HoverLabelEntity_1 = require("../Entities/HoverLabelEntity");
 class TryShowHoverLabel extends AppObject_1.AppObjectUC {
@@ -63,6 +64,10 @@ class TryShowHoverLabelIMP extends TryShowHoverLabel {
         if (!appObj) {
             return;
         }
+        const calloutEntity = Callouts_1.CalloutEntity.get(appObj);
+        if (calloutEntity) {
+            return;
+        }
         const label = Label_1.LabelEntity.get(appObj);
         if (!label) {
             return;

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

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

package/lib/Components/HoverLabel/index.js

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

package/lib/Components/LabelDrop/Factories/setupLabelDrop.js

@@ -4,6 +4,7 @@ exports.setupLabelDrop = void 0;
 const ValueObjects_1 = require("../../../ValueObjects");
 const Stylus_1 = require("../../Stylus");
 const Transform3D_1 = require("../../Transform3D");
+const zSpace_1 = require("../../zSpace");
 const Controller_1 = require("../Controller");
 const Entities_1 = require("../Entities");
 const PM_1 = require("../PM");
@@ -16,6 +17,7 @@ function setupLabelDrop(appObjects) {
     labelDropEntity.labelDropItemFactory = labelDropItemFactory_1.makeLabelDropItemFactory(appObjects);
     // UCs
     new UseCases_1.SerializeLabelDrop(ao);
+    new UseCases_1.ClearEditingLabelDropUCHook(ao);
     UseCases_1.makeEditLabelDropUC(ao);
     UseCases_1.makeDragLabelDropUC(ao);
     UseCases_1.makeDragLabelDropWorldUC(ao);
@@ -47,5 +49,15 @@ function setupLabelDrop(appObjects) {
         labelDropEntity.dragHelperTransform.localRotation = ValueObjects_1.Quaternion.Identity();
         labelDropEntity.dragHelperTransform.localScale = ValueObjects_1.Vector3.One();
     }
+    const zSpace = zSpace_1.ZSpaceEntity.get(appObjects);
+    if (!zSpace) {
+        appObjects.submitError("setupLabelDrop", "zSpace needs to be setup before Label Drop");
+    }
+    else {
+        labelDropEntity.dragLabelTransform.parent = zSpace.display.transform;
+        labelDropEntity.dragLabelTransform.localPosition = ValueObjects_1.Vector3.Zero();
+        labelDropEntity.dragLabelTransform.localRotation = ValueObjects_1.Quaternion.Identity();
+        labelDropEntity.dragLabelTransform.localScale = ValueObjects_1.Vector3.One();
+    }
 }
 exports.setupLabelDrop = setupLabelDrop;

package/lib/Components/LabelDrop/UseCases/ClearEditingLabelDropUCHook.d.ts

@@ -0,0 +1,9 @@
+import { AppObject, AppObjectUC } from "../../../AppObject";
+export declare class ClearEditingLabelDropUCHook extends AppObjectUC {
+    static type: string;
+    private get baseApp();
+    private get labelDropRepo();
+    private lastAuthoringState?;
+    private onBaseAppChange;
+    constructor(appObject: AppObject);
+}

package/lib/Components/LabelDrop/UseCases/ClearEditingLabelDropUCHook.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClearEditingLabelDropUCHook = void 0;
+const AppObject_1 = require("../../../AppObject");
+const BaseApp_1 = require("../../BaseApp");
+const Entities_1 = require("../Entities");
+class ClearEditingLabelDropUCHook extends AppObject_1.AppObjectUC {
+    constructor(appObject) {
+        var _a;
+        super(appObject, ClearEditingLabelDropUCHook.type);
+        this.onBaseAppChange = () => {
+            if (!this.baseApp || !this.labelDropRepo) {
+                this.warn("Missing Components");
+                return;
+            }
+            if (this.baseApp.isAuthoring === this.lastAuthoringState)
+                return;
+            if (this.baseApp.isAuthoring === false) {
+                this.labelDropRepo.editingID = undefined;
+            }
+            this.lastAuthoringState = this.baseApp.isAuthoring;
+        };
+        (_a = this.baseApp) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onBaseAppChange);
+    }
+    get baseApp() {
+        return this.getCachedSingleton(BaseApp_1.BaseAppState.type);
+    }
+    get labelDropRepo() {
+        return this.getCachedSingleton(Entities_1.LabelDropRepo.type);
+    }
+}
+exports.ClearEditingLabelDropUCHook = ClearEditingLabelDropUCHook;
+ClearEditingLabelDropUCHook.type = "ClearEditingLabelDropUCHook";

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

@@ -1,3 +1,4 @@
+export * from "./ClearEditingLabelDropUCHook";
 export * from "./CorrectAnimationUC";
 export * from "./DeleteAllLabelDropUC";
 export * from "./DeleteLabelDropUC";

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

@@ -10,6 +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 });
+__exportStar(require("./ClearEditingLabelDropUCHook"), exports);
 __exportStar(require("./CorrectAnimationUC"), exports);
 __exportStar(require("./DeleteAllLabelDropUC"), exports);
 __exportStar(require("./DeleteLabelDropUC"), exports);

package/lib/Components/Landmarks/Factories/setupLandmarks.d.ts

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

package/lib/Components/Landmarks/Factories/setupLandmarks.js

@@ -4,6 +4,7 @@ exports.setupLandmarks = void 0;
 const Hideable_1 = require("../../Hideable");
 const OverlayColor_1 = require("../../OverlayColor");
 const Selection_1 = require("../../Selection");
+const Tools_1 = require("../../Tools");
 const Transform3D_1 = require("../../Transform3D");
 const Controller_1 = require("../Controller");
 const Entities_1 = require("../Entities");
@@ -28,5 +29,19 @@ function setupLandmarks(appObjects) {
     Selection_1.makeSelectableStatePM(previewAO);
     Hideable_1.makeIsHiddenPM(previewAO);
     globals.previewLandmark = preview;
+    // Setup Tool
+    const toolRepo = Tools_1.ToolRepository.get(appObjects);
+    if (!toolRepo) {
+        appObjects.submitWarning("setupLandmarks", "Unable to find tool repo");
+        return landmarksAO;
+    }
+    toolRepo.makeToolFromData({
+        toolType: "LANDMARK",
+        isDefault: false,
+        label: "Landmark",
+        shortcutLabel: "l",
+        hotkeys: [{ keyCode: "KeyL" }],
+    });
+    return landmarksAO;
 }
 exports.setupLandmarks = setupLandmarks;

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

@@ -6,6 +6,7 @@ const ValueObjects_1 = require("../../../ValueObjects");
 const Babylon_1 = require("../../Babylon");
 const Dispatcher_1 = require("../../Dispatcher");
 const Label_1 = require("../../Label");
+const Tools_1 = require("../../Tools");
 const Entities_1 = require("../Entities");
 const LandmarkGlobals_1 = require("../Entities/LandmarkGlobals");
 const AddLandmarkUndoRedo_1 = require("./AddLandmarkUndoRedo");
@@ -24,8 +25,15 @@ class TryAddNewLandmarkUCImp extends TryAddNewLandmarkUC {
     get globals() {
         return this.getCachedSingleton(LandmarkGlobals_1.LandmarkGlobals.type);
     }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
     allow() {
-        return true;
+        var _a, _b;
+        if (((_b = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.activeTool) === null || _b === void 0 ? void 0 : _b.toolType) === "LANDMARK") {
+            return true;
+        }
+        return false;
     }
     addFromRay(ray) {
         if (!this.allow()) {

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

@@ -4,6 +4,7 @@ exports.makeTryPreviewLandmark = exports.TryPreviewLandmarkUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const ValueObjects_1 = require("../../../ValueObjects");
 const Babylon_1 = require("../../Babylon");
+const Tools_1 = require("../../Tools");
 const LandmarkEntity_1 = require("../Entities/LandmarkEntity");
 const LandmarkRepo_1 = require("../Entities/LandmarkRepo");
 class TryPreviewLandmarkUC extends AppObject_1.AppObjectUC {
@@ -56,7 +57,14 @@ class TryPreviewLandmarkUCImp extends TryPreviewLandmarkUC {
     get landmark() {
         return this.getCachedLocalComponent(LandmarkEntity_1.LandmarkEntity.type);
     }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
     allow() {
-        return true;
+        var _a, _b;
+        if (((_b = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.activeTool) === null || _b === void 0 ? void 0 : _b.toolType) === "LANDMARK") {
+            return true;
+        }
+        return false;
     }
 }

package/lib/Components/SceneRoot/Factories/setupSceneRoot.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSceneRoot = void 0;
+const Tools_1 = require("../../Tools");
 const Transform3D_1 = require("../../Transform3D");
 const Controllers_1 = require("../Controllers");
 const Entities_1 = require("../Entities");
@@ -40,6 +41,33 @@ function setupSceneRoot(appObjects, defaultData) {
     new Controllers_1.TouchScale(ao);
     new Controllers_1.SceneRootMoveSC(ao);
     new Controllers_1.ScaleSceneRootSC(ao);
+    // Setup Tools
+    const toolRepo = Tools_1.ToolRepository.get(appObjects);
+    if (!toolRepo) {
+        appObjects.submitWarning("setupSceneRoot", "Unable to find tool repo");
+        return ao;
+    }
+    toolRepo.makeToolFromData({
+        toolType: "ORBIT",
+        isDefault: false,
+        label: "Orbit",
+        shortcutLabel: "o",
+        hotkeys: [{ keyCode: "KeyO" }],
+    });
+    toolRepo.makeToolFromData({
+        toolType: "PAN",
+        isDefault: true,
+        label: "Pan",
+        shortcutLabel: "x",
+        hotkeys: [{ keyCode: "KeyX" }],
+    });
+    toolRepo.makeToolFromData({
+        toolType: "ZOOM",
+        isDefault: false,
+        label: "Zoom",
+        shortcutLabel: "z",
+        hotkeys: [{ keyCode: "KeyZ" }],
+    });
     return ao;
 }
 exports.setupSceneRoot = setupSceneRoot;

package/lib/Components/Selection/Factories/setupSelection.js

@@ -10,6 +10,7 @@ function setupSelection(appObjects) {
     // Entities
     Entities_1.makeSelection(appObj);
     // UCs
+    new UC_1.ClearSelectionUCHook(appObj);
     UC_1.makeHoverAppObject(appObj);
     UC_1.makePressAppObject(appObj);
     UC_1.makeSelectAppObject(appObj);

package/lib/Components/Selection/UC/ClearSelectionUCHook.d.ts

@@ -0,0 +1,9 @@
+import { AppObject, AppObjectUC } from "../../../AppObject";
+export declare class ClearSelectionUCHook extends AppObjectUC {
+    static type: string;
+    private get baseApp();
+    private get selection();
+    private lastAuthoringState?;
+    private onBaseAppChange;
+    constructor(appObject: AppObject);
+}

package/lib/Components/Selection/UC/ClearSelectionUCHook.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClearSelectionUCHook = void 0;
+const AppObject_1 = require("../../../AppObject");
+const BaseApp_1 = require("../../BaseApp");
+const Entities_1 = require("../Entities");
+class ClearSelectionUCHook extends AppObject_1.AppObjectUC {
+    constructor(appObject) {
+        var _a;
+        super(appObject, ClearSelectionUCHook.type);
+        this.onBaseAppChange = () => {
+            if (!this.baseApp || !this.selection) {
+                this.warn("Missing Components");
+                return;
+            }
+            if (this.baseApp.isAuthoring === this.lastAuthoringState)
+                return;
+            this.selection.pressedObjectId = null;
+            this.selection.hoveredObjectId = null;
+            this.selection.selectedObjectId = null;
+            this.lastAuthoringState = this.baseApp.isAuthoring;
+        };
+        (_a = this.baseApp) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onBaseAppChange);
+    }
+    get baseApp() {
+        return this.getCachedSingleton(BaseApp_1.BaseAppState.type);
+    }
+    get selection() {
+        return this.getCachedSingleton(Entities_1.Selection.type);
+    }
+}
+exports.ClearSelectionUCHook = ClearSelectionUCHook;
+ClearSelectionUCHook.type = "ClearSelectionUCHook";

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

@@ -1,3 +1,4 @@
+export * from "./ClearSelectionUCHook";
 export * from "./HoverAppObjectUC";
 export * from "./PressAppObjectUC";
 export * from "./SelectAppObjectUC";

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

@@ -10,6 +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 });
+__exportStar(require("./ClearSelectionUCHook"), exports);
 __exportStar(require("./HoverAppObjectUC"), exports);
 __exportStar(require("./PressAppObjectUC"), exports);
 __exportStar(require("./SelectAppObjectUC"), exports);

package/lib/Components/Tools/Adapters/toolAdapter.js

@@ -5,9 +5,11 @@ const ToolPM_1 = require("../PM/ToolPM");
 exports.toolAdapter = {
     defaultVM: ToolPM_1.defaultToolVM,
     subscribe: (id, appObjects, setVM) => {
+        if (!id)
+            return;
         const pm = ToolPM_1.ToolPM.get(id, appObjects);
         if (!pm) {
-            appObjects.submitError("toolAdapter", "Unable to find ToolPM");
+            appObjects.submitError("toolAdapter", "Unable to find ToolPM for " + id);
             return;
         }
         pm.addView(setVM);

package/lib/Components/Tools/Entities/ToolEntity.d.ts

@@ -7,13 +7,6 @@ export declare enum ToolState {
     ENABLED = "ENABLED",
     ACTIVE = "ACTIVE"
 }
-export interface ToolData {
-    toolType: string;
-    isDefault: boolean;
-    label: string;
-    shortcutLabel: string;
-    hotkeys: HotKey[];
-}
 export interface HotKey {
     keyCode: string;
     control?: boolean;
@@ -26,17 +19,16 @@ export declare abstract class ToolEntity extends AppObjectEntity {
     abstract get toolType(): string | undefined;
     abstract get label(): string;
     abstract set label(toolLabel: string);
-    abstract readonly isDefault: boolean;
     abstract get shortcutLabel(): string;
     abstract set shortcutLabel(shorcut: string);
     abstract get state(): ToolState;
     abstract set state(val: ToolState);
-    abstract readonly hotkeys: HotKey[];
+    abstract get hotkeys(): HotKey[];
+    abstract set hotkeys(val: HotKey[]);
     abstract get isAction(): boolean;
     abstract triggerActions(): void;
     abstract registerAction(action: () => void): void;
     abstract isMyHotkey(hotkey: HotKey): boolean;
-    abstract setupFromData(data: ToolData): void;
     static get(id: string, appObjects: AppObjectRepo): ToolEntity | undefined;
 }
 export declare function makeToolEntity(appObject: AppObject): ToolEntity;

package/lib/Components/Tools/Entities/ToolEntity.js

@@ -25,7 +25,6 @@ exports.makeToolEntity = makeToolEntity;
 class ToolEntityImp extends ToolEntity {
     constructor(appObject) {
         super(appObject, ToolEntity.type);
-        this._isDefault = false;
         this.memoizedLabel = new Entities_1.MemoizedString("", this.notifyOnChange);
         this.memoizedShortcut = new Entities_1.MemoizedString("", this.notifyOnChange);
         this.memoizedState = new Entities_1.MemoizedString(ToolState.ENABLED, this.notifyOnChange);
@@ -50,19 +49,9 @@ class ToolEntityImp extends ToolEntity {
             });
             return isMine;
         };
-        this.setupFromData = (data) => {
-            this._toolType = data.toolType;
-            this.memoizedLabel.val = data.label;
-            this._isDefault = data.isDefault;
-            this.memoizedShortcut.val = data.shortcutLabel;
-            this._hotkeys = data.hotkeys;
-        };
     }
     get toolType() {
-        return this._toolType;
-    }
-    get isDefault() {
-        return this._isDefault;
+        return this.appObject.id;
     }
     get label() {
         return this.memoizedLabel.val;
@@ -88,6 +77,10 @@ class ToolEntityImp extends ToolEntity {
     get hotkeys() {
         return this._hotkeys;
     }
+    set hotkeys(val) {
+        this._hotkeys = val;
+        this.notifyOnChange();
+    }
     hotkeysMatch(a, b) {
         if (a.keyCode !== b.keyCode)
             return false;

package/lib/Components/Tools/Entities/ToolRepository.d.ts

@@ -1,17 +1,24 @@
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectEntity } from "../../../AppObject/AppObjectEntity";
 import { AppObjectRepo } from "../../../AppObject/AppObjectRepo";
-import { HotKey, ToolData, ToolEntity } from "./ToolEntity";
+import { HotKey, ToolEntity } from "./ToolEntity";
+export interface ToolData {
+    toolType: string;
+    isDefault: boolean;
+    label: string;
+    shortcutLabel: string;
+    hotkeys: HotKey[];
+}
 export declare abstract class ToolRepository extends AppObjectEntity {
     static readonly type = "TOOL_REPOSITORY";
     abstract get activeTool(): ToolEntity | undefined;
     abstract get allTools(): ToolEntity[];
-    abstract setupToolsFromData(toolData: ToolData[]): void;
+    abstract defaultToolType: string | undefined;
+    abstract makeToolFromData(toolData: ToolData): ToolEntity;
     abstract getTool(toolType: string): ToolEntity | undefined;
     abstract getToolForHotkey(hotkey: HotKey): ToolEntity | undefined;
     abstract setDefaultToolActive(): void;
     abstract triggerTool(toolType: string): void;
-    abstract toggleToolVisibility(toolType: string): void;
     abstract toolFactory: (id: string) => ToolEntity;
     abstract makeTool(id: string): ToolEntity;
     static get: (appObjects: AppObjectRepo) => ToolRepository | undefined;

package/lib/Components/Tools/Entities/ToolRepository.js

@@ -18,7 +18,7 @@ class ToolRepositoryImp extends ToolRepository {
         super(appObject, ToolRepository.type);
         this.toolLookup = new Map();
         this.toolFactory = (id) => {
-            const ao = this.appObjects.getOrCreate(id + "_tool");
+            const ao = this.appObjects.getOrCreate(id);
             const toolEntity = ToolEntity_1.makeToolEntity(ao);
             return toolEntity;
         };
@@ -27,11 +27,8 @@ class ToolRepositoryImp extends ToolRepository {
         return Array.from(this.toolLookup.values());
     }
     setDefaultToolActive() {
-        if (this._defaultToolType !== undefined) {
-            this.triggerTool(this._defaultToolType);
-        }
-        else {
-            this.warn(`No default tools has been specified`);
+        if (this.defaultToolType !== undefined) {
+            this.triggerTool(this.defaultToolType);
         }
     }
     getTool(type) {
@@ -80,52 +77,27 @@ class ToolRepositoryImp extends ToolRepository {
         });
         this.notifyOnChange();
     }
-    toggleToolVisibility(type) {
-        const tool = this.getTool(type);
-        if (!tool) {
-            this.warn(`Unable to find tool to toggle: ${type}`);
-            return;
-        }
-        if (tool.toolType === this._defaultToolType) {
-            this.warn(`The default tool's visibility cannot be toggled`);
-            return;
-        }
-        if (tool.state === ToolEntity_1.ToolState.HIDDEN) {
-            tool.state = ToolEntity_1.ToolState.ENABLED;
-        }
-        else {
-            if (tool.state === ToolEntity_1.ToolState.ACTIVE) {
-                this.setDefaultToolActive();
-            }
-            tool.state = ToolEntity_1.ToolState.HIDDEN;
-        }
-    }
-    makeTool(id) {
-        const tool = this.toolFactory(id);
-        if (this.toolLookup.has(id)) {
-            this.warn(`A tool with the ID ${id} already exists. Replacing`);
+    makeTool(toolType) {
+        const tool = this.toolFactory(toolType);
+        if (this.toolLookup.has(toolType)) {
+            this.warn(`A tool with the ID ${toolType} already exists. Replacing`);
         }
-        this.toolLookup.set(id, tool);
+        this.toolLookup.set(toolType, tool);
         return tool;
     }
-    setupToolsFromData(toolDatas) {
-        toolDatas.forEach((toolData) => {
-            const toolType = toolData.toolType;
-            const tool = this.makeTool(toolType);
-            tool.setupFromData(toolData);
-            if (toolData.isDefault) {
-                if (this._defaultToolType) {
-                    this.warn(`More than one tools is marked as default. Replacing`);
-                }
-                this._defaultToolType = toolType;
-            }
-        });
-        if (!this._defaultToolType) {
-            this.warn(`No default tools was specified. Defaulting to the first tool in the list`);
-            this._defaultToolType = Array.from(this.toolLookup.keys())[0];
+    makeToolFromData(toolData) {
+        const { toolType, isDefault, label, shortcutLabel, hotkeys } = toolData;
+        const tool = this.makeTool(toolType);
+        tool.label = label;
+        tool.shortcutLabel = shortcutLabel;
+        tool.hotkeys = hotkeys;
+        if (isDefault) {
+            this.defaultToolType = toolType;
+            this.triggerTool(toolData.toolType);
         }
-        if (this._defaultToolType) {
-            this.triggerTool(this._defaultToolType);
+        else if (this.activeTool === undefined) {
+            this.triggerTool(toolData.toolType);
         }
+        return tool;
     }
 }

package/lib/Components/Tools/Factories/setupTools.d.ts

@@ -1,3 +1,2 @@
 import { AppObject, AppObjectRepo } from "../../../AppObject";
-import { ToolData } from "../Entities";
-export declare function setupTools(appObjects: AppObjectRepo, toolData: ToolData[]): AppObject;
+export declare function setupTools(appObjects: AppObjectRepo): AppObject;

package/lib/Components/Tools/Factories/setupTools.js

@@ -4,11 +4,10 @@ exports.setupTools = void 0;
 const Controller_1 = require("../Controller");
 const Entities_1 = require("../Entities");
 const toolFactory_1 = require("./toolFactory");
-function setupTools(appObjects, toolData) {
+function setupTools(appObjects) {
     const ao = appObjects.getOrCreate("ToolRepo");
     const toolRepo = Entities_1.makeToolRepo(ao);
     toolRepo.toolFactory = toolFactory_1.makeToolFactory(appObjects);
-    toolRepo.setupToolsFromData(toolData);
     new Controller_1.ToolHotkeys(ao);
     return ao;
 }

package/lib/Components/Tools/Mocks/MockToolRepo.d.ts

@@ -2,9 +2,10 @@
 import { AppObject, AppObjectRepo } from "../../../AppObject";
 import { ToolEntity, ToolRepository } from "../Entities";
 export declare class MockToolRepo extends ToolRepository {
+    defaultToolType: string | undefined;
     get activeTool(): ToolEntity | undefined;
     get allTools(): ToolEntity[];
-    setupToolsFromData: jest.Mock<any, any>;
+    makeToolFromData: jest.Mock<any, any>;
     getTool: jest.Mock<any, any>;
     getToolForHotkey: jest.Mock<any, any>;
     setDefaultToolActive: jest.Mock<any, any>;

package/lib/Components/Tools/Mocks/MockToolRepo.js

@@ -5,7 +5,7 @@ const Entities_1 = require("../Entities");
 class MockToolRepo extends Entities_1.ToolRepository {
     constructor(appObject) {
         super(appObject, Entities_1.ToolRepository.type);
-        this.setupToolsFromData = jest.fn();
+        this.makeToolFromData = jest.fn();
         this.getTool = jest.fn();
         this.getToolForHotkey = jest.fn();
         this.setDefaultToolActive = jest.fn();

package/lib/Components/UndoRedo/Factories/setupUndoRedo.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupUndoRedo = void 0;
+const Tools_1 = require("../../Tools");
+const Controllers_1 = require("../Controllers");
 const Entities_1 = require("../Entities");
 const PM_1 = require("../PM");
 const UCs_1 = require("../UCs");
@@ -13,6 +15,41 @@ function setupUndoRedo(appObjects) {
     // PMs
     PM_1.makeHasUndoPM(ao);
     PM_1.makeHasRedoPM(ao);
+    // Setup Tools
+    const toolRepo = Tools_1.ToolRepository.get(appObjects);
+    if (!toolRepo) {
+        appObjects.submitWarning("setupHideable", "Unable to find tool repo");
+        return ao;
+    }
+    let modifierKeyPrefix = "Ctrl";
+    if (navigator.platform.indexOf("Mac") === 0 ||
+        navigator.platform === "iPhone") {
+        modifierKeyPrefix = "⌘";
+    }
+    const undoTool = toolRepo.makeToolFromData({
+        toolType: "UNDO",
+        isDefault: false,
+        label: "Undo",
+        shortcutLabel: `${modifierKeyPrefix} + z`,
+        hotkeys: [
+            { keyCode: "KeyZ", control: true },
+            { keyCode: "KeyZ", meta: true },
+        ],
+    });
+    undoTool.registerAction(() => Controllers_1.doUndo(appObjects));
+    const redoTool = toolRepo.makeToolFromData({
+        toolType: "REDO",
+        isDefault: false,
+        label: "Redo",
+        shortcutLabel: `${modifierKeyPrefix} + Shift + z`,
+        hotkeys: [
+            { keyCode: "KeyY", control: true },
+            { keyCode: "KeyY", meta: true },
+            { keyCode: "KeyZ", control: true, shift: true },
+            { keyCode: "KeyZ", meta: true, shift: true },
+        ],
+    });
+    redoTool.registerAction(() => Controllers_1.doRedo(appObjects));
     return ao;
 }
 exports.setupUndoRedo = setupUndoRedo;

package/lib/Components/UndoRedo/UCs/UndoRedoButtonStatesHook.d.ts

@@ -4,8 +4,6 @@ export declare class UndoRedoToolStatesHook extends AppObjectUC {
     private get baseApp();
     private get undoRedo();
     private get toolRepo();
-    private undoTool?;
-    private redoTool?;
     onUndoRedoChange: () => void;
     constructor(appObject: AppObject);
 }

package/lib/Components/UndoRedo/UCs/UndoRedoButtonStatesHook.js

@@ -7,38 +7,39 @@ const Entities_1 = require("../../Tools/Entities");
 const Entities_2 = require("../Entities");
 class UndoRedoToolStatesHook extends AppObject_1.AppObjectUC {
     constructor(appObject) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         super(appObject, UndoRedoToolStatesHook.type);
         this.onUndoRedoChange = () => {
+            var _a, _b;
+            const undoTool = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.getTool("UNDO");
+            const redoTool = (_b = this.toolRepo) === null || _b === void 0 ? void 0 : _b.getTool("REDO");
             if (!this.baseApp)
                 return;
             if (!this.undoRedo)
                 return;
-            if (this.redoTool) {
+            if (redoTool) {
                 if (this.baseApp.isAuthoring) {
-                    this.redoTool.state = this.undoRedo.hasRedo
+                    redoTool.state = this.undoRedo.hasRedo
                         ? Entities_1.ToolState.ENABLED
                         : Entities_1.ToolState.DISABLED;
                 }
                 else {
-                    this.redoTool.state = Entities_1.ToolState.HIDDEN;
+                    redoTool.state = Entities_1.ToolState.HIDDEN;
                 }
             }
-            if (this.undoTool) {
+            if (undoTool) {
                 if (this.baseApp.isAuthoring) {
-                    this.undoTool.state = this.undoRedo.hasUndo
+                    undoTool.state = this.undoRedo.hasUndo
                         ? Entities_1.ToolState.ENABLED
                         : Entities_1.ToolState.DISABLED;
                 }
                 else {
-                    this.undoTool.state = Entities_1.ToolState.HIDDEN;
+                    undoTool.state = Entities_1.ToolState.HIDDEN;
                 }
             }
         };
-        this.undoTool = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.getTool("UNDO");
-        this.redoTool = (_b = this.toolRepo) === null || _b === void 0 ? void 0 : _b.getTool("REDO");
-        (_c = this.undoRedo) === null || _c === void 0 ? void 0 : _c.addChangeObserver(this.onUndoRedoChange);
-        (_d = this.baseApp) === null || _d === void 0 ? void 0 : _d.addChangeObserver(this.onUndoRedoChange);
+        (_a = this.undoRedo) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onUndoRedoChange);
+        (_b = this.baseApp) === null || _b === void 0 ? void 0 : _b.addChangeObserver(this.onUndoRedoChange);
         this.onUndoRedoChange();
     }
     get baseApp() {

package/lib/Components/zSpace/Factory/index.d.ts

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

package/lib/Components/zSpace/Factory/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("./setupZSpace"), exports);

package/lib/Components/zSpace/Factory/setupZSpace.d.ts

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

package/lib/Components/zSpace/Factory/setupZSpace.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupZSpace = void 0;
+const Dispatcher_1 = require("../../Dispatcher");
+const Transform3D_1 = require("../../Transform3D");
+const XR_1 = require("../../XR");
+const Entities_1 = require("../Entities");
+const PM_1 = require("../PM");
+const UC_1 = require("../UC");
+function setupZSpace(appObjectRepo) {
+    const zSpaceAO = appObjectRepo.getOrCreate("zSpace");
+    Transform3D_1.Transform3D.addIfMissing(zSpaceAO);
+    const zSpaceEntity = Entities_1.makeZSpaceEntity(zSpaceAO);
+    XR_1.makeXREntity(zSpaceAO);
+    UC_1.makeViewFromPoseHook(zSpaceAO);
+    UC_1.makeStylusFromGamepadHook(zSpaceAO);
+    PM_1.makeZSpaceIsEnabledPM(zSpaceAO);
+    PM_1.makeZSpaceViewerScalePM(zSpaceAO);
+    const displayAO = zSpaceEntity.display.appObject;
+    Transform3D_1.makeTransform3DPM(displayAO);
+    PM_1.makeZSpaceDisplayPM(displayAO);
+    PM_1.makeZSpaceIsSupportedPM(zSpaceAO);
+    const checkForZSpace = Dispatcher_1.IsZSpaceAvailableUC.get(appObjectRepo);
+    if (checkForZSpace) {
+        checkForZSpace.doDispatch().then((isSupported) => {
+            zSpaceEntity.isSupported = isSupported;
+        });
+    }
+    else {
+        appObjectRepo.submitWarning("setupZSpace", "Unable to find IsZSpaceAvailableUC. A dispatcher needs to be setup before zSpace");
+    }
+    return zSpaceAO;
+}
+exports.setupZSpace = setupZSpace;

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

@@ -1,5 +1,6 @@
 export * from "./Adapters";
 export * from "./Entities";
+export * from "./Factory";
 export * from "./Mocks";
 export * from "./PM";
 export * from "./UC";

package/lib/Components/zSpace/index.js

@@ -12,6 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Adapters"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Factory"), exports);
 __exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);
 __exportStar(require("./UC"), exports);

package/package.json

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