Merge branch 'main' into rtViz

app/src/modules/scene/controls/selection/selectionControls.tsx

@@ -13,6 +13,7 @@ import DuplicationControls from "./duplicationControls";
 import CopyPasteControls from "./copyPasteControls";
 import MoveControls from "./moveControls";
 import RotateControls from "./rotateControls";
+import useModuleStore from "../../../../store/useModuleStore";
 
 const SelectionControls: React.FC = () => {
     const { camera, controls, gl, scene, pointer } = useThree();
@@ -27,6 +28,7 @@ const SelectionControls: React.FC = () => {
     const [duplicatedObjects, setDuplicatedObjects] = useState<THREE.Object3D[]>([]);
     const boundingBoxRef = useRef<THREE.Mesh>();
     const { floorItems, setFloorItems } = useFloorItems();
+    const { activeModule } = useModuleStore();
     const { socket } = useSocketStore();
     const selectionBox = useMemo(() => new SelectionBox(camera, scene), [camera, scene]);
 
@@ -97,13 +99,16 @@ const SelectionControls: React.FC = () => {
             clearSelection();
         }
 
-        if (!toggleView) {
+        if (!toggleView && activeModule === "builder") {
             helper.enabled = true;
             canvasElement.addEventListener("pointerdown", onPointerDown);
             canvasElement.addEventListener("pointermove", onPointerMove);
             canvasElement.addEventListener("contextmenu", onContextMenu);
             canvasElement.addEventListener("pointerup", onPointerUp);
             canvasElement.addEventListener("keydown", onKeyDown);
+        } else {
+            helper.enabled = false;
+            helper.dispose();
         }
 
         return () => {
@@ -115,7 +120,13 @@ const SelectionControls: React.FC = () => {
             helper.enabled = false;
             helper.dispose();
         };
-    }, [camera, controls, scene, toggleView, selectedAssets, copiedObjects, pastedObjects, duplicatedObjects, movedObjects, socket, floorItems, rotatedObjects]);
+    }, [camera, controls, scene, toggleView, selectedAssets, copiedObjects, pastedObjects, duplicatedObjects, movedObjects, socket, floorItems, rotatedObjects, activeModule]);
+
+    useEffect(() => {
+        if (activeModule !== "builder") {
+            clearSelection();
+        }
+    }, [activeModule]);
 
     useFrame(() => {
         if (pastedObjects.length === 0 && duplicatedObjects.length === 0 && movedObjects.length === 0 && rotatedObjects.length === 0) {

app/src/modules/scene/scene.tsx

@@ -15,13 +15,10 @@ import background from "../../assets/textures/hdr/mudroadpuresky2k.hdr";
 import SelectionControls from "./controls/selection/selectionControls";
 import MeasurementTool from "./tools/measurementTool";
 import Simulation from "../simulation/simulation";
-import ZoneCentreTarget from "../../components/ui/componets/zoneCameraTarget";
-
-import { useThree } from "@react-three/fiber";
-import * as THREE from "three";
-import Throughput from "../../components/layout/3D-cards/cards/Throughput";
+import DroppedObjects from "../../components/ui/componets/DroppedFloatingWidgets";
 
 // import Simulation from "./simulationtemp/simulation";
+import ZoneCentreTarget from "../../components/ui/componets/zoneCameraTarget";
 
 export default function Scene() {
 
@@ -30,7 +27,6 @@ export default function Scene() {
     { name: "backward", keys: ["ArrowDown", "s", "S"] },
     { name: "left", keys: ["ArrowLeft", "a", "A"] },
     { name: "right", keys: ["ArrowRight", "d", "D"] },
-    // { name: "jump", keys: ["Space"] },
   ], [])