Merge conflicts remote-tracking branch 'origin/main' into ui

app/src/modules/builder/geomentries/assets/assetManager.ts

@@ -112,7 +112,7 @@ export default async function assetManager(
         ) {
             if (!activePromises.get(taskId)) return; // Stop processing if task is canceled
 
-            const existingModel = itemsGroup.current.getObjectByProperty("uuid", item.modeluuid);
+            const existingModel = itemsGroup?.current?.getObjectByProperty("uuid", item.modeluuid);
             if (existingModel) {
                 // console.log(`Model ${item.modelname} already exists in the scene.`);
                 resolve();

app/src/modules/builder/groups/zoneGroup.tsx

@@ -65,6 +65,8 @@ const ZoneGroup: React.FC = () => {
                     zoneId: zone.zoneId,
                     zoneName: zone.zoneName,
                     points: zone.points,
+                    viewPortCenter: zone.viewPortCenter,
+                    viewPortposition: zone.viewPortposition,
                     layer: zone.layer
                 }));
 
@@ -145,7 +147,7 @@ const ZoneGroup: React.FC = () => {
 
         const target: [number, number, number] | null = calculateCenter(zone.points);
         if (!target) return;
-        const position = [target[0], 75, target[2]];
+        const position = [target[0], 10, target[2]];
 
         const input = {
             userId: userId,
@@ -186,7 +188,7 @@ const ZoneGroup: React.FC = () => {
 
         const target: [number, number, number] | null = calculateCenter(zone.points);
         if (!target) return;
-        const position = [target[0], 75, target[2]];
+        const position = [target[0], 10, target[2]];
 
         const input = {
             userId: userId,

app/src/modules/collaboration/socketResponses.dev.tsx

@@ -745,6 +745,7 @@ export default function SocketResponses({
                 return
             }
             if (data.message === "zone deleted") {
+                console.log('data: ', data);
                 const updatedZones = zones.filter((zone: any) => zone.zoneId !== data.data.zoneId);
                 setZones(updatedZones);
 

app/src/modules/market/AssetPreview.tsx

@@ -37,6 +37,7 @@ const AssetPreview: React.FC<AssetPreviewProps> = ({
       <div className="assetPreview">
         <div className="image-preview">
           <img src={assetImage} alt="" />
+          {/* Add canvas here */}
         </div>
 
         <div className="asset-details-preview">

app/src/modules/market/Card.tsx

@@ -1,4 +1,3 @@
-// Card.tsx
 import React from "react";
 import {
   CommentsIcon,

app/src/modules/market/FilterSearch.tsx

@@ -13,12 +13,10 @@ const FilterSearch: React.FC = () => {
   };
   return (
     <div className="filter-search-container">
-      <div className="asset-search-wrapper">
-        <Search onChange={() => {}} />
-      </div>
+      <Search onChange={() => {}} />
       <RegularDropDown
         header={activeOption}
-        options={["Alphabet ascending", "Alphabet descending"]}
+        options={["Alphabet ascending", "Alphabet descending", ""]}
         onSelect={handleSelect}
         search={false}
       />

app/src/modules/market/MarketPlace.tsx

@@ -1,18 +1,18 @@
-import React from "react";
-import FilterSearch from "./FilterSearch";
-import CardsContainer from "./CardsContainer";
-
-const MarketPlace = () => {
-  return (
-    <div className="marketplace-wrapper">
-      <div className="marketplace-container">
-        <div className="marketPlace">
-          <FilterSearch />
-          <CardsContainer />
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default MarketPlace;
+import React from "react";
+import FilterSearch from "./FilterSearch";
+import CardsContainer from "./CardsContainer";
+
+const MarketPlace = () => {
+  return (
+    <div className="marketplace-wrapper">
+      <div className="marketplace-container">
+        <div className="marketPlace">
+          <FilterSearch />
+          <CardsContainer />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default MarketPlace;

app/src/modules/scene/scene.tsx

@@ -1,4 +1,4 @@
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
 import { Canvas } from "@react-three/fiber";
 import { Environment, KeyboardControls } from "@react-three/drei";
 
@@ -15,6 +15,12 @@ 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 DroppedObjects from "../../components/ui/componets/DroppedFloatingWidgets";
+
 // import Simulation from "./simulationtemp/simulation";
 
 export default function Scene() {
@@ -27,6 +33,9 @@ export default function Scene() {
     // { name: "jump", keys: ["Space"] },
   ], [])
 
+
+
+
   return (
     <KeyboardControls map={map}>
       <Canvas
@@ -36,12 +45,15 @@ export default function Scene() {
         onContextMenu={(e) => {
           e.preventDefault();
         }}
+
       >
+        <DroppedObjects/>
         <Controls />
         <TransformControl />
         <SelectionControls />
         <MeasurementTool />
         <World />
+        <ZoneCentreTarget />
         {/* <Simulation /> */}
         <Simulation />
         <PostProcessing />