@vived/app 4.30.0 → 4.32.0

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

@@ -1 +1,2 @@
 export * from "./SetOverlayColorUC";
+export * from "./SerializeOverlayColoredObjects";

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

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

package/lib/Components/SceneRoot/Controllers/DoubleTapToFocus.d.ts

@@ -9,7 +9,7 @@ export declare class DoubleTapToFocus extends AppObjectController implements Tou
     private initialTouchPos;
     private initialTouchTime;
     private tapCount;
-    private focusOnPixelUC?;
+    private get focusOnPixelUC();
     allow: (e: TouchInputEvent) => boolean;
     onTouchStart: (e: TouchInputEvent) => void;
     onTouchMove: (e: TouchInputEvent) => void;

package/lib/Components/SceneRoot/Controllers/DoubleTapToFocus.js

@@ -62,11 +62,6 @@ class DoubleTapToFocus extends AppObjectController_1.AppObjectController {
             this.tapCount = 0;
         };
         const appObjects = appObject.appObjectRepo;
-        this.focusOnPixelUC = appObject.getComponent(FocusOnPixel_1.FocusOnPixelUC.type);
-        if (!this.focusOnPixelUC) {
-            this.warn("Controller has been added to an App Object that does not have FocusOnPixelUC. Add one first.");
-            return;
-        }
         const touchInput = TouchController_1.TouchInputEntity.get(appObjects);
         if (touchInput) {
             touchInput.registerController(this);
@@ -75,6 +70,9 @@ class DoubleTapToFocus extends AppObjectController_1.AppObjectController {
             this.warn("Unable to find TouchInputEntity");
         }
     }
