changed marketplace assets

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

@@ -42,6 +42,8 @@ const SelectionControls: React.FC = () => {
         itemsGroupRef.current = itemsGroup;
 
         let isSelecting = false;
+        let isRightClick = false;
+        let rightClickMoved = false;
         let isCtrlSelecting = false;
 
         const helper = new SelectionHelper(gl);
@@ -52,16 +54,23 @@ const SelectionControls: React.FC = () => {
         }
 
         const onPointerDown = (event: PointerEvent) => {
-            if (event.button !== 0) return
-            isSelecting = false;
-            isCtrlSelecting = event.ctrlKey;
-            if (event.ctrlKey && duplicatedObjects.length === 0) {
-                if (controls) (controls as any).enabled = false;
-                selectionBox.startPoint.set(pointer.x, pointer.y, 0);
+            if (event.button === 2) {
+                isRightClick = true;
+                rightClickMoved = false;
+            } else if (event.button === 0) {
+                isSelecting = false;
+                isCtrlSelecting = event.ctrlKey;
+                if (event.ctrlKey && duplicatedObjects.length === 0) {
+                    if (controls) (controls as any).enabled = false;
+                    selectionBox.startPoint.set(pointer.x, pointer.y, 0);
+                }
             }
         };
 
         const onPointerMove = (event: PointerEvent) => {
+            if (isRightClick) {
+                rightClickMoved = true;
+            }
             isSelecting = true;
             if (helper.isDown && event.ctrlKey && duplicatedObjects.length === 0 && isCtrlSelecting) {
                 selectionBox.endPoint.set(pointer.x, pointer.y, 0);
@@ -69,6 +78,14 @@ const SelectionControls: React.FC = () => {
         };
 
         const onPointerUp = (event: PointerEvent) => {
+            if (event.button === 2) {
+                isRightClick = false;
+                if (!rightClickMoved) {
+                    clearSelection();
+                }
+                return;
+            }
+
             if (isSelecting && isCtrlSelecting) {
                 isCtrlSelecting = false;
                 isSelecting = false;
@@ -94,10 +111,13 @@ const SelectionControls: React.FC = () => {
             }
         };
 
+
         const onContextMenu = (event: MouseEvent) => {
             event.preventDefault();
-            clearSelection();
-        }
+            if (!rightClickMoved) {
+                clearSelection();
+            }
+        };
 
         if (!toggleView && activeModule === "builder") {
             helper.enabled = true;

app/src/modules/scene/environment/ground.tsx

@@ -1,9 +1,9 @@
-import * as THREE from 'three';
 import { useToggleView } from '../../../store/store';
 import * as CONSTANTS from '../../../types/world/worldConstants';
 
 const Ground = ({ grid, plane }: any) => {
-    const { toggleView, setToggleView } = useToggleView();
+    const { toggleView } = useToggleView();
+    const savedTheme: string | null = localStorage.getItem('theme');
 
     return (
 
@@ -19,4 +19,4 @@ const Ground = ({ grid, plane }: any) => {
     )
 }
 
-export default Ground;
+export default Ground;

app/src/modules/scene/scene.tsx

@@ -1,11 +1,11 @@
-import { useMemo, useState } from "react";
+import { useMemo } from "react";
 import { Canvas } from "@react-three/fiber";
 import { Environment, KeyboardControls } from "@react-three/drei";
 
 import World from "./world/world";
 import Controls from "./controls/controls";
 import TransformControl from "./controls/transformControls";
-import PostProcessing from "./postProcessing/postProcessing"
+import PostProcessing from "./postProcessing/postProcessing";
 import Sun from "./environment/sky";
 import CamModelsGroup from "../collaboration/collabCams";
 import Shadows from "./environment/shadow";
@@ -15,33 +15,31 @@ 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 DroppedObjects from "../../components/ui/componets/DroppedFloatingWidgets";
 
 // import Simulation from "./simulationtemp/simulation";
 import ZoneCentreTarget from "../../components/ui/componets/zoneCameraTarget";
-import ProductionCapacity from "../../components/layout/3D-cards/cards/ProductionCapacity";
 import Dropped3dWidgets from "../../components/ui/componets/Dropped3dWidget";
-import { useWidgetSubOption } from "../../store/store";
 
 export default function Scene() {
-
-  const map = useMemo(() => [
-    { name: "forward", keys: ["ArrowUp", "w", "W"] },
-    { name: "backward", keys: ["ArrowDown", "s", "S"] },
-    { name: "left", keys: ["ArrowLeft", "a", "A"] },
-    { name: "right", keys: ["ArrowRight", "d", "D"] },
-  ], [])
+  const map = useMemo(
+    () => [
+      { name: "forward", keys: ["ArrowUp", "w", "W"] },
+      { name: "backward", keys: ["ArrowDown", "s", "S"] },
+      { name: "left", keys: ["ArrowLeft", "a", "A"] },
+      { name: "right", keys: ["ArrowRight", "d", "D"] },
+    ],
+    []
+  );
+  const savedTheme: string | null = localStorage.getItem("theme");
 
   return (
     <KeyboardControls map={map}>
       <Canvas
-        // style={{ width: "100vw", height: "100vh" }}
         eventPrefix="client"
         gl={{ powerPreference: "high-performance", antialias: true }}
         onContextMenu={(e) => {
           e.preventDefault();
         }}
-
       >
         <Dropped3dWidgets />
         <Controls />
@@ -52,7 +50,7 @@ export default function Scene() {
         <ZoneCentreTarget />
         <Simulation />
         <PostProcessing />
-        <Sun />
+        {savedTheme !== "dark" && <Sun />}
         <Shadows />
         <CamModelsGroup />
         <MqttEvents />

app/src/modules/scene/world/world.tsx

@@ -364,7 +364,7 @@ export default function World() {
         anglesnappedPoint={anglesnappedPoint}
       />
 
-      <DrieHtmlTemp itemsGroup={itemsGroup} />
+      {/* <DrieHtmlTemp itemsGroup={itemsGroup} /> */}
 
       <Agv lines={lines} plane={plane} />
     </>