+
+ );
+};
+
+export default ConveyorMechanics;
\ No newline at end of file
diff --git a/app/src/components/layout/sidebarRight/mechanics/MachineMechanics.tsx b/app/src/components/layout/sidebarRight/mechanics/MachineMechanics.tsx
deleted file mode 100644
index e1ecfb3..0000000
--- a/app/src/components/layout/sidebarRight/mechanics/MachineMechanics.tsx
+++ /dev/null
@@ -1,533 +0,0 @@
-import React, { useRef, useState, useMemo, useEffect } from "react";
-import {
- AddIcon,
- InfoIcon,
- RemoveIcon,
- ResizeHeightIcon,
-} from "../../../icons/ExportCommonIcons";
-import RenameInput from "../../../ui/inputs/RenameInput";
-import InputWithDropDown from "../../../ui/inputs/InputWithDropDown";
-import LabledDropdown from "../../../ui/inputs/LabledDropdown";
-import RegularDropDown from "../../../ui/inputs/RegularDropDown";
-import { handleResize } from "../../../../functions/handleResizePannel";
-import EyeDropInput from "../../../ui/inputs/EyeDropInput";
-import { useSelectedActionSphere, useSelectedPath, useSimulationPaths } from "../../../../store/store";
-import * as THREE from 'three';
-import InputToggle from "../../../ui/inputs/InputToggle";
-
-const MachineMechanics: React.FC = () => {
- const { selectedActionSphere } = useSelectedActionSphere();
- const { selectedPath, setSelectedPath } = useSelectedPath();
- const { simulationPaths, setSimulationPaths } = useSimulationPaths();
-
- const actionsContainerRef = useRef
+ {selectedActionSphere?.path?.modelName || "point name not found"}
+
+
+
+ {!selectedPath &&
+ <>
+
+
+
+
+
+ Actions
+
+
+
+
+
+ {selectedPoint?.actions.map((action) => (
+
+
+
+ ))}
+ setSelectedItem({ type: "action", item: action })}
+ >
+
+ handleDeleteAction(action.uuid)}
+ >
+
+ handleResize(e, actionsContainerRef)}
+ >
+
+
+
+
+ }
+
+
+
+ Triggers
+
+
+
+
+
+ {selectedPoint?.triggers.map((trigger) => (
+
+
+
+ ))}
+ setSelectedItem({ type: "trigger", item: trigger })}
+ >
+
+ handleDeleteTrigger(trigger.uuid)}
+ >
+
+ handleResize(e, triggersContainerRef)}
+ >
+
+
+ {selectedItem && (
+ <>
+ handleActionToggle(selectedItem.item.uuid)}
+ />
+ handleActionSelect(selectedItem.item.uuid, option)}
+ />
+
+ {/* Only show material dropdown for Spawn/Swap actions */}
+ {(selectedItem.item.type === 'Spawn' || selectedItem.item.type === 'Swap') && (
+ handleMaterialSelect(selectedItem.item.uuid, option)}
+ />
+ )}
+
+ {/* Only show delay input for Delay actions */}
+ {selectedItem.item.type === 'Delay' && (
+ {
+ const numValue = parseInt(value);
+ handleDelayChange(
+ selectedItem.item.uuid,
+ !value ? 'Inherit' : numValue
+ );
+ }}
+ />
+ )}
+
+ {/* Only show spawn interval for Spawn actions */}
+ {selectedItem.item.type === 'Spawn' && (
+ {
+ handleSpawnIntervalChange(selectedItem.item.uuid, (value === "") ? "Inherit" : parseInt(value));
+ }}
+ />
+
+ )}
+
+ )}
+
+ {selectedItem.type === "trigger" && (
+ <>
+ handleTriggerToggle(selectedItem.item.uuid)}
+ />
+
+ handleTriggerSelect(selectedItem.item.uuid, option)}
+ />
+
+ )}
+
+ )}
+
+ {selectedPath && !selectedItem && (
+
+ {selectedItem.item.name}
+
+ {selectedItem.type === "action" && (
+ <>
+
+ handleSpeedChange(parseFloat(value))}
+ />
+
+ )}
+
+
+
-
- );
-};
-
-export default MachineMechanics;
\ No newline at end of file
diff --git a/app/src/components/layout/sidebarRight/mechanics/VehicleMechanics.tsx b/app/src/components/layout/sidebarRight/mechanics/VehicleMechanics.tsx
new file mode 100644
index 0000000..7d3ffb0
--- /dev/null
+++ b/app/src/components/layout/sidebarRight/mechanics/VehicleMechanics.tsx
@@ -0,0 +1,561 @@
+import React, { useRef, useState, useMemo, useEffect } from "react";
+import {
+ AddIcon,
+ InfoIcon,
+ RemoveIcon,
+ ResizeHeightIcon,
+} from "../../../icons/ExportCommonIcons";
+import RenameInput from "../../../ui/inputs/RenameInput";
+import InputWithDropDown from "../../../ui/inputs/InputWithDropDown";
+import LabledDropdown from "../../../ui/inputs/LabledDropdown";
+import RegularDropDown from "../../../ui/inputs/RegularDropDown";
+import { handleResize } from "../../../../functions/handleResizePannel";
+import EyeDropInput from "../../../ui/inputs/EyeDropInput";
+import { useSelectedActionSphere, useSelectedPath, useSimulationPaths } from "../../../../store/store";
+import * as THREE from 'three';
+import * as Types from '../../../../types/world/worldTypes';
+import InputToggle from "../../../ui/inputs/InputToggle";
+
+const VehicleMechanics: React.FC = () => {
+ const { selectedActionSphere } = useSelectedActionSphere();
+ const { selectedPath, setSelectedPath } = useSelectedPath();
+ const { simulationPaths, setSimulationPaths } = useSimulationPaths();
+
+ const actionsContainerRef = useRef
- {selectedActionSphere?.path?.modelName || "point name not found"}
-
-
-
-
-
-
-
-
- Actions
-
-
-
-
-
- {selectedPoint?.actions.map((action) => (
-
-
-
- ))}
- setSelectedItem({ type: "action", item: action })}
- >
-
- handleDeleteAction(action.uuid)}
- >
-
- handleResize(e, actionsContainerRef)}
- >
-
-
-
-
-
- Triggers
-
-
-
-
-
- {selectedPoint?.triggers.map((trigger) => (
-
-
-
- ))}
- setSelectedItem({ type: "trigger", item: trigger })}
- >
-
- handleDeleteTrigger(trigger.uuid)}
- >
-
- handleResize(e, triggersContainerRef)}
- >
-
-
- {selectedItem && (
- <>
- handleActionToggle(selectedItem.item.uuid)}
- />
- handleActionSelect(selectedItem.item.uuid, option)}
- />
-
- {/* Only show material dropdown for Spawn/Swap actions */}
- {(selectedItem.item.type === 'Spawn' || selectedItem.item.type === 'Swap') && (
- handleMaterialSelect(selectedItem.item.uuid, option)}
- />
- )}
-
- {/* Only show delay input for Delay actions */}
- {selectedItem.item.type === 'Delay' && (
- {
- const numValue = parseInt(value);
- handleDelayChange(
- selectedItem.item.uuid,
- !value ? 'Inherit' : numValue
- );
- }}
- />
- )}
-
- {/* Only show spawn interval for Spawn actions */}
- {selectedItem.item.type === 'Spawn' && (
- {
- handleSpawnIntervalChange(selectedItem.item.uuid, (value === "") ? "Inherit" : parseInt(value));
- }}
- />
-
- )}
-
- )}
-
- {selectedItem.type === "trigger" && (
- <>
- handleTriggerToggle(selectedItem.item.uuid)}
- />
-
- handleTriggerSelect(selectedItem.item.uuid, option)}
- />
-
- )}
-
- )}
-
- {selectedPath && !selectedItem && (
-
- {selectedItem.item.name}
-
- {selectedItem.type === "action" && (
- <>
-
- handleSpeedChange(parseFloat(value))}
- />
-
- )}
-
-
-
+
+ );
+};
+
+export default VehicleMechanics;
\ No newline at end of file
diff --git a/app/src/components/ui/realTimeVis/charts/LineGraphComponent.tsx b/app/src/components/ui/realTimeVis/charts/LineGraphComponent.tsx
index 07a387f..cc40187 100644
--- a/app/src/components/ui/realTimeVis/charts/LineGraphComponent.tsx
+++ b/app/src/components/ui/realTimeVis/charts/LineGraphComponent.tsx
@@ -201,18 +201,16 @@ const LineGraphComponent = ({
const { measurements, setMeasurements, updateDuration, duration } = useChartStore();
useEffect(() => {
- if ( measurements.length > 0 ) {
- const socket = io("http://192.168.0.192:5010");
+ const socket = io("http://192.168.0.192:5010");
+
+ if ( measurements.length > 0 ) {
var inputes = {
measurements: measurements,
duration: duration,
interval: 1000,
}
- console.log('graphHHHHHHHHHHHHHHHHHHHHHHHHHHHHH',inputes);
-
-
// Start stream
const startStream = () => {
socket.emit("lineInput", inputes);
@@ -226,23 +224,24 @@ const LineGraphComponent = ({
// Extract timestamps and values
const labels = responceData.time;
- const datasets = data.measurements.map((measurement: any) => ({
- label: `${measurement.name}.${measurement.fields}`,
- data: responceData[`${measurement.name}.${measurement.fields}`]?.values || [],
- backgroundColor: themeColor[0] || "#5c87df",
- borderColor: themeColor[1] || "#ffffff",
- borderWidth: 2,
- // fill: false,
- }));
+ const datasets = measurements.map((measurement: any) => {
+ const key = `${measurement.name}.${measurement.fields}`;
+ return {
+ label: key,
+ data: responceData[key]?.values ?? [], // Ensure it exists
+ backgroundColor: themeColor[0] || "#5c87df",
+ borderColor: themeColor[1] || "#ffffff",
+ };
+ });
setChartData({ labels, datasets });
});
+ }
return () => {
socket.off("lineOutput");
socket.emit("stop_stream"); // Stop streaming when component unmounts
};
- }
}, [measurements, duration]);
// useEffect(() => {
diff --git a/app/src/modules/builder/agv/agv.tsx b/app/src/modules/builder/agv/agv.tsx
new file mode 100644
index 0000000..749e39f
--- /dev/null
+++ b/app/src/modules/builder/agv/agv.tsx
@@ -0,0 +1,51 @@
+import PolygonGenerator from "./polygonGenerator";
+import { useThree } from "@react-three/fiber";
+import { useEffect, useRef, useState } from "react";
+import * as THREE from "three";
+import * as Types from "../../../types/world/worldTypes";
+import PathNavigator from "./pathNavigator";
+import NavMeshDetails from "./navMeshDetails";
+
+const Agv = ({
+ lines,
+ plane,
+}: {
+ lines: Types.RefLines;
+ plane: Types.RefMesh;
+}) => {
+ let pathPoints = [
+ [
+ { x: 8.477161935339709, y: 0, z: 17.41343083550102 },
+ { x: 9.175416491482693, y: 0, z: -12.361001232663693 },
+ ],
+ ,
+ // [
+ // { x: 13.508213355232144, y: 0, z: -15.456970649652018 },
+ // { x: -30.464866520869617, y: 0, z: 9.779806557688929 },
+ // ],
+ [
+ { x: 16.792040856420844, y: 0, z: 15.86281907549489 },
+ { x: -42.77173264503395, y: 0, z: -15.821322764400804 },
+ ],
+ ];
+ let groupRef = useRef() as Types.RefGroup;
+ const [navMesh, setNavMesh] = useState();
+
+ return (
+ <>
+
+ {selectedActionSphere?.path?.modelName || "point name not found"}
+
+
+
+
+
+
+
+
+ Actions
+
+
+
+
+
+ <>
+ {console.log(selectedPoint)}
+
+
+ handleResize(e, actionsContainerRef)}
+ >
+
+
+
+
+
+ Triggers
+
+
+
+
+
+ {selectedPoint?.triggers.map((trigger) => (
+
+
+
+ ))}
+ setSelectedItem({ type: "trigger", item: trigger })}
+ >
+
+ handleDeleteTrigger(trigger.uuid)}
+ >
+
+ handleResize(e, triggersContainerRef)}
+ >
+
+
+ {selectedItem && (
+ <>
+ handleActionToggle(selectedItem.item.uuid)}
+ />
+ handleActionSelect(selectedItem.item.uuid, option)}
+ />
+
+ {/* Only show material dropdown for Spawn/Swap actions */}
+ {(selectedItem.item.type === 'Spawn' || selectedItem.item.type === 'Swap') && (
+ handleMaterialSelect(selectedItem.item.uuid, option)}
+ />
+ )}
+
+ {/* Only show delay input for Delay actions */}
+ {selectedItem.item.type === 'Delay' && (
+ {
+ const numValue = parseInt(value);
+ handleDelayChange(
+ selectedItem.item.uuid,
+ !value ? 'Inherit' : numValue
+ );
+ }}
+ />
+ )}
+
+ {/* Only show spawn interval for Spawn actions */}
+ {selectedItem.item.type === 'Spawn' && (
+ {
+ handleSpawnIntervalChange(selectedItem.item.uuid, (value === "") ? "Inherit" : parseInt(value));
+ }}
+ />
+
+ )}
+
+ )}
+
+ {selectedItem.type === "trigger" && (
+ <>
+ handleTriggerToggle(selectedItem.item.uuid)}
+ />
+
+ handleTriggerSelect(selectedItem.item.uuid, option)}
+ />
+
+ )}
+
+ )}
+
+ {selectedPath && !selectedItem && (
+
+ {selectedItem.item.name}
+
+ {selectedItem.type === "action" && (
+ <>
+
+ handleSpeedChange(parseFloat(value))}
+ />
+
+ )}
+
+
+
- 
+ {/* */}
{/* Add canvas here */}
+
+
+
diff --git a/app/src/modules/market/Card.tsx b/app/src/modules/market/Card.tsx
index 646fe39..e723f4f 100644
--- a/app/src/modules/market/Card.tsx
+++ b/app/src/modules/market/Card.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
import {
CommentsIcon,
DownloadIcon,
@@ -8,6 +8,7 @@ import {
} from "../../components/icons/marketPlaceIcons";
import assetImage from "../../assets/image/image.png";
+import { getAssetDownload } from "../../services/marketplace/getAssetDownload";
interface CardProps {
assetName: string;
@@ -15,6 +16,7 @@ interface CardProps {
price: number;
rating: number;
views: number;
+ image: string;
onSelectCard: (cardData: {
assetName: string;
uploadedOn: string;
@@ -30,6 +32,7 @@ const Card: React.FC = ({
price,
rating,
views,
+ image,
onSelectCard,
}) => {
const handleCardSelect = () => {
@@ -38,16 +41,23 @@ const Card: React.FC = ({
return (
-
+ {/*
+ */}
-
+ 
-
{assetName}
- {uploadedOn}
+ {assetName.split("_").join(" ")}
+
+ Uploaded on -{" "}
+ {new Date(uploadedOn).toLocaleDateString("en-GB", {
+ day: "2-digit",
+ month: "short",
+ year: "2-digit",
+ })}
+
diff --git a/app/src/modules/market/CardsContainer.tsx b/app/src/modules/market/CardsContainer.tsx
index 96a47e4..423fd16 100644
--- a/app/src/modules/market/CardsContainer.tsx
+++ b/app/src/modules/market/CardsContainer.tsx
@@ -1,108 +1,26 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
import Card from "./Card";
import AssetPreview from "./AssetPreview";
import RenderOverlay from "../../components/templates/Overlay";
+import { fetchAssets } from "../../services/marketplace/fetchAssets";
+interface ModelData {
+ CreatedBy: string;
+ animated: string | null;
+ category: string;
+ description: string;
+ filename: string;
+ isArchieve: boolean;
+ modelfileID: string;
+ tags: string;
+ thumbnail: string;
+ uploadDate: number;
+ _id: string;
+}
+interface ModelsProps {
+ models: ModelData[];
+}
-const CardsContainer: React.FC = () => {
- const array = [
- {
- id: 1,
- name: "Asset 1",
- uploadedOn: "12 Jan 23",
- price: 36500,
- rating: 4.5,
- views: 500,
- },
- {
- id: 2,
- name: "Asset 2",
- uploadedOn: "14 Jan 23",
- price: 45000,
- rating: 4.0,
- views: 500,
- },
- {
- id: 3,
- name: "Asset 3",
- uploadedOn: "15 Jan 23",
- price: 52000,
- rating: 4.8,
- views: 500,
- },
- {
- id: 4,
- name: "Asset 4",
- uploadedOn: "18 Jan 23",
- price: 37000,
- rating: 3.9,
- views: 500,
- },
- {
- id: 5,
- name: "Asset 5",
- uploadedOn: "20 Jan 23",
- price: 60000,
- rating: 5.0,
- views: 500,
- },
- {
- id: 6,
- name: "Asset 6",
- uploadedOn: "22 Jan 23",
- price: 46000,
- rating: 4.2,
- views: 500,
- },
- {
- id: 7,
- name: "Asset 7",
- uploadedOn: "25 Jan 23",
- price: 38000,
- rating: 4.3,
- views: 500,
- },
- {
- id: 8,
- name: "Asset 8",
- uploadedOn: "27 Jan 23",
- price: 41000,
- rating: 4.1,
- views: 500,
- },
- {
- id: 9,
- name: "Asset 9",
- uploadedOn: "30 Jan 23",
- price: 55000,
- rating: 4.6,
- views: 500,
- },
- {
- id: 10,
- name: "Asset 10",
- uploadedOn: "2 Feb 23",
- price: 49000,
- rating: 4.4,
- views: 500,
- },
- {
- id: 11,
- name: "Asset 11",
- uploadedOn: "5 Feb 23",
- price: 62000,
- rating: 5.0,
- views: 500,
- },
- {
- id: 12,
- name: "Asset 12",
- uploadedOn: "7 Feb 23",
- price: 53000,
- rating: 4.7,
- views: 500,
- },
- ];
-
+const CardsContainer: React.FC = ({ models }) => {
const [selectedCard, setSelectedCard] = useState<{
assetName: string;
uploadedOn: string;
@@ -125,24 +43,26 @@ const CardsContainer: React.FC = () => {
diff --git a/app/src/modules/market/FilterSearch.tsx b/app/src/modules/market/FilterSearch.tsx
index 11a2cbf..08103ba 100644
--- a/app/src/modules/market/FilterSearch.tsx
+++ b/app/src/modules/market/FilterSearch.tsx
@@ -1,19 +1,69 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
// import RegularDropDown from "./ui/inputs/RegularDropDown";
import Search from "../../components/ui/inputs/Search";
import { StarsIcon } from "../../components/icons/marketPlaceIcons";
import RegularDropDown from "../../components/ui/inputs/RegularDropDown";
-
-const FilterSearch: React.FC = () => {
+import { getSortedAssets } from "../../services/marketplace/getSortedAssets";
+interface ModelData {
+ CreatedBy: string;
+ animated: string | null;
+ category: string;
+ description: string;
+ filename: string;
+ isArchieve: boolean;
+ modelfileID: string;
+ tags: string;
+ thumbnail: string;
+ uploadDate: number;
+ _id: string;
+}
+interface ModelsProps {
+ models: ModelData[];
+ setModels: React.Dispatch>;
+ filteredModels: ModelData[];
+}
+const FilterSearch: React.FC = ({
+ models,
+ setModels,
+ filteredModels,
+}) => {
const [activeOption, setActiveOption] = useState("Sort by"); // State for active option
+ console.log("filteredModels: ", filteredModels);
const handleSelect = (option: string) => {
setActiveOption(option);
+ console.log("option: ", option);
+ // Alphabet ascending
+ // Alphabet descending
+ // All
};
+ useEffect(() => {
+ if (activeOption == "Alphabet ascending") {
+ let ascending = models
+ ?.slice()
+ .sort((a, b) => a.filename.localeCompare(b.filename))
+ .map((val) => val);
+ setModels(ascending);
+ } else if (activeOption == "Alphabet descending") {
+ let descending = models
+ ?.slice()
+ .sort((a, b) => b.filename.localeCompare(a.filename))
+ .map((val) => val);
+ setModels(descending);
+ }
+ }, [activeOption]);
+ const handleSearch = (val: string) => {
+ const filteredModel = filteredModels?.filter((model) =>
+ model.filename.toLowerCase().includes(val.toLowerCase())
+ );
+
+ setModels(filteredModel);
+ };
+
return (
((set: any, get: any) => ({
socket: null,
@@ -30,10 +29,7 @@ export const useSocketStore = create((set: any, get: any) => ({
},
}));
-export const useLoadingProgress = create<{
- loadingProgress: number;
- setLoadingProgress: (x: number) => void;
-}>((set) => ({
+export const useLoadingProgress = create<{ loadingProgress: number; setLoadingProgress: (x: number) => void }>((set) => ({
loadingProgress: 1,
setLoadingProgress: (x: number) => set({ loadingProgress: x }),
}));
@@ -314,45 +310,14 @@ export const useSelectedPath = create((set: any) => ({
setSelectedPath: (x: any) => set({ selectedPath: x }),
}));
-interface Path {
- modeluuid: string;
- modelName: string;
- points: {
- uuid: string;
- position: [number, number, number];
- rotation: [number, number, number];
- actions:
- | {
- uuid: string;
- name: string;
- type: string;
- material: string;
- delay: number | string;
- spawnInterval: number | string;
- isUsed: boolean;
- }[]
- | [];
- triggers:
- | { uuid: string; name: string; type: string; isUsed: boolean }[]
- | [];
- connections: {
- source: { pathUUID: string; pointUUID: string };
- targets: { pathUUID: string; pointUUID: string }[];
- };
- }[];
- pathPosition: [number, number, number];
- pathRotation: [number, number, number];
- speed: number;
-}
-
interface SimulationPathsStore {
- simulationPaths: Path[];
- setSimulationPaths: (paths: Path[]) => void;
+ simulationPaths: (Types.ConveyorEventsSchema | Types.VehicleEventsSchema)[];
+ setSimulationPaths: (paths: (Types.ConveyorEventsSchema | Types.VehicleEventsSchema)[]) => void;
}
export const useSimulationPaths = create((set) => ({
simulationPaths: [],
- setSimulationPaths: (paths: Path[]) => set({ simulationPaths: paths }),
+ setSimulationPaths: (paths) => set({ simulationPaths: paths }),
}));
export const useIsConnecting = create((set: any) => ({
diff --git a/app/src/styles/components/marketPlace/marketPlace.scss b/app/src/styles/components/marketPlace/marketPlace.scss
index cac366e..71f5897 100644
--- a/app/src/styles/components/marketPlace/marketPlace.scss
+++ b/app/src/styles/components/marketPlace/marketPlace.scss
@@ -8,6 +8,7 @@
background-color: var(--background-color-secondary);
position: absolute;
left: 0;
+ top: 0;
padding: 100px 50px;
padding-bottom: 32px;
backdrop-filter: blur(6px);
@@ -89,6 +90,7 @@
color: var(--text-color);
font-weight: $medium-weight;
font-size: $xlarge;
+ margin-bottom: 12px;
}
.cards-wrapper-container {
@@ -122,7 +124,15 @@
.image-container {
width: 100%;
display: flex;
+ max-height: 180px;
justify-content: center;
+ border-radius: #{$border-radius-medium};
+ overflow: hidden;
+ img{
+ height: inherit;
+ width: 100%;
+ object-fit: cover;
+ }
}
.assets-container {
@@ -133,6 +143,9 @@
display: flex;
flex-direction: column;
gap: 3px;
+ .assets-name{
+ text-transform: capitalize;
+ }
.asstes-container {
font-weight: #{$bold-weight};
@@ -200,7 +213,7 @@
background-color: var(--background-color);
display: flex;
gap: 12px;
- z-index: 100;
+ overflow: hidden;
border-radius: 20px;
}
diff --git a/app/src/types/world/worldTypes.d.ts b/app/src/types/world/worldTypes.d.ts
index c1e7128..2fcbd4f 100644
--- a/app/src/types/world/worldTypes.d.ts
+++ b/app/src/types/world/worldTypes.d.ts
@@ -284,4 +284,36 @@ interface ConnectionStore {
setConnections: (connections: PathConnection[]) => void;
addConnection: (newConnection: PathConnection) => void;
removeConnection: (fromUUID: string, toUUID: string) => void;
+}
+
+interface ConveyorEventsSchema {
+ modeluuid: string;
+ modelName: string;
+ type: 'Conveyor';
+ points: {
+ uuid: string;
+ position: [number, number, number];
+ rotation: [number, number, number];
+ actions: { uuid: string; name: string; type: string; material: string; delay: number | string; spawnInterval: number | string; isUsed: boolean }[] | [];
+ triggers: { uuid: string; name: string; type: string; isUsed: boolean }[] | [];
+ connections: { source: { pathUUID: string; pointUUID: string }; targets: { pathUUID: string; pointUUID: string }[] };
+ }[];
+ assetPosition: [number, number, number];
+ assetRotation: [number, number, number];
+ speed: number;
+}
+
+interface VehicleEventsSchema {
+ modeluuid: string;
+ modelName: string;
+ type: 'Vehicle';
+ point: {
+ uuid: string;
+ position: [number, number, number];
+ actions: { uuid: string; name: string; type: string; start: string, hitCount: number, end: string, buffer: number; isUsed: boolean }[] | [];
+ triggers: { uuid: string; name: string; type: string; isUsed: boolean }[] | [];
+ connections: { source: { pathUUID: string; pointUUID: string }; targets: { pathUUID: string; pointUUID: string }[] };
+ };
+ assetPosition: [number, number, number];
+ speed: number;
}
\ No newline at end of file
Products You May Like
- {array.map((asset) => (
- */}
- {selectedCard && (
- 0 &&
+ models.map((assetDetail) => (
+ */}
+ {selectedCard && (
+ */}
- {}} />
+ void;
+ selectedAnimation?: string;
+ setSelectedAnimation?: (animation: string) => void;
+}
+
+// const getGLTFUrl = (url: string) => url; // Placeholder for your actual function
+
+const GltfLoader: React.FC = ({
+ glbdata,
+ fromServer,
+ setAnimations,
+ selectedAnimation,
+}) => {
+ const modelUrl: any = fromServer ? fetchGltfUrl(fromServer) : glbdata;
+ const { scene, animations } = useGLTF(modelUrl ?? "") as {
+ scene: Object3D;
+ animations: THREE.AnimationClip[];
+ };
+
+ const mixer = useRef(
+ scene ? new AnimationMixer(scene) : null
+ );
+ const actions = useRef>({});
+
+ useEffect(() => {
+ if (animations.length > 0 && mixer.current && setAnimations) {
+ const animationNames = animations.map((animation) => animation.name);
+ setAnimations(animationNames);
+
+ animations.forEach((animation) => {
+ const action = mixer.current!.clipAction(animation);
+ actions.current[animation.name] = action;
+ });
+ } else {
+ setAnimations && setAnimations([]);
+ }
+ }, [animations, setAnimations]);
+
+ useEffect(() => {
+ if (actions.current && selectedAnimation) {
+ const action = actions.current[selectedAnimation];
+ if (action) {
+ action.reset().fadeIn(0.5).play();
+ return () => {
+ action.fadeOut(0.5);
+ };
+ }
+ }
+ }, [selectedAnimation]);
+
+ useFrame((_, delta) => {
+ if (mixer.current) {
+ mixer.current.update(delta);
+ }
+ });
+
+ return (
+
+
+ );
+};
+
+export default GltfLoader;
diff --git a/app/src/modules/market/MarketPlace.tsx b/app/src/modules/market/MarketPlace.tsx
index 71dc0a5..d830576 100644
--- a/app/src/modules/market/MarketPlace.tsx
+++ b/app/src/modules/market/MarketPlace.tsx
@@ -1,14 +1,46 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
import FilterSearch from "./FilterSearch";
import CardsContainer from "./CardsContainer";
-
+import { fetchAssets } from "../../services/marketplace/fetchAssets";
+import { getAssetImages } from "../../services/factoryBuilder/assest/assets/getAssetImages";
+interface ModelData {
+ CreatedBy: string;
+ animated: string | null;
+ category: string;
+ description: string;
+ filename: string;
+ isArchieve: boolean;
+ modelfileID: string;
+ tags: string;
+ thumbnail: string;
+ uploadDate: number;
+ _id: string;
+}
const MarketPlace = () => {
+ const [models, setModels] = useState([]);
+ const [filteredModels, setFilteredModels] = useState([]);
+
+ useEffect(() => {
+ const filteredAssets = async () => {
+ try {
+ const filt = await getAssetImages("67d934ad0f42a1fdadb19aa6");
+ setModels(filt.items);
+ setFilteredModels(filt.items);
+ } catch {}
+ };
+ filteredAssets();
+ }, []);
+
return (
diff --git a/app/src/modules/scene/scene.tsx b/app/src/modules/scene/scene.tsx
index f1a9d1c..ac74240 100644
--- a/app/src/modules/scene/scene.tsx
+++ b/app/src/modules/scene/scene.tsx
@@ -52,7 +52,6 @@ export default function Scene() {
(); // Importing the state from the useThree hook, which contains the scene, camera, and other Three.js elements.
- const csg = useRef(); // Reference for CSG object, used for 3D modeling.
- const CSGGroup = useRef() as Types.RefMesh; // Reference to a group of CSG objects.
- const scene = useRef() as Types.RefScene; // Reference to the scene.
- const camera = useRef() as Types.RefCamera; // Reference to the camera object.
- const controls = useRef(); // Reference to the controls object.
- const raycaster = useRef() as Types.RefRaycaster; // Reference for raycaster used for detecting objects being pointed at in the scene.
- const dragPointControls = useRef() as Types.RefDragControl; // Reference for drag point controls, an array for drag control.
+ const state = useThree(); // Importing the state from the useThree hook, which contains the scene, camera, and other Three.js elements.
+ const csg = useRef(); // Reference for CSG object, used for 3D modeling.
+ const CSGGroup = useRef() as Types.RefMesh; // Reference to a group of CSG objects.
+ const scene = useRef() as Types.RefScene; // Reference to the scene.
+ const camera = useRef() as Types.RefCamera; // Reference to the camera object.
+ const controls = useRef(); // Reference to the controls object.
+ const raycaster = useRef() as Types.RefRaycaster; // Reference for raycaster used for detecting objects being pointed at in the scene.
+ const dragPointControls = useRef() as Types.RefDragControl; // Reference for drag point controls, an array for drag control.
// Assigning the scene and camera from the Three.js state to the references.
@@ -68,47 +69,48 @@ export default function World() {
controls.current = state.controls;
raycaster.current = state.raycaster;
- const plane = useRef(null); // Reference for a plane object for raycaster reference.
- const grid = useRef() as any; // Reference for a grid object for raycaster reference.
- const snappedPoint = useRef() as Types.RefVector3; // Reference for storing a snapped point at the (end = isSnapped) and (start = ispreSnapped) of the line.
- const isSnapped = useRef(false) as Types.RefBoolean; // Boolean reference to indicate if an object is snapped at the (end).
- const anglesnappedPoint = useRef() as Types.RefVector3; // Reference for storing an angle-snapped point when the line is in 90 degree etc...
- const isAngleSnapped = useRef(false) as Types.RefBoolean; // Boolean to indicate if angle snapping is active.
- const isSnappedUUID = useRef() as Types.RefString; // UUID reference to identify the snapped point.
- const ispreSnapped = useRef(false) as Types.RefBoolean; // Boolean reference to indicate if an object is snapped at the (start).
- const tempLoader = useRef() as Types.RefMesh; // Reference for a temporary loader for the floor items.
- const isTempLoader = useRef() as Types.RefBoolean; // Reference to check if a temporary loader is active.
- const Tube = useRef() as Types.RefTubeGeometry; // Reference for tubes used for reference line creation and updation.
- const line = useRef([]) as Types.RefLine; // Reference for line which stores the current line that is being drawn.
- const lines = useRef([]) as Types.RefLines; // Reference for lines which stores all the lines that are ever drawn.
- const onlyFloorline = useRef([]); // Reference for floor lines which does not have walls or roof and have only floor used to store the current line that is being drawn.
- const onlyFloorlines = useRef([]); // Reference for all the floor lines that are ever drawn.
- const ReferenceLineMesh = useRef() as Types.RefMesh; // Reference for storing the mesh of the reference line for moving it during draw.
- const LineCreated = useRef(false) as Types.RefBoolean; // Boolean to track whether the reference line is created or not.
- const referencePole = useRef() as Types.RefMesh; // Reference for a pole that is used as the reference for the user to show where it is placed.
- const itemsGroup = useRef() as Types.RefGroup; // Reference to the THREE.Group that has the floor items (Gltf).
- const floorGroup = useRef() as Types.RefGroup; // Reference to the THREE.Group that has the roofs and the floors.
- const AttachedObject = useRef() as Types.RefMesh; // Reference for an object that is attached using dbl click for transform controls rotation.
- const floorPlanGroup = useRef() as Types.RefGroup; // Reference for a THREE.Group that has the lines group and the points group.
- const floorPlanGroupLine = useRef() as Types.RefGroup; // Reference for a THREE.Group that has the lines that are drawn.
- const floorPlanGroupPoint = useRef() as Types.RefGroup; // Reference for a THREE.Group that has the points that are created.
+ const plane = useRef(null); // Reference for a plane object for raycaster reference.
+ const grid = useRef() as any; // Reference for a grid object for raycaster reference.
+ const snappedPoint = useRef() as Types.RefVector3; // Reference for storing a snapped point at the (end = isSnapped) and (start = ispreSnapped) of the line.
+ const isSnapped = useRef(false) as Types.RefBoolean; // Boolean reference to indicate if an object is snapped at the (end).
+ const anglesnappedPoint = useRef() as Types.RefVector3; // Reference for storing an angle-snapped point when the line is in 90 degree etc...
+ const isAngleSnapped = useRef(false) as Types.RefBoolean; // Boolean to indicate if angle snapping is active.
+ const isSnappedUUID = useRef() as Types.RefString; // UUID reference to identify the snapped point.
+ const ispreSnapped = useRef(false) as Types.RefBoolean; // Boolean reference to indicate if an object is snapped at the (start).
+ const tempLoader = useRef() as Types.RefMesh; // Reference for a temporary loader for the floor items.
+ const isTempLoader = useRef() as Types.RefBoolean; // Reference to check if a temporary loader is active.
+ const Tube = useRef() as Types.RefTubeGeometry; // Reference for tubes used for reference line creation and updation.
+ const line = useRef([]) as Types.RefLine; // Reference for line which stores the current line that is being drawn.
+ const lines = useRef([]) as Types.RefLines; // Reference for lines which stores all the lines that are ever drawn.
+ const onlyFloorline = useRef([]); // Reference for floor lines which does not have walls or roof and have only floor used to store the current line that is being drawn.
+ const onlyFloorlines = useRef([]); // Reference for all the floor lines that are ever drawn.
+ const ReferenceLineMesh = useRef() as Types.RefMesh; // Reference for storing the mesh of the reference line for moving it during draw.
+ const LineCreated = useRef(false) as Types.RefBoolean; // Boolean to track whether the reference line is created or not.
+ const referencePole = useRef() as Types.RefMesh; // Reference for a pole that is used as the reference for the user to show where it is placed.
+ const itemsGroup = useRef() as Types.RefGroup; // Reference to the THREE.Group that has the floor items (Gltf).
+ const floorGroup = useRef() as Types.RefGroup; // Reference to the THREE.Group that has the roofs and the floors.
+ const AttachedObject = useRef() as Types.RefMesh; // Reference for an object that is attached using dbl click for transform controls rotation.
+ const floorPlanGroup = useRef() as Types.RefGroup; // Reference for a THREE.Group that has the lines group and the points group.
+ const floorPlanGroupLine = useRef() as Types.RefGroup; // Reference for a THREE.Group that has the lines that are drawn.
+ const floorPlanGroupPoint = useRef() as Types.RefGroup; // Reference for a THREE.Group that has the points that are created.
const floorGroupAisle = useRef() as Types.RefGroup;
const zoneGroup = useRef() as Types.RefGroup;
- const currentLayerPoint = useRef([]) as Types.RefMeshArray; // Reference for points that re in the current layer used to update the points in drag controls.
- const hoveredDeletablePoint = useRef() as Types.RefMesh; // Reference for the currently hovered point that can be deleted.
- const hoveredDeletableLine = useRef() as Types.RefMesh; // Reference for the currently hovered line that can be deleted.
- const hoveredDeletableFloorItem = useRef() as Types.RefMesh; // Reference for the currently hovered floor item that can be deleted.
- const hoveredDeletableWallItem = useRef() as Types.RefMesh; // Reference for the currently hovered wall item that can be deleted.
- const hoveredDeletablePillar = useRef() as Types.RefMesh; // Reference for the currently hovered pillar that can be deleted.
- const currentWallItem = useRef() as Types.RefMesh; // Reference for the currently selected wall item that can be scaled, dragged etc...
+ const currentLayerPoint = useRef([]) as Types.RefMeshArray; // Reference for points that re in the current layer used to update the points in drag controls.
+ const hoveredDeletablePoint = useRef() as Types.RefMesh; // Reference for the currently hovered point that can be deleted.
+ const hoveredDeletableLine = useRef() as Types.RefMesh; // Reference for the currently hovered line that can be deleted.
+ const hoveredDeletableFloorItem = useRef() as Types.RefMesh; // Reference for the currently hovered floor item that can be deleted.
+ const hoveredDeletableWallItem = useRef() as Types.RefMesh; // Reference for the currently hovered wall item that can be deleted.
+ const hoveredDeletablePillar = useRef() as Types.RefMesh; // Reference for the currently hovered pillar that can be deleted.
+ const currentWallItem = useRef() as Types.RefMesh; // Reference for the currently selected wall item that can be scaled, dragged etc...
- const cursorPosition = new THREE.Vector3(); // 3D vector for storing the cursor position.
+ const cursorPosition = new THREE.Vector3(); // 3D vector for storing the cursor position.
- const [selectedItemsIndex, setSelectedItemsIndex] = useState(null); // State for tracking the index of the selected item.
- const { activeLayer, setActiveLayer } = useActiveLayer(); // State that changes based on which layer the user chooses in Layers.jsx.
- const { toggleView, setToggleView } = useToggleView(); // State for toggling between 2D and 3D.
+ const [selectedItemsIndex, setSelectedItemsIndex] =
+ useState(null); // State for tracking the index of the selected item.
+ const { activeLayer, setActiveLayer } = useActiveLayer(); // State that changes based on which layer the user chooses in Layers.jsx.
+ const { toggleView, setToggleView } = useToggleView(); // State for toggling between 2D and 3D.
const { toolMode, setToolMode } = useToolMode();
- const { movePoint, setMovePoint } = useMovePoint(); // State that stores a boolean which represents whether the move mode is active or not.
+ const { movePoint, setMovePoint } = useMovePoint(); // State that stores a boolean which represents whether the move mode is active or not.
const { deletePointOrLine, setDeletePointOrLine } = useDeletePointOrLine();
const { socket } = useSocketStore();
const { roofVisibility, setRoofVisibility } = useRoofVisibility();
@@ -118,7 +120,6 @@ export default function World() {
const { walls, setWalls } = useWalls();
const [RefTextupdate, setRefTextUpdate] = useState(-1000);
-
// const loader = new GLTFLoader();
// const dracoLoader = new DRACOLoader();
@@ -162,7 +163,14 @@ export default function World() {
dragPointControls.current.enabled = false;
}
if (toggleView) {
- Layer2DVisibility(activeLayer, floorPlanGroup, floorPlanGroupLine, floorPlanGroupPoint, currentLayerPoint, dragPointControls);
+ Layer2DVisibility(
+ activeLayer,
+ floorPlanGroup,
+ floorPlanGroupLine,
+ floorPlanGroupPoint,
+ currentLayerPoint,
+ dragPointControls
+ );
} else {
setToolMode(null);
setDeletePointOrLine(false);
@@ -179,11 +187,14 @@ export default function World() {
}, []);
useEffect(() => {
- const email = localStorage.getItem('email')
- const organization = (email!.split("@")[1]).split(".")[0];
+ const email = localStorage.getItem("email");
+ const organization = email!.split("@")[1].split(".")[0];
async function fetchVisibility() {
- const visibility = await findEnvironment(organization, localStorage.getItem('userId')!);
+ const visibility = await findEnvironment(
+ organization,
+ localStorage.getItem("userId")!
+ );
if (visibility) {
setRoofVisibility(visibility.roofVisibility);
setWallVisibility(visibility.wallVisibility);
@@ -191,13 +202,33 @@ export default function World() {
}
}
fetchVisibility();
- }, [])
+ }, []);
////////// UseFrame is Here //////////
useFrame(() => {
if (toolMode) {
- Draw(state, plane, cursorPosition, floorPlanGroupPoint, floorPlanGroupLine, snappedPoint, isSnapped, isSnappedUUID, line, lines, ispreSnapped, floorPlanGroup, ReferenceLineMesh, LineCreated, setRefTextUpdate, Tube, anglesnappedPoint, isAngleSnapped, toolMode)
+ Draw(
+ state,
+ plane,
+ cursorPosition,
+ floorPlanGroupPoint,
+ floorPlanGroupLine,
+ snappedPoint,
+ isSnapped,
+ isSnappedUUID,
+ line,
+ lines,
+ ispreSnapped,
+ floorPlanGroup,
+ ReferenceLineMesh,
+ LineCreated,
+ setRefTextUpdate,
+ Tube,
+ anglesnappedPoint,
+ isAngleSnapped,
+ toolMode
+ );
}
});
@@ -304,7 +335,6 @@ export default function World() {
anglesnappedPoint={anglesnappedPoint}
/> */}
-
{
if (!selectedActionSphere) return;
- const updatedPaths: Path[] = simulationPaths.map((path) => ({
- ...path,
- points: path.points.map((point) =>
- point.uuid === selectedActionSphere.point.uuid
- ? {
- ...point,
- position: [
- selectedActionSphere.point.position.x,
- selectedActionSphere.point.position.y,
- selectedActionSphere.point.position.z,
- ],
- rotation: [
- selectedActionSphere.point.rotation.x,
- selectedActionSphere.point.rotation.y,
- selectedActionSphere.point.rotation.z,
- ]
- }
- : point
- ),
- }));
+ const updatedPaths = simulationPaths.map((path) => {
+ if (path.type === "Conveyor") {
+ return {
+ ...path,
+ points: path.points.map((point) =>
+ point.uuid === selectedActionSphere.point.uuid
+ ? {
+ ...point,
+ position: [
+ selectedActionSphere.point.position.x,
+ selectedActionSphere.point.position.y,
+ selectedActionSphere.point.position.z,
+ ],
+ rotation: [
+ selectedActionSphere.point.rotation.x,
+ selectedActionSphere.point.rotation.y,
+ selectedActionSphere.point.rotation.z,
+ ]
+ }
+ : point
+ ),
+ };
+ }
+ return path;
+ }) as ConveyorEventsSchema[];
setSimulationPaths(updatedPaths);
};
return (
-
+
{simulationPaths.map((path) => {
- const points = path.points.map(point => new THREE.Vector3(...point.position));
+ if (path.type === 'Conveyor') {
+ const points = path.points.map(point => new THREE.Vector3(...point.position));
- return (
- (groupRefs.current[path.modeluuid] = el!)}
- position={path.pathPosition}
- rotation={path.pathRotation}
- onClick={(e) => {
- if (isConnecting) return;
- e.stopPropagation();
- setSelectedPath({ path, group: groupRefs.current[path.modeluuid] });
- setSelectedActionSphere(null);
- setTransformMode(null);
- setSubModule('mechanics');
- }}
- onPointerMissed={() => {
- setSelectedPath(null);
- setSubModule('properties');
- }}
- >
- {path.points.map((point, index) => (
+ return (
+ (groupRefs.current[path.modeluuid] = el!)}
+ position={path.assetPosition}
+ rotation={path.assetRotation}
+ onClick={(e) => {
+ if (isConnecting) return;
+ e.stopPropagation();
+ setSelectedPath({ path, group: groupRefs.current[path.modeluuid] });
+ setSelectedActionSphere(null);
+ setTransformMode(null);
+ setSubModule('mechanics');
+ }}
+ onPointerMissed={() => {
+ setSelectedPath(null);
+ setSubModule('properties');
+ }}
+ >
+ {path.points.map((point, index) => (
+ (sphereRefs.current[point.uuid] = el!)}
+ onClick={(e) => {
+ if (isConnecting) return;
+ e.stopPropagation();
+ setSelectedActionSphere({
+ path,
+ point: sphereRefs.current[point.uuid]
+ });
+ setSubModule('mechanics');
+ setSelectedPath(null);
+ }}
+ userData={{ point, path }}
+ onPointerMissed={() => {
+ setSubModule('properties');
+ setSelectedActionSphere(null);
+ }}
+ >
+
+ ))}
+
+ {points.slice(0, -1).map((point, index) => {
+ const nextPoint = points[index + 1];
+ const segmentCurve = new THREE.CatmullRomCurve3([point, nextPoint]);
+ const tubeGeometry = new THREE.TubeGeometry(segmentCurve, 20, 0.1, 16, false);
+
+ return (
+
+
+ );
+ })}
+
+ );
+ } else if (path.type === 'Vehicle') {
+ return (
+ (groupRefs.current[path.modeluuid] = el!)}
+ position={path.assetPosition}
+ onClick={(e) => {
+ if (isConnecting) return;
+ e.stopPropagation();
+ setSelectedPath({ path, group: groupRefs.current[path.modeluuid] });
+ setSelectedActionSphere(null);
+ setTransformMode(null);
+ setSubModule('mechanics');
+ }}
+ onPointerMissed={() => {
+ setSelectedPath(null);
+ setSubModule('properties');
+ }}
+ >
(sphereRefs.current[point.uuid] = el!)}
+ name='events-sphere'
+ ref={el => (sphereRefs.current[path.point.uuid] = el!)}
onClick={(e) => {
if (isConnecting) return;
e.stopPropagation();
setSelectedActionSphere({
path,
- point: sphereRefs.current[point.uuid]
+ point: sphereRefs.current[path.point.uuid]
});
setSubModule('mechanics');
setSelectedPath(null);
}}
- userData={{ point, path }}
+ userData={{ point: path.point, path }}
onPointerMissed={() => {
setSubModule('properties');
- setSelectedActionSphere(null)
+ setSelectedActionSphere(null);
}}
>
-
- ))}
-
- {points.slice(0, -1).map((point, index) => {
- const nextPoint = points[index + 1];
- const segmentCurve = new THREE.CatmullRomCurve3([point, nextPoint]);
- const tubeGeometry = new THREE.TubeGeometry(segmentCurve, 20, 0.1, 16, false);
-
- return (
-
-
- );
- })}
-
- );
+
+ );
+ }
+ return null;
})}
{selectedActionSphere && transformMode && (
@@ -163,7 +220,7 @@ function PathCreation({ pathsGroupRef }: { pathsGroupRef: React.MutableRefObject
ref={transformRef}
object={selectedActionSphere.point}
mode={transformMode}
- onObjectChange={updateSimulationPaths}
+ onMouseUp={updateSimulationPaths}
/>
)}
diff --git a/app/src/modules/simulation/simulation.tsx b/app/src/modules/simulation/simulation.tsx
index 659188d..73ef27f 100644
--- a/app/src/modules/simulation/simulation.tsx
+++ b/app/src/modules/simulation/simulation.tsx
@@ -31,7 +31,7 @@ function Simulation() {
return (
<>
- (null);
+// function SimulationUI() {
+// const { ToggleView } = useToggleView();
+// const { activeModule } = useModuleStore();
+// const { startSimulation, setStartSimulation } = useStartSimulation();
+// const { selectedActionSphere } = useSelectedActionSphere();
+// const { selectedPath, setSelectedPath } = useSelectedPath();
+// const { simulationPaths, setSimulationPaths } = useSimulationPaths();
+// const { drawMaterialPath, setDrawMaterialPath } = useDrawMaterialPath();
+// const [activeButton, setActiveButton] = useState(null);
- const handleAddAction = () => {
- if (!selectedActionSphere) return;
+// const handleAddAction = () => {
+// if (!selectedActionSphere) return;
- const updatedPaths = simulationPaths.map((path) => ({
- ...path,
- points: path.points.map((point) => {
- if (point.uuid === selectedActionSphere.point.uuid) {
- const actionIndex = point.actions.length;
- const newAction = {
- uuid: THREE.MathUtils.generateUUID(),
- name: `Action ${actionIndex + 1}`, // Assign action name based on index
- type: 'Inherit',
- material: 'Inherit',
- delay: 'Inherit',
- spawnInterval: 'Inherit',
- isUsed: false
- };
+// const updatedPaths = simulationPaths.map((path) => ({
+// ...path,
+// points: path.points.map((point) => {
+// if (point.uuid === selectedActionSphere.point.uuid) {
+// const actionIndex = point.actions.length;
+// const newAction = {
+// uuid: THREE.MathUtils.generateUUID(),
+// name: `Action ${actionIndex + 1}`, // Assign action name based on index
+// type: 'Inherit',
+// material: 'Inherit',
+// delay: 'Inherit',
+// spawnInterval: 'Inherit',
+// isUsed: false
+// };
- return { ...point, actions: [...point.actions, newAction] };
- }
- return point;
- }),
- }));
+// return { ...point, actions: [...point.actions, newAction] };
+// }
+// return point;
+// }),
+// }));
- setSimulationPaths(updatedPaths);
- };
+// setSimulationPaths(updatedPaths);
+// };
- const handleDeleteAction = (uuid: string) => {
- if (!selectedActionSphere) return;
+// const handleDeleteAction = (uuid: string) => {
+// if (!selectedActionSphere) return;
- const updatedPaths = simulationPaths.map((path) => ({
- ...path,
- points: path.points.map((point) =>
- point.uuid === selectedActionSphere.point.uuid
- ? { ...point, actions: point.actions.filter(action => action.uuid !== uuid) }
- : point
- ),
- }));
+// const updatedPaths = simulationPaths.map((path) => ({
+// ...path,
+// points: path.points.map((point) =>
+// point.uuid === selectedActionSphere.point.uuid
+// ? { ...point, actions: point.actions.filter(action => action.uuid !== uuid) }
+// : point
+// ),
+// }));
- setSimulationPaths(updatedPaths);
- };
+// setSimulationPaths(updatedPaths);
+// };
- const handleActionSelect = (uuid: string, actionType: string) => {
- if (!selectedActionSphere) return;
+// const handleActionSelect = (uuid: string, actionType: string) => {
+// if (!selectedActionSphere) return;
- const updatedPaths = simulationPaths.map((path) => ({
- ...path,
- points: path.points.map((point) =>
- point.uuid === selectedActionSphere.point.uuid
- ? {
- ...point,
- actions: point.actions.map((action) =>
- action.uuid === uuid ? { ...action, type: actionType } : action
- ),
- }
- : point
- ),
- }));
+// const updatedPaths = simulationPaths.map((path) => ({
+// ...path,
+// points: path.points.map((point) =>
+// point.uuid === selectedActionSphere.point.uuid
+// ? {
+// ...point,
+// actions: point.actions.map((action) =>
+// action.uuid === uuid ? { ...action, type: actionType } : action
+// ),
+// }
+// : point
+// ),
+// }));
- setSimulationPaths(updatedPaths);
- };
+// setSimulationPaths(updatedPaths);
+// };
- const handleMaterialSelect = (uuid: string, material: string) => {
- if (!selectedActionSphere) return;
+// const handleMaterialSelect = (uuid: string, material: string) => {
+// if (!selectedActionSphere) return;
- const updatedPaths = simulationPaths.map((path) => ({
- ...path,
- points: path.points.map((point) =>
- point.uuid === selectedActionSphere.point.uuid
- ? {
- ...point,
- actions: point.actions.map((action) =>
- action.uuid === uuid ? { ...action, material } : action
- ),
- }
- : point
- ),
- }));
+// const updatedPaths = simulationPaths.map((path) => ({
+// ...path,
+// points: path.points.map((point) =>
+// point.uuid === selectedActionSphere.point.uuid
+// ? {
+// ...point,
+// actions: point.actions.map((action) =>
+// action.uuid === uuid ? { ...action, material } : action
+// ),
+// }
+// : point
+// ),
+// }));
- setSimulationPaths(updatedPaths);
- };
+// setSimulationPaths(updatedPaths);
+// };
- const handleDelayChange = (uuid: string, delay: number | string) => {
- if (!selectedActionSphere) return;
+// const handleDelayChange = (uuid: string, delay: number | string) => {
+// if (!selectedActionSphere) return;
- const updatedPaths = simulationPaths.map((path) => ({
- ...path,
- points: path.points.map((point) =>
- point.uuid === selectedActionSphere.point.uuid
- ? {
- ...point,
- actions: point.actions.map((action) =>
- action.uuid === uuid ? { ...action, delay } : action
- ),
- }
- : point
- ),
- }));
+// const updatedPaths = simulationPaths.map((path) => ({
+// ...path,
+// points: path.points.map((point) =>
+// point.uuid === selectedActionSphere.point.uuid
+// ? {
+// ...point,
+// actions: point.actions.map((action) =>
+// action.uuid === uuid ? { ...action, delay } : action
+// ),
+// }
+// : point
+// ),
+// }));
- setSimulationPaths(updatedPaths);
- };
+// setSimulationPaths(updatedPaths);
+// };
- const handleSpawnIntervalChange = (uuid: string, spawnInterval: number | string) => {
- if (!selectedActionSphere) return;
+// const handleSpawnIntervalChange = (uuid: string, spawnInterval: number | string) => {
+// if (!selectedActionSphere) return;
- const updatedPaths = simulationPaths.map((path) => ({
- ...path,
- points: path.points.map((point) =>
- point.uuid === selectedActionSphere.point.uuid
- ? {
- ...point,
- actions: point.actions.map((action) =>
- action.uuid === uuid ? { ...action, spawnInterval } : action
- ),
- }
- : point
- ),
- }));
+// const updatedPaths = simulationPaths.map((path) => ({
+// ...path,
+// points: path.points.map((point) =>
+// point.uuid === selectedActionSphere.point.uuid
+// ? {
+// ...point,
+// actions: point.actions.map((action) =>
+// action.uuid === uuid ? { ...action, spawnInterval } : action
+// ),
+// }
+// : point
+// ),
+// }));
- setSimulationPaths(updatedPaths);
- };
+// setSimulationPaths(updatedPaths);
+// };
- const handleSpeedChange = (speed: number) => {
- if (!selectedPath) return;
+// const handleSpeedChange = (speed: number) => {
+// if (!selectedPath) return;
- const updatedPaths = simulationPaths.map((path) =>
- path.modeluuid === selectedPath.path.modeluuid ? { ...path, speed } : path
- );
+// const updatedPaths = simulationPaths.map((path) =>
+// path.modeluuid === selectedPath.path.modeluuid ? { ...path, speed } : path
+// );
- setSimulationPaths(updatedPaths);
- setSelectedPath({ ...selectedPath, path: { ...selectedPath.path, speed } });
- };
+// setSimulationPaths(updatedPaths);
+// setSelectedPath({ ...selectedPath, path: { ...selectedPath.path, speed } });
+// };
- const handleAddTrigger = () => {
- if (!selectedActionSphere) return;
+// const handleAddTrigger = () => {
+// if (!selectedActionSphere) return;
- const updatedPaths = simulationPaths.map((path) => ({
- ...path,
- points: path.points.map((point) => {
- if (point.uuid === selectedActionSphere.point.uuid) {
- const triggerIndex = point.triggers.length;
- const newTrigger = {
- uuid: THREE.MathUtils.generateUUID(),
- name: `Trigger ${triggerIndex + 1}`, // Assign name based on index
- type: '',
- isUsed: false
- };
+// const updatedPaths = simulationPaths.map((path) => ({
+// ...path,
+// points: path.points.map((point) => {
+// if (point.uuid === selectedActionSphere.point.uuid) {
+// const triggerIndex = point.triggers.length;
+// const newTrigger = {
+// uuid: THREE.MathUtils.generateUUID(),
+// name: `Trigger ${triggerIndex + 1}`, // Assign name based on index
+// type: '',
+// isUsed: false
+// };
- return { ...point, triggers: [...point.triggers, newTrigger] };
- }
- return point;
- }),
- }));
+// return { ...point, triggers: [...point.triggers, newTrigger] };
+// }
+// return point;
+// }),
+// }));
- setSimulationPaths(updatedPaths);
- };
+// setSimulationPaths(updatedPaths);
+// };
- const handleDeleteTrigger = (uuid: string) => {
- if (!selectedActionSphere) return;
+// const handleDeleteTrigger = (uuid: string) => {
+// if (!selectedActionSphere) return;
- const updatedPaths = simulationPaths.map((path) => ({
- ...path,
- points: path.points.map((point) =>
- point.uuid === selectedActionSphere.point.uuid
- ? { ...point, triggers: point.triggers.filter(trigger => trigger.uuid !== uuid) }
- : point
- ),
- }));
+// const updatedPaths = simulationPaths.map((path) => ({
+// ...path,
+// points: path.points.map((point) =>
+// point.uuid === selectedActionSphere.point.uuid
+// ? { ...point, triggers: point.triggers.filter(trigger => trigger.uuid !== uuid) }
+// : point
+// ),
+// }));
- setSimulationPaths(updatedPaths);
- };
+// setSimulationPaths(updatedPaths);
+// };
- const handleTriggerSelect = (uuid: string, triggerType: string) => {
- if (!selectedActionSphere) return;
+// const handleTriggerSelect = (uuid: string, triggerType: string) => {
+// if (!selectedActionSphere) return;
- const updatedPaths = simulationPaths.map((path) => ({
- ...path,
- points: path.points.map((point) =>
- point.uuid === selectedActionSphere.point.uuid
- ? {
- ...point,
- triggers: point.triggers.map((trigger) =>
- trigger.uuid === uuid ? { ...trigger, type: triggerType } : trigger
- ),
- }
- : point
- ),
- }));
+// const updatedPaths = simulationPaths.map((path) => ({
+// ...path,
+// points: path.points.map((point) =>
+// point.uuid === selectedActionSphere.point.uuid
+// ? {
+// ...point,
+// triggers: point.triggers.map((trigger) =>
+// trigger.uuid === uuid ? { ...trigger, type: triggerType } : trigger
+// ),
+// }
+// : point
+// ),
+// }));
- setSimulationPaths(updatedPaths);
- };
+// setSimulationPaths(updatedPaths);
+// };
- const handleResetPath = () => {
- if (!selectedPath) return;
+// const handleResetPath = () => {
+// if (!selectedPath) return;
- };
+// };
- const handleActionToggle = (uuid: string) => {
- if (!selectedActionSphere) return;
+// const handleActionToggle = (uuid: string) => {
+// if (!selectedActionSphere) return;
- const updatedPaths = simulationPaths.map((path) => ({
- ...path,
- points: path.points.map((point) =>
- point.uuid === selectedActionSphere.point.uuid
- ? {
- ...point,
- actions: point.actions.map((action) => ({
- ...action,
- isUsed: action.uuid === uuid ? !action.isUsed : false,
- })),
- }
- : point
- ),
- }));
+// const updatedPaths = simulationPaths.map((path) => ({
+// ...path,
+// points: path.points.map((point) =>
+// point.uuid === selectedActionSphere.point.uuid
+// ? {
+// ...point,
+// actions: point.actions.map((action) => ({
+// ...action,
+// isUsed: action.uuid === uuid ? !action.isUsed : false,
+// })),
+// }
+// : point
+// ),
+// }));
- setSimulationPaths(updatedPaths);
- };
+// setSimulationPaths(updatedPaths);
+// };
- const handleTriggerToggle = (uuid: string) => {
- if (!selectedActionSphere) return;
+// const handleTriggerToggle = (uuid: string) => {
+// if (!selectedActionSphere) return;
- const updatedPaths = simulationPaths.map((path) => ({
- ...path,
- points: path.points.map((point) =>
- point.uuid === selectedActionSphere.point.uuid
- ? {
- ...point,
- triggers: point.triggers.map((trigger) => ({
- ...trigger,
- isUsed: trigger.uuid === uuid ? !trigger.isUsed : false,
- })),
- }
- : point
- ),
- }));
+// const updatedPaths = simulationPaths.map((path) => ({
+// ...path,
+// points: path.points.map((point) =>
+// point.uuid === selectedActionSphere.point.uuid
+// ? {
+// ...point,
+// triggers: point.triggers.map((trigger) => ({
+// ...trigger,
+// isUsed: trigger.uuid === uuid ? !trigger.isUsed : false,
+// })),
+// }
+// : point
+// ),
+// }));
- setSimulationPaths(updatedPaths);
- };
+// setSimulationPaths(updatedPaths);
+// };
- const selectedPoint = useMemo(() => {
- if (!selectedActionSphere) return null;
- return simulationPaths.flatMap((path) => path.points).find((point) => point.uuid === selectedActionSphere.point.uuid);
- }, [selectedActionSphere, simulationPaths]);
+// const selectedPoint = useMemo(() => {
+// if (!selectedActionSphere) return null;
+// return simulationPaths.flatMap((path) => path.points).find((point) => point.uuid === selectedActionSphere.point.uuid);
+// }, [selectedActionSphere, simulationPaths]);
- const createPath = () => {
- setActiveButton(activeButton !== 'addMaterialPath' ? 'addMaterialPath' : null);
- setDrawMaterialPath(!drawMaterialPath);
- }
+// const createPath = () => {
+// setActiveButton(activeButton !== 'addMaterialPath' ? 'addMaterialPath' : null);
+// setDrawMaterialPath(!drawMaterialPath);
+// }
- return (
- <>
- {activeModule === "simulation" && (
-
);
diff --git a/app/src/services/factoryBuilder/mqtt/mqttEvents.ts b/app/src/services/factoryBuilder/mqtt/mqttEvents.ts
index cd79484..41175ca 100644
--- a/app/src/services/factoryBuilder/mqtt/mqttEvents.ts
+++ b/app/src/services/factoryBuilder/mqtt/mqttEvents.ts
@@ -6,10 +6,7 @@ const MqttEvents = () => {
const { setTouch, setTemperature, setHumidity } = useDrieUIValue();
useEffect(() => {
- const client = mqtt.connect("ws://192.168.0.192:1884", {
- username: "gabby",
- password: "gabby"
- });
+ const client = mqtt.connect(`ws://${process.env.REACT_APP_SERVER_MQTT_URL}`);
client.subscribe("touch");
client.subscribe("temperature");
diff --git a/app/src/services/marketplace/fetchAssetDetails.ts b/app/src/services/marketplace/fetchAssetDetails.ts
new file mode 100644
index 0000000..b14fd3f
--- /dev/null
+++ b/app/src/services/marketplace/fetchAssetDetails.ts
@@ -0,0 +1,22 @@
+let BackEnd_url = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`;
+export const getAssetDetails = async (filename: string) => {
+ try {
+ const response = await fetch(`${BackEnd_url}/api/v1/assetDetails`, {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({ filename }),
+ });
+
+ if (!response.ok) {
+ throw new Error("Failed to fetch asset details");
+ }
+
+ const result = await response.json();
+ return result;
+ } catch (error: any) {
+ // console.error("Error fetching category:", error.message);
+ throw new Error(error.message);
+ }
+};
diff --git a/app/src/services/marketplace/fetchAssets.ts b/app/src/services/marketplace/fetchAssets.ts
new file mode 100644
index 0000000..e434a2b
--- /dev/null
+++ b/app/src/services/marketplace/fetchAssets.ts
@@ -0,0 +1,16 @@
+let BackEnd_url = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`;
+export const fetchAssets = async () => {
+ try {
+ const response = await fetch(`${BackEnd_url}/api/v1/getAllAssets`);
+ if (!response.ok) {
+ throw new Error("Network response was not ok");
+ }
+ const result = await response.json();
+ const last10Assets = result.slice(-10);
+ console.log('last10Assets: ', last10Assets);
+ return result;
+ } catch (error) {
+ console.log("error: ", error);
+ // throw new Error(error.message);
+ }
+};
diff --git a/app/src/services/marketplace/fetchGltfUrl.ts b/app/src/services/marketplace/fetchGltfUrl.ts
new file mode 100644
index 0000000..3916c9e
--- /dev/null
+++ b/app/src/services/marketplace/fetchGltfUrl.ts
@@ -0,0 +1,7 @@
+let BackEnd_url = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`;
+export const fetchGltfUrl = (filename: string) => {
+ if (filename) {
+ return `${BackEnd_url}/api/v1/getAssetFile/${filename}`;
+ }
+ return null; // or handle the case when filename is not provided
+};
diff --git a/app/src/services/marketplace/getAssetDownload.ts b/app/src/services/marketplace/getAssetDownload.ts
new file mode 100644
index 0000000..dea6d14
--- /dev/null
+++ b/app/src/services/marketplace/getAssetDownload.ts
@@ -0,0 +1,4 @@
+let BackEnd_url = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`;
+export const getAssetDownload = (filename: any) => {
+ return `${BackEnd_url}/api/v1/getAssetFile/${filename}.gltf`;
+};
diff --git a/app/src/services/marketplace/getSortedAssets.ts b/app/src/services/marketplace/getSortedAssets.ts
new file mode 100644
index 0000000..3bbbfbe
--- /dev/null
+++ b/app/src/services/marketplace/getSortedAssets.ts
@@ -0,0 +1,25 @@
+let BackEnd_url = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`;
+export const getSortedAssets = async (category: any, orders: any) => {
+ try {
+ const response = await fetch(
+ `${BackEnd_url}/api/v1/categoryWise/${category}?sortBy=${orders}`,
+ {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
+
+ if (!response.ok) {
+ throw new Error(`Error: ${response.statusText}`);
+ }
+
+ const result = await response.json();
+
+ return result; // Return the result to be used later
+ } catch (error: any) {
+ console.error("Error fetching category:", error.message);
+ throw new Error(error.message);
+ }
+};
diff --git a/app/src/store/store.ts b/app/src/store/store.ts
index 9960f90..8bbcba1 100644
--- a/app/src/store/store.ts
+++ b/app/src/store/store.ts
@@ -2,7 +2,6 @@ import * as THREE from "three";
import * as Types from "../types/world/worldTypes";
import { create } from "zustand";
import { io } from "socket.io-client";
-import { ComponentType, SVGProps } from "react";
export const useSocketStore = create
-
- {!ToggleView && (
- <>
-
+// return (
+// <>
+// {activeModule === "simulation" && (
+//
+// )}
+//
+// );
+// }
-export default SimulationUI;
\ No newline at end of file
+// export default SimulationUI;
\ No newline at end of file
diff --git a/app/src/pages/Project.tsx b/app/src/pages/Project.tsx
index 1046ea2..a7800e1 100644
--- a/app/src/pages/Project.tsx
+++ b/app/src/pages/Project.tsx
@@ -64,7 +64,6 @@ const Project: React.FC = () => {
{activeModule === "market" &&
+// {!ToggleView && (
+// <>
+//
-
- )}
-
- );
-}
+// {selectedPath && (
+//
- {!ToggleView && }
-
+//
+// {!ToggleView && }
+//
- {selectedPath && (
-
-
- handleSpeedChange(parseFloat(e.target.value))}
- />
-
- )}
+// {selectedPath && (
+//
+//
+// handleSpeedChange(parseFloat(e.target.value))}
+// />
+//
+// )}
- {selectedActionSphere && (
-
-
-
+// {selectedActionSphere && (
+//
+// )}
- {selectedPath && (
-
+//
+//
- {selectedPoint?.actions.map((action) => (
-
+//
- {selectedPoint?.triggers.map((trigger) => ( -
- )}
+//
-
-
-
+// {selectedPoint?.actions.map((action) => (
+//
+//
+// ))}
-
+//
+//
+//
- {(action.type === 'Spawn' || action.type === 'Swap') && (
-
+// )}
+//
-
-
- )}
+// {(action.type === 'Spawn' || action.type === 'Swap') && (
+//
+//
+//
+// )}
- {action.type === 'Delay' && (
-
-
- handleDelayChange(action.uuid, parseInt(e.target.value) || 'Inherit')}
- />
+// {action.type === 'Delay' && (
+//
+// )}
- {action.type === 'Spawn' && (
-
+//
+// handleDelayChange(action.uuid, parseInt(e.target.value) || 'Inherit')}
+// />
-
- )}
+//
-
- handleSpawnIntervalChange(action.uuid, parseInt(e.target.value) || 'Inherit')}
- />
+// {action.type === 'Spawn' && (
+//
-
- ))}
+//
+//
+// handleSpawnIntervalChange(action.uuid, parseInt(e.target.value) || 'Inherit')}
+// />
-
- )}
- -
+//
+//
- {selectedPoint?.triggers.map((trigger) => ( -
-
-
-
-
-
- ))}
+// {selectedPoint?.triggers.map((trigger) => (
+// -
+//
+//
+//
+//
+//
+// ))}
- +//
-
-
- )}
-
- )}
-
+//
+//
+// )}
+//
+// )}
+//