+    get focusOnPixelUC() {
+        return this.getCachedLocalComponent(FocusOnPixel_1.FocusOnPixelUC.type);
+    }
     checkForMovement(currentPixelPos) {
         const movement = ValueObjects_1.Vector2.Subtract(this.initialTouchPos, currentPixelPos)
             .magnitued;

package/lib/Components/SceneRoot/Controllers/MouseClickToFocus.d.ts

@@ -3,7 +3,7 @@ import { AppObjectController } from "../../../AppObject/AppObjectController";
 import { MouseController, MouseInputEvent } from "../../MouseInput";
 export declare class MouseClickToFocus extends AppObjectController implements MouseController {
     static readonly type = "MouseClickToFocus";
-    private centerOnPixelUI?;
+    private get centerOnPixelUI();
     allow: (e: MouseInputEvent) => boolean;
     onClick: (e: MouseInputEvent) => void;
     constructor(appObject: AppObject);

package/lib/Components/SceneRoot/Controllers/MouseClickToFocus.js

@@ -8,6 +8,9 @@ class MouseClickToFocus extends AppObjectController_1.AppObjectController {
     constructor(appObject) {
         super(appObject, MouseClickToFocus.type);
         this.allow = (e) => {
+            if (e.button === 0) {
+                return false;
+            }
             return true;
         };
         this.onClick = (e) => {
@@ -16,11 +19,6 @@ class MouseClickToFocus extends AppObjectController_1.AppObjectController {
                 (_a = this.centerOnPixelUI) === null || _a === void 0 ? void 0 : _a.centerOnPixel(e.position);
             }
         };
-        this.centerOnPixelUI = appObject.getComponent(CenterSceneRootOnPixelPick_1.CenterSceneRootOnPixelPickUC.type);
-        if (!this.centerOnPixelUI) {
-            this.warn("Controller has been added to an App Object that does not have CenterSceneRootOnPixelPickUC. Add one first.");
-            return;
-        }
         const mouseInput = MouseInput_1.MouseInputEntity.get(this.appObjects);
         if (mouseInput) {
             mouseInput.registerController(this);
@@ -29,6 +27,9 @@ class MouseClickToFocus extends AppObjectController_1.AppObjectController {
             this.warn("Unable to find MouseInputEntity");
         }
     }
+    get centerOnPixelUI() {
+        return this.getCachedLocalComponent(CenterSceneRootOnPixelPick_1.CenterSceneRootOnPixelPickUC.type);
+    }
 }
 exports.MouseClickToFocus = MouseClickToFocus;
 MouseClickToFocus.type = "MouseClickToFocus";

package/lib/Components/SceneRoot/Controllers/MouseDoubleClickToRecenter.d.ts

@@ -4,7 +4,7 @@ import { MouseController, MouseInputEvent } from "../../MouseInput";
 export declare class MouseDoubleClickToRecenter extends AppObjectController implements MouseController {
     static readonly type = "MouseDoubleClickToRecenter";
     protected focusDurationMS: number;
-    private focusUC?;
+    private get focusUC();
     allow: (e: MouseInputEvent) => boolean;
     onDoubleClick: (e: MouseInputEvent) => void;
     constructor(appObject: AppObject);

package/lib/Components/SceneRoot/Controllers/MouseDoubleClickToRecenter.js

@@ -17,11 +17,6 @@ class MouseDoubleClickToRecenter extends AppObjectController_1.AppObjectControll
                 (_a = this.focusUC) === null || _a === void 0 ? void 0 : _a.centerOnPixel(e.position);
             }
         };
-        this.focusUC = appObject.getComponent(FocusOnPixel_1.FocusOnPixelUC.type);
-        if (!this.focusUC) {
-            this.warn("Controller has been added to an App Object that does not have FocusOnPixelUC. Add one first.");
-            return;
-        }
         const mouseInput = MouseInput_1.MouseInputEntity.get(this.appObjects);
         if (mouseInput) {
             mouseInput.registerController(this);
@@ -30,6 +25,9 @@ class MouseDoubleClickToRecenter extends AppObjectController_1.AppObjectControll
             this.warn("Unable to find MouseInputEntity");
         }
     }
+    get focusUC() {
+        return this.getCachedLocalComponent(FocusOnPixel_1.FocusOnPixelUC.type);
+    }
 }
 exports.MouseDoubleClickToRecenter = MouseDoubleClickToRecenter;
 MouseDoubleClickToRecenter.type = "MouseDoubleClickToRecenter";

package/lib/Components/SceneRoot/Controllers/MouseOrbit.d.ts

