refactored menu manager positioning.

src/menus/editMenu.ts

@@ -15,7 +15,7 @@ import {MeshConverter} from "../diagram/meshConverter";
 import log from "loglevel";
 import {InputTextView} from "../information/inputTextView";
 import {DiaSounds} from "../util/diaSounds";
-import {Cameras} from "../integration/ring/cameras";
+import {CameraHelper} from "../util/cameraHelper";
 
 export class EditMenu {
     private state: BmenuState = BmenuState.NONE;
@@ -60,7 +60,6 @@ export class EditMenu {
             DiaSounds.instance.exit.play();
             this.manager.dispose();
             this.manager = null;
-
         } else {
             DiaSounds.instance.enter.play();
             this.manager = new GUI3DManager(this.scene);
@@ -69,15 +68,9 @@ export class EditMenu {
             panel.addControl(this.makeButton("Modify", "modify"));
             panel.addControl(this.makeButton("Remove", "remove"));
             panel.addControl(this.makeButton("Add Label", "label"));
-            panel.addControl(this.makeButton("Add Ring Cameras", "addRingCameras"));
+            //panel.addControl(this.makeButton("Add Ring Cameras", "addRingCameras"));
             this.manager.controlScaling = .5;
-            const offset = new Vector3(0, -.2, 3);
+            CameraHelper.setMenuPosition(panel.node, this.scene);
-            offset.applyRotationQuaternionInPlace(this.scene.activeCamera.absoluteRotation);
-            panel.node.position =
-                this.scene.activeCamera.globalPosition.add(offset);
-            panel.node.lookAt(this.scene.activeCamera.globalPosition);
-            panel.node.rotation.y = panel.node.rotation.y + Math.PI;
-
         }
     }
 
@@ -113,49 +106,61 @@ export class EditMenu {
         }
         switch (this.state) {
             case BmenuState.REMOVING:
-                log.debug("removing " + mesh?.id);
+                this.remove(mesh);
-                const event: DiagramEvent = {
-                    type: DiagramEventType.REMOVE,
-                    entity:
-                        MeshConverter.toDiagramEntity(pointerInfo.pickInfo.pickedMesh)
-                }
-                this.diagramManager.onDiagramEventObservable.notifyObservers(event);
                 break;
             case BmenuState.MODIFYING:
-                if (mesh.metadata?.template &&
+                this.setModify(mesh);
-                    mesh.parent?.parent?.id != "toolbox") {
-                    if (this.gizmoManager.gizmos.boundingBoxGizmo.attachedMesh?.id == mesh.id) {
-                        this.gizmoManager.gizmos.boundingBoxGizmo.attachedMesh = null;
-                    } else {
-                        this.gizmoManager.attachToMesh(mesh);
-                        this.gizmoManager.gizmos.boundingBoxGizmo.onScaleBoxDragObservable.add(() => {
-                            this.diagramManager.onDiagramEventObservable.notifyObservers({
-                                    type: DiagramEventType.MODIFY,
-                                    entity: MeshConverter.toDiagramEntity(mesh),
-                                }
-                            )
-
-                            log.debug(mesh.scaling);
-                        });
-                    }
-                }
                 break;
             case BmenuState.LABELING:
-                log.debug("labeling " + mesh.id);
+                this.setLabeling(mesh);
-                let text = "";
-                if (mesh?.metadata?.text) {
-                    text = mesh.metadata.text;
-                }
-                const textInput = new InputTextView(this.xr.sessionManager, text);
-                textInput.show();
-                textInput.onTextObservable.addOnce((value) => {
-                    this.persist(mesh, value.text);
-                    MeshConverter.updateTextNode(mesh, value.text);
-                });
                 break;
         }
     }
 
+    private remove(mesh: AbstractMesh) {
+        log.debug("removing " + mesh?.id);
+        const event: DiagramEvent = {
+            type: DiagramEventType.REMOVE,
+            entity:
+                MeshConverter.toDiagramEntity(mesh)
+        }
+        this.diagramManager.onDiagramEventObservable.notifyObservers(event);
+    }
+
+    private setModify(mesh: AbstractMesh) {
+        if (mesh.metadata?.template &&
+            mesh.parent?.parent?.id != "toolbox") {
+            if (this.gizmoManager.gizmos.boundingBoxGizmo.attachedMesh?.id == mesh.id) {
+                this.gizmoManager.gizmos.boundingBoxGizmo.attachedMesh = null;
+            } else {
+                this.gizmoManager.attachToMesh(mesh);
+                this.gizmoManager.gizmos.boundingBoxGizmo.onScaleBoxDragObservable.add(() => {
+                    this.diagramManager.onDiagramEventObservable.notifyObservers({
+                            type: DiagramEventType.MODIFY,
+                            entity: MeshConverter.toDiagramEntity(mesh),
+                        }
+                    )
+                    log.debug(mesh.scaling);
+                });
+            }
+        }
+    }
+
+    private setLabeling(mesh: AbstractMesh) {
+        log.debug("labeling " + mesh.id);
+        let text = "";
+        if (mesh?.metadata?.text) {
+            text = mesh.metadata.text;
+        }
+        const textInput = new InputTextView(this.xr.sessionManager, text);
+        textInput.show();
+        textInput.onTextObservable.addOnce((value) => {
+            this.persist(mesh, value.text);
+            MeshConverter.updateTextNode(mesh, value.text);
+        });
+
+    }
+
     private handleClick(_info, state) {
         switch (state.currentTarget.name) {
             case "modify":
@@ -167,9 +172,6 @@ export class EditMenu {
             case "label":
                 this.state = BmenuState.LABELING;
                 break;
-            case "addRingCameras":
-                const cameras = new Cameras(this.scene, this.xr.sessionManager);
-                break;
             default:
                 log.error("Unknown button");
                 return;

src/util/cameraHelper.ts

@@ -1,4 +1,4 @@
-import {Scene, Vector3} from "@babylonjs/core";
+import {Scene, TransformNode, Vector3} from "@babylonjs/core";
 
 export class CameraHelper {
     public static getFrontPosition(distance: number, scene: Scene): Vector3 {
@@ -6,4 +6,13 @@ export class CameraHelper {
         offset.applyRotationQuaternionInPlace(scene.activeCamera.absoluteRotation);
         return scene.activeCamera.globalPosition.add(offset);
     }
+
+    public static setMenuPosition(node: TransformNode, scene: Scene) {
+        node.position =
+            CameraHelper.getFrontPosition(2, scene);
+        node.lookAt(scene.activeCamera.globalPosition);
+        node.rotation.y = node.rotation.y + Math.PI;
+        node.position.y += .2;
+
+    }
 }