Merge remote-tracking branch 'origin/simulation-agv' into simulation

app/src/modules/market/AssetPreview.tsx

@@ -94,7 +94,7 @@ const AssetPreview: React.FC<AssetPreviewProps> = ({
           <div className="asset-details">
             <div className="asset-name">{selectedCard.assetName}</div>
             <div className="asset-description">
-              {`${selectedCard.assetName} is used in factories to improve efficiency and production speed It is designed to handle heavy workloads and perform repetitive tasks with precision. Many industries rely on this machine to manufacture products quickly and accurately. It reduces human effort and minimizes errors in the production process. Regular maintenance is required to keep the machine in good working condition.With advanced technology, this machine continues to enhance industrial operations and increase productivity.`}
+              {`${selectedCard.description}`}
             </div>
             <div className="asset-review">
               <div className="asset-rating">

app/src/modules/market/CardsContainer.tsx

@@ -14,6 +14,7 @@ interface ModelData {
   thumbnail: string;
   uploadDate: number;
   _id: string;
+  price: number;
 }
 interface ModelsProps {
   models: ModelData[];
@@ -50,7 +51,7 @@ const CardsContainer: React.FC<ModelsProps> = ({ models }) => {
               key={assetDetail._id}
               assetName={assetDetail?.filename}
               uploadedOn={assetDetail.uploadDate}
-              price={36500}
+              price={assetDetail?.price}
               rating={4.5}
               views={800}
               onSelectCard={handleCardSelect}

app/src/modules/market/FilterSearch.tsx

@@ -17,6 +17,7 @@ interface ModelData {
   thumbnail: string;
   uploadDate: number;
   _id: string;
+  price: number;
 }
 interface ModelsProps {
   models: ModelData[];

app/src/modules/market/MarketPlace.tsx

@@ -15,6 +15,7 @@ interface ModelData {
   thumbnail: string;
   uploadDate: number;
   _id: string;
+  price: number;
 }
 const MarketPlace = () => {
   const [models, setModels] = useState<ModelData[]>([]);
@@ -24,6 +25,7 @@ const MarketPlace = () => {
     const filteredAssets = async () => {
       try {
         const filt = await getAssetImages("67d934ad0f42a1fdadb19aa6");
+        
         setModels(filt.items);
         setFilteredModels(filt.items);
       } catch {}

app/src/modules/scene/postProcessing/postProcessing.tsx

@@ -1,111 +1,125 @@
-import * as THREE from 'three'
-import { EffectComposer, N8AO, Outline } from '@react-three/postprocessing'
-import { BlendFunction } from 'postprocessing'
-import { useDeletableFloorItem, useSelectedActionSphere, useSelectedPath, useSelectedWallItem, useselectedFloorItem } from '../../../store/store';
-import * as Types from '../../../types/world/worldTypes'
-import * as CONSTANTS from '../../../types/world/worldConstants';
+import * as THREE from "three";
+import { EffectComposer, N8AO, Outline } from "@react-three/postprocessing";
+import { BlendFunction } from "postprocessing";
+import {
+  useDeletableFloorItem,
+  useSelectedActionSphere,
+  useSelectedPath,
+  useSelectedWallItem,
+  useselectedFloorItem,
+} from "../../../store/store";
+import * as Types from "../../../types/world/worldTypes";
+import * as CONSTANTS from "../../../types/world/worldConstants";
+import { useEffect } from "react";
 
 export default function PostProcessing() {
-    const { deletableFloorItem, setDeletableFloorItem } = useDeletableFloorItem();
-    const { selectedWallItem, setSelectedWallItem } = useSelectedWallItem();
-    const { selectedFloorItem, setselectedFloorItem } = useselectedFloorItem();
-    const { selectedActionSphere } = useSelectedActionSphere();
-    const { selectedPath } = useSelectedPath();
+  const { deletableFloorItem, setDeletableFloorItem } = useDeletableFloorItem();
+  const { selectedWallItem, setSelectedWallItem } = useSelectedWallItem();
+  const { selectedFloorItem, setselectedFloorItem } = useselectedFloorItem();
+  const { selectedActionSphere } = useSelectedActionSphere();
+  const { selectedPath } = useSelectedPath();
 
-    function flattenChildren(children: any[]) {
-        const allChildren: any[] = [];
-        children.forEach(child => {
-            allChildren.push(child);
-            if (child.children && child.children.length > 0) {
-                allChildren.push(...flattenChildren(child.children));
-            }
-        });
-        return allChildren;
-    }
+  function flattenChildren(children: any[]) {
+    const allChildren: any[] = [];
+    children.forEach((child) => {
+      allChildren.push(child);
+      if (child.children && child.children.length > 0) {
+        allChildren.push(...flattenChildren(child.children));
+      }
+    });
+    return allChildren;
+  }
 
-    return (
-        <>
-            <EffectComposer autoClear={false}>
-                <N8AO color="black" aoRadius={20} intensity={7} distanceFalloff={4} aoSamples={32} denoiseRadius={6} denoiseSamples={16} />
-                {deletableFloorItem &&
-                    <Outline
-                        selection={flattenChildren(deletableFloorItem.children)}
-                        selectionLayer={10}
-                        width={3000}
-                        blendFunction={BlendFunction.ALPHA}
-                        edgeStrength={5}
-                        resolutionScale={2}
-                        pulseSpeed={0}
-                        visibleEdgeColor={CONSTANTS.outlineConfig.assetDeleteColor}
-                        hiddenEdgeColor={CONSTANTS.outlineConfig.assetDeleteColor}
-                        blur={true}
-                        xRay={true}
-                    />
-                }
-                {selectedWallItem &&
-                    <Outline
-                        selection={
-                            selectedWallItem.children[1].children[0].children.filter(
-                                (child: Types.Mesh) => child.name !== "CSG_REF"
-                            )
-                        }
-                        selectionLayer={10}
-                        width={3000}
-                        blendFunction={BlendFunction.ALPHA}
-                        edgeStrength={5}
-                        resolutionScale={2}
-                        pulseSpeed={0}
-                        visibleEdgeColor={CONSTANTS.outlineConfig.assetSelectColor}
-                        hiddenEdgeColor={CONSTANTS.outlineConfig.assetSelectColor}
-                        blur={true}
-                        xRay={true}
-                    />}
-                {selectedFloorItem &&
-                    <Outline
-                        selection={flattenChildren(selectedFloorItem.children)}
-                        selectionLayer={10}
-                        width={3000}
-                        blendFunction={BlendFunction.ALPHA}
-                        edgeStrength={5}
-                        resolutionScale={2}
-                        pulseSpeed={0}
-                        visibleEdgeColor={CONSTANTS.outlineConfig.assetSelectColor}
-                        hiddenEdgeColor={CONSTANTS.outlineConfig.assetSelectColor}
-                        blur={true}
-                        xRay={true}
-                    />
-                }
-                {selectedActionSphere &&
-                    <Outline
-                        selection={[selectedActionSphere.point]}
-                        selectionLayer={10}
-                        width={750}
-                        blendFunction={BlendFunction.ALPHA}
-                        edgeStrength={15}
-                        resolutionScale={2}
-                        pulseSpeed={0}
-                        visibleEdgeColor={CONSTANTS.outlineConfig.assetSelectColor}
-                        hiddenEdgeColor={CONSTANTS.outlineConfig.assetSelectColor}
-                        blur={true}
-                        xRay={true}
-                    />
-                }
-                {selectedPath &&
-                    <Outline
-                        selection={flattenChildren(selectedPath.group.children)}
-                        selectionLayer={10}
-                        width={750}
-                        blendFunction={BlendFunction.ALPHA}
-                        edgeStrength={15}
-                        resolutionScale={2}
-                        pulseSpeed={0}
-                        visibleEdgeColor={0x6f42c1}
-                        hiddenEdgeColor={0x6f42c1}
-                        blur={true}
-                        xRay={true}
-                    />
-                }
-            </EffectComposer>
-        </>
-    )
-}
+  return (
+    <>
+      <EffectComposer autoClear={false}>
+        <N8AO
+          color="black"
+          aoRadius={20}
+          intensity={7}
+          distanceFalloff={4}
+          aoSamples={32}
+          denoiseRadius={6}
+          denoiseSamples={16}
+        />
+        {deletableFloorItem && (
+          <Outline
+            selection={flattenChildren(deletableFloorItem.children)}
+            selectionLayer={10}
+            width={3000}
+            blendFunction={BlendFunction.ALPHA}
+            edgeStrength={5}
+            resolutionScale={2}
+            pulseSpeed={0}
+            visibleEdgeColor={CONSTANTS.outlineConfig.assetDeleteColor}
+            hiddenEdgeColor={CONSTANTS.outlineConfig.assetDeleteColor}
+            blur={true}
+            xRay={true}
+          />
+        )}
+        {selectedWallItem && (
+          <Outline
+            selection={selectedWallItem.children[1].children[0].children.filter(
+              (child: Types.Mesh) => child.name !== "CSG_REF"
+            )}
+            selectionLayer={10}
+            width={3000}
+            blendFunction={BlendFunction.ALPHA}
+            edgeStrength={5}
+            resolutionScale={2}
+            pulseSpeed={0}
+            visibleEdgeColor={CONSTANTS.outlineConfig.assetSelectColor}
+            hiddenEdgeColor={CONSTANTS.outlineConfig.assetSelectColor}
+            blur={true}
+            xRay={true}
+          />
+        )}
+        {selectedFloorItem && (
+          <Outline
+            selection={flattenChildren(selectedFloorItem.children)}
+            selectionLayer={10}
+            width={3000}
+            blendFunction={BlendFunction.ALPHA}
+            edgeStrength={5}
+            resolutionScale={2}
+            pulseSpeed={0}
+            visibleEdgeColor={CONSTANTS.outlineConfig.assetSelectColor}
+            hiddenEdgeColor={CONSTANTS.outlineConfig.assetSelectColor}
+            blur={true}
+            xRay={true}
+          />
+        )}
+        {selectedActionSphere && (
+          <Outline
+            selection={[selectedActionSphere.point]}
+            selectionLayer={10}
+            width={750}
+            blendFunction={BlendFunction.ALPHA}
+            edgeStrength={15}
+            resolutionScale={2}
+            pulseSpeed={0}
+            visibleEdgeColor={CONSTANTS.outlineConfig.assetSelectColor}
+            hiddenEdgeColor={CONSTANTS.outlineConfig.assetSelectColor}
+            blur={true}
+            xRay={true}
+          />
+        )}
+        {selectedPath && (
+          <Outline
+            selection={flattenChildren(selectedPath.group.children)}
+            selectionLayer={10}
+            width={750}
+            blendFunction={BlendFunction.ALPHA}
+            edgeStrength={15}
+            resolutionScale={2}
+            pulseSpeed={0}
+            visibleEdgeColor={0x6f42c1}
+            hiddenEdgeColor={0x6f42c1}
+            blur={true}
+            xRay={true}
+          />
+        )}
+      </EffectComposer>
+    </>
+  );
+}