@@ -4,7 +4,8 @@ import { MouseController, MouseInputEvent } from "../../MouseInput";
 export declare class MouseOrbit extends AppObjectController implements MouseController {
     static readonly type = "MouseOrbit";
     private isOrbiting;
-    private orbitSceneRoot?;
+    private get orbitSceneRoot();
+    private get toolRepo();
     allow: (e: MouseInputEvent) => boolean;
     onDown: (e: MouseInputEvent) => void;
     onMove: (e: MouseInputEvent) => void;

package/lib/Components/SceneRoot/Controllers/MouseOrbit.js

@@ -3,13 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MouseOrbit = void 0;
 const AppObjectController_1 = require("../../../AppObject/AppObjectController");
 const MouseInput_1 = require("../../MouseInput");
+const Tools_1 = require("../../Tools");
 const OrbitSceneRoot_1 = require("../UC/OrbitSceneRoot");
 class MouseOrbit extends AppObjectController_1.AppObjectController {
     constructor(appObject) {
         super(appObject, MouseOrbit.type);
         this.isOrbiting = false;
         this.allow = (e) => {
-            return true;
+            var _a;
+            const orbitTool = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.getTool("ORBIT");
+            if (!orbitTool)
+                return false;
+            const orbitToolIsActive = orbitTool.state === Tools_1.ToolState.ACTIVE;
+            if (e.button === 0 && orbitToolIsActive) {
+                return true;
+            }
+            else if (e.button === 2) {
+                return true;
+            }
+            return false;
         };
         this.onDown = (e) => {
             this.isOrbiting = false;
@@ -35,11 +47,6 @@ class MouseOrbit extends AppObjectController_1.AppObjectController {
             this.orbitSceneRoot.finishOrbit();
             this.isOrbiting = false;
         };
-        this.orbitSceneRoot = appObject.getComponent(OrbitSceneRoot_1.OrbitSceneRootUC.type);
-        if (!this.orbitSceneRoot) {
-            this.warn("Controller has been added to an App Object that does not have OrbitSceneRootUC. Add one first.");
-            return;
-        }
         const mouseInput = MouseInput_1.MouseInputEntity.get(this.appObjects);
         if (mouseInput) {
             mouseInput.registerController(this);
@@ -48,6 +55,12 @@ class MouseOrbit extends AppObjectController_1.AppObjectController {
             this.warn("Unable to find MouseInputEntity");
         }
     }
+    get orbitSceneRoot() {
+        return this.getCachedLocalComponent(OrbitSceneRoot_1.OrbitSceneRootUC.type);
+    }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
 }
 exports.MouseOrbit = MouseOrbit;
 MouseOrbit.type = "MouseOrbit";

package/lib/Components/SceneRoot/Controllers/MousePan.d.ts

@@ -4,8 +4,9 @@ import { MouseController, MouseInputEvent } from "../../MouseInput";
 export declare class MousePan extends AppObjectController implements MouseController {
     static readonly type = "MousePan";
     private doPan;
+    private get panRootUC();
+    private get toolRepo();
     allow: (e: MouseInputEvent) => boolean;
-    private panRootUC?;
     onDown: (e: MouseInputEvent) => void;
     onMove: (e: MouseInputEvent) => void;
     onUp: () => void;

package/lib/Components/SceneRoot/Controllers/MousePan.js

@@ -3,13 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MousePan = void 0;
 const AppObjectController_1 = require("../../../AppObject/AppObjectController");
 const MouseInput_1 = require("../../MouseInput");
+const Tools_1 = require("../../Tools");
 const PanSceneRoot_1 = require("../UC/PanSceneRoot");
 class MousePan extends AppObjectController_1.AppObjectController {
     constructor(appObject) {
         super(appObject, MousePan.type);
         this.doPan = false;
         this.allow = (e) => {
-            return true;
+            var _a;
+            const panTool = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.getTool("PAN");
+            if (!panTool)
+                return false;
+            const panToolIsActive = panTool.state === Tools_1.ToolState.ACTIVE;
+            if (e.button === 0 && panToolIsActive) {
+                return true;
+            }
+            else if (e.button === 1) {
+                return true;
+            }
+            return false;
         };
         this.onDown = (e) => {
             var _a;
@@ -30,11 +42,6 @@ class MousePan extends AppObjectController_1.AppObjectController {
             this.doPan = false;
             (_a = this.panRootUC) === null || _a === void 0 ? void 0 : _a.finishPan();
         };
-        this.panRootUC = appObject.getComponent(PanSceneRoot_1.PanSceneRootUC.type);
-        if (!this.panRootUC) {
-            this.warn("Controller has been added to an App Object that does not have PanSceneRootUC. Add one first.");
-            return;
-        }
         const mouseInput = MouseInput_1.MouseInputEntity.get(this.appObjects);
         if (mouseInput) {
             mouseInput.registerController(this);
@@ -43,6 +50,12 @@ class MousePan extends AppObjectController_1.AppObjectController {
             this.warn("Unable to find MouseInputEntity");
         }
     }
+    get panRootUC() {
+        return this.getCachedLocalComponent(PanSceneRoot_1.PanSceneRootUC.type);
+    }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
 }
 exports.MousePan = MousePan;
 MousePan.type = "MousePan";

package/lib/Components/SceneRoot/Controllers/MouseRoll.d.ts

@@ -3,7 +3,7 @@ import { AppObjectController } from "../../../AppObject/AppObjectController";
 import { MouseController, MouseWheelEvent } from "../../MouseInput";
 export declare class MouseRoll extends AppObjectController implements MouseController {
     static readonly type = "MouseRoll";
-    private bumpRootScaleUC?;
+    private get bumpRootScaleUC();
     allow: (e: MouseWheelEvent) => boolean;
     onWheel: (e: MouseWheelEvent) => void;
     constructor(appObject: AppObject);

package/lib/Components/SceneRoot/Controllers/MouseRoll.js

@@ -18,11 +18,6 @@ class MouseRoll extends AppObjectController_1.AppObjectController {
             }
             this.bumpRootScaleUC.bump(e.event.deltaY > 0 ? "OUT" : "IN", e.position);
         };
-        this.bumpRootScaleUC = appObject.getComponent(BumpSceneRootScaleAboutPixelPoint_1.BumpSceneRootScaleAboutPixelPointUC.type);
-        if (!this.bumpRootScaleUC) {
-            this.warn("Controller has been added to an App Object that does not have BumpSceneRootScaleAboutPixelPointUC. Add one first.");
-            return;
-        }
         const mouseInput = MouseInput_1.MouseInputEntity.get(this.appObjects);
         if (mouseInput) {
             mouseInput.registerController(this);
@@ -31,6 +26,9 @@ class MouseRoll extends AppObjectController_1.AppObjectController {
             this.warn("Unable to find MouseInputEntity");
         }
     }
+    get bumpRootScaleUC() {
+        return this.getCachedLocalComponent(BumpSceneRootScaleAboutPixelPoint_1.BumpSceneRootScaleAboutPixelPointUC.type);
+    }
 }
 exports.MouseRoll = MouseRoll;
 MouseRoll.type = "MouseRoll";

package/lib/Components/SceneRoot/Controllers/MouseScale.d.ts

@@ -4,7 +4,8 @@ import { MouseController, MouseInputEvent } from "../../MouseInput";
 export declare class MouseScale extends AppObjectController implements MouseController {
     static readonly type = "MouseScale";
     private isDollying;
-    private dragScaleRootUC?;
+    private get dragScaleRootUC();
+    private get toolRepo();
     allow: (e: MouseInputEvent) => boolean;
     onDown: (e: MouseInputEvent) => void;
     onMove: (e: MouseInputEvent) => void;

package/lib/Components/SceneRoot/Controllers/MouseScale.js

@@ -3,13 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MouseScale = void 0;
 const AppObjectController_1 = require("../../../AppObject/AppObjectController");
 const MouseInput_1 = require("../../MouseInput");
+const Tools_1 = require("../../Tools");
 const DragScaleSceneRoot_1 = require("../UC/DragScaleSceneRoot");
 class MouseScale extends AppObjectController_1.AppObjectController {
     constructor(appObject) {
         super(appObject, MouseScale.type);
         this.isDollying = false;
         this.allow = (e) => {
-            return true;
+            var _a;
+            const zoomTool = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.getTool("ZOOM");
+            if (!zoomTool)
+                return false;
+            const zoomToolIsActive = zoomTool.state === Tools_1.ToolState.ACTIVE;
+            if (e.button === 0 && zoomToolIsActive) {
+                return true;
+            }
+            return false;
         };
         this.onDown = (e) => {
             var _a;
@@ -31,11 +40,6 @@ class MouseScale extends AppObjectController_1.AppObjectController {
             this.isDollying = false;
             (_a = this.dragScaleRootUC) === null || _a === void 0 ? void 0 : _a.finishScaling();
         };
-        this.dragScaleRootUC = appObject.getComponent(DragScaleSceneRoot_1.DragScaleSceneRootUC.type);
-        if (!this.dragScaleRootUC) {
-            this.warn("Controller has been added to an App Object that does not have DragScaleSceneRootUC. Add one first.");
-            return;
-        }
         const mouseInput = MouseInput_1.MouseInputEntity.get(this.appObjects);
         if (mouseInput) {
             mouseInput.registerController(this);
@@ -44,6 +48,12 @@ class MouseScale extends AppObjectController_1.AppObjectController {
             this.warn("Unable to find MouseInputEntity");
         }
     }
+    get dragScaleRootUC() {
+        return this.getCachedLocalComponent(DragScaleSceneRoot_1.DragScaleSceneRootUC.type);
+    }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
 }
 exports.MouseScale = MouseScale;
 MouseScale.type = "MouseScale";

package/lib/Components/SceneRoot/Controllers/ScaleSceneRootSC.d.ts

@@ -3,8 +3,8 @@ import { AppObjectController } from "../../../AppObject/AppObjectController";
 import { StylusController } from "../../Stylus";
 export declare class ScaleSceneRootSC extends AppObjectController implements StylusController {
     static readonly type = "ScaleSceneRootSC";
-    private stylus?;
-    private scaleSceneRootWithRay?;
+    private get stylus();
+    private get scaleSceneRootWithRay();
     private isScaling;
     allow: (button: number) => boolean;
     onButtonDown: (button: number) => void;

package/lib/Components/SceneRoot/Controllers/ScaleSceneRootSC.js

@@ -6,6 +6,7 @@ const ScaleSceneRootWithRay_1 = require("../UC/ScaleSceneRootWithRay");
 const Stylus_1 = require("../../Stylus");
 class ScaleSceneRootSC extends AppObjectController_1.AppObjectController {
     constructor(appObject) {
+        var _a;
         super(appObject, ScaleSceneRootSC.type);
         this.isScaling = false;
         this.allow = (button) => {
@@ -38,17 +39,13 @@ class ScaleSceneRootSC extends AppObjectController_1.AppObjectController {
         this.onButtonUp = () => {
             this.isScaling = false;
         };
-        this.stylus = Stylus_1.StylusEntity.get(this.appObjects);
-        if (!this.stylus) {
-            this.warn("Unable to find StylusEntity");
-            return;
-        }
-        this.scaleSceneRootWithRay = appObject.getComponent(ScaleSceneRootWithRay_1.ScaleSceneRootWithRay.type);
-        if (!this.scaleSceneRootWithRay) {
-            this.error("StylusMoveSceneRoot has been added to an App Object that does not have a scaleSceneRootWithRay");
-            return;
-        }
-        this.stylus.registerController(this);
+        (_a = this.stylus) === null || _a === void 0 ? void 0 : _a.registerController(this);
+    }
+    get stylus() {
+        return this.getCachedSingleton(Stylus_1.StylusEntity.type);
+    }
+    get scaleSceneRootWithRay() {
+        return this.getCachedLocalComponent(ScaleSceneRootWithRay_1.ScaleSceneRootWithRay.type);
     }
 }
 exports.ScaleSceneRootSC = ScaleSceneRootSC;

package/lib/Components/SceneRoot/Controllers/SceneRootMoveSC.d.ts

@@ -3,8 +3,8 @@ import { AppObjectController } from "../../../AppObject/AppObjectController";
 import { StylusController } from "../../Stylus";
 export declare class SceneRootMoveSC extends AppObjectController implements StylusController {
     static readonly type = "SceneRootMoveSC";
-    private stylus?;
-    private stylusRootMovementUC?;
+    private get stylus();
+    private get stylusRootMovementUC();
     private isMoving;
     allow: (button: number) => boolean;
     onButtonDown: (button: number) => void;

package/lib/Components/SceneRoot/Controllers/SceneRootMoveSC.js

@@ -6,10 +6,11 @@ const Stylus_1 = require("../../Stylus");
 const StylusMoveTransformUC_1 = require("../../Transform3D/UC/StylusMoveTransformUC");
 class SceneRootMoveSC extends AppObjectController_1.AppObjectController {
     constructor(appObject) {
+        var _a;
         super(appObject, SceneRootMoveSC.type);
         this.isMoving = false;
         this.allow = (button) => {
-            if (button === 0)
+            if (button === 2)
                 return true;
             return false;
         };
@@ -36,17 +37,13 @@ class SceneRootMoveSC extends AppObjectController_1.AppObjectController {
                 return;
             (_a = this.stylusRootMovementUC) === null || _a === void 0 ? void 0 : _a.move();
         };
-        this.stylus = Stylus_1.StylusEntity.get(this.appObjects);
-        if (!this.stylus) {
-            this.warn("Unable to find StylusEntity");
-            return;
-        }
-        this.stylusRootMovementUC = appObject.getComponent(StylusMoveTransformUC_1.StylusMoveTransformUC.type);
-        if (!this.stylusRootMovementUC) {
-            this.error("StylusMoveSceneRoot has been added to an App Object that does not have a StylusMoveTransformUC");
-            return;
-        }
-        this.stylus.registerController(this);
+        (_a = this.stylus) === null || _a === void 0 ? void 0 : _a.registerController(this);
+    }
+    get stylus() {
+        return this.getCachedSingleton(Stylus_1.StylusEntity.type);
+    }
+    get stylusRootMovementUC() {
+        return this.getCachedLocalComponent(StylusMoveTransformUC_1.StylusMoveTransformUC.type);
     }
 }
 exports.SceneRootMoveSC = SceneRootMoveSC;

package/lib/Components/SceneRoot/Controllers/TouchOrbit.d.ts

@@ -4,7 +4,9 @@ import { TouchController, TouchInputEvent } from "../../TouchController";
 export declare class TouchOrbit extends AppObjectController implements TouchController {
     static readonly type = "TouchOrbit";
     private isOrbiting;
-    private orbitSceneRoot?;
+    ORBIT_FINGER_DISTANCE_PX: number;
+    private get orbitSceneRoot();
+    private get toolRepo();
     allow: (e: TouchInputEvent) => boolean;
     onTouchStart: (e: TouchInputEvent) => void;
     onTouchMove: (e: TouchInputEvent) => void;

package/lib/Components/SceneRoot/Controllers/TouchOrbit.js

@@ -2,14 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TouchOrbit = void 0;
 const AppObjectController_1 = require("../../../AppObject/AppObjectController");
+const ValueObjects_1 = require("../../../ValueObjects");
+const Tools_1 = require("../../Tools");
 const TouchController_1 = require("../../TouchController");
 const OrbitSceneRoot_1 = require("../UC/OrbitSceneRoot");
 class TouchOrbit extends AppObjectController_1.AppObjectController {
     constructor(appObject) {
         super(appObject, TouchOrbit.type);
         this.isOrbiting = false;
+        this.ORBIT_FINGER_DISTANCE_PX = 80;
         this.allow = (e) => {
-            return true;
+            var _a;
+            const orbitTool = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.getTool("ORBIT");
+            if (!orbitTool)
+                return false;
+            const orbitToolIsActive = orbitTool.state === Tools_1.ToolState.ACTIVE;
+            if (e.touches.length === 1 && orbitToolIsActive) {
+                return true;
+            }
+            else if (e.touches.length === 2) {
+                const dist = ValueObjects_1.Vector2.Subtract(e.touches[0].position, e.touches[1].position).magnitued;
+                if (dist < this.ORBIT_FINGER_DISTANCE_PX) {
+                    return true;
+                }
+            }
+            return false;
         };
         this.onTouchStart = (e) => {
             var _a, _b;
@@ -33,11 +50,6 @@ class TouchOrbit extends AppObjectController_1.AppObjectController {
             (_a = this.orbitSceneRoot) === null || _a === void 0 ? void 0 : _a.finishOrbit();
         };
         const appObjects = appObject.appObjectRepo;
-        this.orbitSceneRoot = appObject.getComponent(OrbitSceneRoot_1.OrbitSceneRootUC.type);
-        if (!this.orbitSceneRoot) {
-            this.warn("Controller has been added to an App Object that does not have OrbitSceneRootUC. Add one first.");
-            return;
-        }
         const touchInput = TouchController_1.TouchInputEntity.get(appObjects);
         if (touchInput) {
             touchInput.registerController(this);
@@ -46,6 +58,12 @@ class TouchOrbit extends AppObjectController_1.AppObjectController {
             this.warn("Unable to find TouchInputEntity");
         }
     }
+    get orbitSceneRoot() {
+        return this.getCachedLocalComponent(OrbitSceneRoot_1.OrbitSceneRootUC.type);
+    }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
 }
 exports.TouchOrbit = TouchOrbit;
 TouchOrbit.type = "TouchOrbit";

package/lib/Components/SceneRoot/Controllers/TouchPan.d.ts

@@ -3,8 +3,10 @@ import { AppObjectController } from "../../../AppObject/AppObjectController";
 import { TouchController, TouchInputEvent } from "../../TouchController";
 export declare class TouchPan extends AppObjectController implements TouchController {
     static readonly type = "TouchPan";
+    PAN_FINGER_DISTANCE_PX: number;
     private isPanning;
-    private panRootUC?;
+    private get panRootUC();
+    private get toolRepo();
     allow: (e: TouchInputEvent) => boolean;
     onTouchStart: (e: TouchInputEvent) => void;
     onTouchMove: (e: TouchInputEvent) => void;

package/lib/Components/SceneRoot/Controllers/TouchPan.js

@@ -2,14 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TouchPan = void 0;
 const AppObjectController_1 = require("../../../AppObject/AppObjectController");
+const ValueObjects_1 = require("../../../ValueObjects");
+const Tools_1 = require("../../Tools");
 const TouchController_1 = require("../../TouchController");
 const PanSceneRoot_1 = require("../UC/PanSceneRoot");
 class TouchPan extends AppObjectController_1.AppObjectController {
     constructor(appObject) {
         super(appObject, TouchPan.type);
+        this.PAN_FINGER_DISTANCE_PX = 80;
         this.isPanning = false;
         this.allow = (e) => {
-            return true;
+            var _a;
+            const panTool = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.getTool("PAN");
+            if (!panTool)
+                return false;
+            const panToolIsAcvtive = panTool.state === Tools_1.ToolState.ACTIVE;
+            if (e.touches.length === 1 && panToolIsAcvtive) {
+                return true;
+            }
+            else if (e.touches.length === 2) {
+                const dist = ValueObjects_1.Vector2.Subtract(e.touches[0].position, e.touches[1].position).magnitued;
+                if (dist > this.PAN_FINGER_DISTANCE_PX) {
+                    return true;
+                }
+            }
+            return false;
         };
         this.onTouchStart = (e) => {
             var _a, _b;
@@ -34,11 +51,6 @@ class TouchPan extends AppObjectController_1.AppObjectController {
             (_a = this.panRootUC) === null || _a === void 0 ? void 0 : _a.finishPan();
         };
         const appObjects = appObject.appObjectRepo;
-        this.panRootUC = appObject.getComponent(PanSceneRoot_1.PanSceneRootUC.type);
-        if (!this.panRootUC) {
-            this.warn("Controller has been added to an App Object that does not have PanSceneRootUC. Add one first.");
-            return;
-        }
         const touchInput = TouchController_1.TouchInputEntity.get(appObjects);
         if (touchInput) {
             touchInput.registerController(this);
@@ -47,6 +59,12 @@ class TouchPan extends AppObjectController_1.AppObjectController {
             this.warn("Unable to find TouchInputEntity");
         }
     }
+    get panRootUC() {
+        return this.getCachedLocalComponent(PanSceneRoot_1.PanSceneRootUC.type);
+    }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
 }
 exports.TouchPan = TouchPan;
 TouchPan.type = "TouchPan";

package/lib/Components/SceneRoot/Controllers/TouchPinch.d.ts

@@ -1,11 +1,11 @@
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectController } from "../../../AppObject/AppObjectController";
 import { TouchController, TouchInputEvent } from "../../TouchController";
-import { PinchSceneRootUC } from "../UC/PinchSceneRoot";
 export declare class TouchPinch extends AppObjectController implements TouchController {
     static readonly type = "TouchPinch";
     private isPinching;
-    pinchRootUC?: PinchSceneRootUC;
+    PAN_FINGER_DISTANCE_PX: number;
+    private get pinchRootUC();
     allow: (e: TouchInputEvent) => boolean;
     onTouchStart: (e: TouchInputEvent) => void;
     onTouchMove: (e: TouchInputEvent) => void;

package/lib/Components/SceneRoot/Controllers/TouchPinch.js

@@ -2,14 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TouchPinch = void 0;
 const AppObjectController_1 = require("../../../AppObject/AppObjectController");
+const ValueObjects_1 = require("../../../ValueObjects");
 const TouchController_1 = require("../../TouchController");
 const PinchSceneRoot_1 = require("../UC/PinchSceneRoot");
 class TouchPinch extends AppObjectController_1.AppObjectController {
     constructor(appObject) {
         super(appObject, TouchPinch.type);
         this.isPinching = false;
+        this.PAN_FINGER_DISTANCE_PX = 80;
         this.allow = (e) => {
-            return true;
+            if (e.touches.length === 2) {
+                const dist = ValueObjects_1.Vector2.Subtract(e.touches[0].position, e.touches[1].position).magnitued;
+                if (dist > this.PAN_FINGER_DISTANCE_PX) {
+                    return true;
+                }
+            }
+            return false;
         };
         this.onTouchStart = (e) => {
             var _a;
@@ -37,11 +45,6 @@ class TouchPinch extends AppObjectController_1.AppObjectController {
             (_a = this.pinchRootUC) === null || _a === void 0 ? void 0 : _a.finishPinch();
         };
         const appObjects = appObject.appObjectRepo;
-        this.pinchRootUC = appObject.getComponent(PinchSceneRoot_1.PinchSceneRootUC.type);
-        if (!this.pinchRootUC) {
-            this.warn("Controller has been added to an App Object that does not have PinchSceneRootUC. Add one first.");
-            return;
-        }
         const touchInput = TouchController_1.TouchInputEntity.get(appObjects);
         if (touchInput) {
             touchInput.registerController(this);
@@ -50,6 +53,9 @@ class TouchPinch extends AppObjectController_1.AppObjectController {
             this.warn("Unable to find TouchInputEntity");
         }
     }
+    get pinchRootUC() {
+        return this.getCachedLocalComponent(PinchSceneRoot_1.PinchSceneRootUC.type);
+    }
 }
 exports.TouchPinch = TouchPinch;
 TouchPinch.type = "TouchPinch";

package/lib/Components/SceneRoot/Controllers/TouchScale.d.ts

@@ -1,11 +1,11 @@
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectController } from "../../../AppObject/AppObjectController";
 import { TouchController, TouchInputEvent } from "../../TouchController";
-import { DragScaleSceneRootUC } from "../UC/DragScaleSceneRoot";
 export declare class TouchScale extends AppObjectController implements TouchController {
     static readonly type = "TouchScale";
     private isScaling;
-    dragScaleRootUC?: DragScaleSceneRootUC;
+    private get dragScaleRootUC();
+    private get toolRepo();
     allow: (e: TouchInputEvent) => boolean;
     onTouchStart: (e: TouchInputEvent) => void;
     onTouchMove: (e: TouchInputEvent) => void;