Merge pull request 'simulation-agv' (#11) from simulation-agv into main
Reviewed-on: http://185.100.212.76:7776/Dwinzo-Beta/Dwinzo_dev/pulls/11
This commit was merged in pull request #11.
This commit is contained in:
2080
app/package-lock.json
generated
2080
app/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -9,10 +9,12 @@
|
|||||||
"@react-three/drei": "^9.113.0",
|
"@react-three/drei": "^9.113.0",
|
||||||
"@react-three/fiber": "^8.17.7",
|
"@react-three/fiber": "^8.17.7",
|
||||||
"@react-three/postprocessing": "^2.16.3",
|
"@react-three/postprocessing": "^2.16.3",
|
||||||
|
"@recast-navigation/three": "^0.39.0",
|
||||||
"@testing-library/jest-dom": "^5.17.0",
|
"@testing-library/jest-dom": "^5.17.0",
|
||||||
"@testing-library/react": "^13.4.0",
|
"@testing-library/react": "^13.4.0",
|
||||||
"@testing-library/user-event": "^13.5.0",
|
"@testing-library/user-event": "^13.5.0",
|
||||||
"@turf/turf": "^7.1.0",
|
"@turf/helpers": "^7.2.0",
|
||||||
|
"@turf/turf": "^7.2.0",
|
||||||
"@types/jest": "^27.5.2",
|
"@types/jest": "^27.5.2",
|
||||||
"@types/react": "^18.3.5",
|
"@types/react": "^18.3.5",
|
||||||
"@types/react-dom": "^18.3.0",
|
"@types/react-dom": "^18.3.0",
|
||||||
|
|||||||
51
app/src/modules/builder/agv/agv.tsx
Normal file
51
app/src/modules/builder/agv/agv.tsx
Normal file
@@ -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 (
|
||||||
|
<>
|
||||||
|
<PolygonGenerator groupRef={groupRef} lines={lines} plane={plane} />
|
||||||
|
<NavMeshDetails
|
||||||
|
lines={lines}
|
||||||
|
setNavMesh={setNavMesh}
|
||||||
|
groupRef={groupRef}
|
||||||
|
plane={plane}
|
||||||
|
/>
|
||||||
|
{pathPoints.map((pair, i) => (
|
||||||
|
<PathNavigator navMesh={navMesh} selectedPoints={pair} key={i} />
|
||||||
|
))}
|
||||||
|
<group ref={groupRef} visible={false} name="Meshes"></group>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Agv;
|
||||||
63
app/src/modules/builder/agv/navMeshDetails.tsx
Normal file
63
app/src/modules/builder/agv/navMeshDetails.tsx
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
import React, { useEffect, useState } from "react";
|
||||||
|
import { init as initRecastNavigation } from "@recast-navigation/core";
|
||||||
|
import { generateSoloNavMesh } from "@recast-navigation/generators";
|
||||||
|
import { DebugDrawer, getPositionsAndIndices } from "@recast-navigation/three";
|
||||||
|
import { useThree } from "@react-three/fiber";
|
||||||
|
import * as THREE from "three";
|
||||||
|
import * as Types from "../../../types/world/worldTypes";
|
||||||
|
|
||||||
|
interface NavMeshDetailsProps {
|
||||||
|
setNavMesh: (navMesh: any) => void;
|
||||||
|
groupRef: React.MutableRefObject<THREE.Group | null>;
|
||||||
|
lines: Types.RefLines;
|
||||||
|
plane: Types.RefMesh;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function NavMeshDetails({
|
||||||
|
lines,
|
||||||
|
setNavMesh,
|
||||||
|
groupRef,
|
||||||
|
plane,
|
||||||
|
}: NavMeshDetailsProps) {
|
||||||
|
const { scene } = useThree();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const initializeNavigation = async () => {
|
||||||
|
try {
|
||||||
|
await initRecastNavigation();
|
||||||
|
|
||||||
|
if (!groupRef.current || groupRef.current.children.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const meshes = groupRef?.current?.children as THREE.Mesh[];
|
||||||
|
|
||||||
|
const [positions, indices] = getPositionsAndIndices(meshes);
|
||||||
|
|
||||||
|
const cs = 0.5;
|
||||||
|
const ch = 0.5;
|
||||||
|
const walkableRadius = 0.89;
|
||||||
|
|
||||||
|
const { success, navMesh } = generateSoloNavMesh(positions, indices, {
|
||||||
|
cs,
|
||||||
|
ch,
|
||||||
|
walkableRadius: Math.round(walkableRadius / ch),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!success || !navMesh) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setNavMesh(navMesh);
|
||||||
|
|
||||||
|
const debugDrawer = new DebugDrawer();
|
||||||
|
debugDrawer.drawNavMesh(navMesh);
|
||||||
|
// scene.add(debugDrawer);
|
||||||
|
} catch (error) {}
|
||||||
|
};
|
||||||
|
|
||||||
|
initializeNavigation();
|
||||||
|
}, [scene, groupRef, lines.current]);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
98
app/src/modules/builder/agv/pathNavigator.tsx
Normal file
98
app/src/modules/builder/agv/pathNavigator.tsx
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
import React, { useEffect, useState, useRef } from "react";
|
||||||
|
import * as THREE from "three";
|
||||||
|
import { useFrame } from "@react-three/fiber";
|
||||||
|
import { NavMeshQuery } from "@recast-navigation/core";
|
||||||
|
import { Line } from "@react-three/drei";
|
||||||
|
|
||||||
|
// Define interface for props
|
||||||
|
interface PathNavigatorProps {
|
||||||
|
navMesh: any;
|
||||||
|
selectedPoints: any;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function PathNavigator({
|
||||||
|
navMesh,
|
||||||
|
selectedPoints,
|
||||||
|
}: PathNavigatorProps) {
|
||||||
|
const [path, setPath] = useState<[number, number, number][]>([]);
|
||||||
|
const progressRef = useRef(0);
|
||||||
|
const meshRef = useRef<THREE.Mesh | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (selectedPoints.length === 2 && navMesh) {
|
||||||
|
const [start, end] = selectedPoints;
|
||||||
|
if (!start || !end) return;
|
||||||
|
|
||||||
|
const navMeshQuery = new NavMeshQuery(navMesh);
|
||||||
|
|
||||||
|
const { path: computedPath } = navMeshQuery.computePath(start, end);
|
||||||
|
|
||||||
|
if (computedPath.length > 0) {
|
||||||
|
setPath(computedPath.map(({ x, y, z }) => [x, y + 0.1, z]));
|
||||||
|
progressRef.current = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [selectedPoints, navMesh]);
|
||||||
|
|
||||||
|
useFrame((_, delta) => {
|
||||||
|
if (path.length > 1 && meshRef.current) {
|
||||||
|
const speed = 3;
|
||||||
|
progressRef.current += delta * speed;
|
||||||
|
|
||||||
|
let totalDistance = 0;
|
||||||
|
const distances: number[] = [];
|
||||||
|
for (let i = 0; i < path.length - 1; i++) {
|
||||||
|
const start = new THREE.Vector3(...path[i]);
|
||||||
|
const end = new THREE.Vector3(...path[i + 1]);
|
||||||
|
const segmentDistance = start.distanceTo(end);
|
||||||
|
distances.push(segmentDistance);
|
||||||
|
totalDistance += segmentDistance;
|
||||||
|
}
|
||||||
|
|
||||||
|
let coveredDistance = progressRef.current;
|
||||||
|
let accumulatedDistance = 0;
|
||||||
|
let index = 0;
|
||||||
|
|
||||||
|
while (
|
||||||
|
index < distances.length &&
|
||||||
|
coveredDistance > accumulatedDistance + distances[index]
|
||||||
|
) {
|
||||||
|
accumulatedDistance += distances[index];
|
||||||
|
index++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (index < distances.length) {
|
||||||
|
const start = new THREE.Vector3(...path[index]);
|
||||||
|
const end = new THREE.Vector3(...path[index + 1]);
|
||||||
|
const segmentDistance = distances[index];
|
||||||
|
|
||||||
|
const t = (coveredDistance - accumulatedDistance) / segmentDistance;
|
||||||
|
const position = start.clone().lerp(end, t); // Use clone() to avoid mutating the original vector
|
||||||
|
meshRef.current.position.copy(position);
|
||||||
|
|
||||||
|
const direction = new THREE.Vector3()
|
||||||
|
.subVectors(end, start)
|
||||||
|
.normalize();
|
||||||
|
const targetQuaternion = new THREE.Quaternion().setFromUnitVectors(
|
||||||
|
new THREE.Vector3(0, 0, 1),
|
||||||
|
direction
|
||||||
|
);
|
||||||
|
meshRef.current.quaternion.slerp(targetQuaternion, 0.1);
|
||||||
|
} else {
|
||||||
|
progressRef.current = totalDistance;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{path.length > 0 && <Line points={path} color="blue" lineWidth={3} />}
|
||||||
|
{path.length > 0 && (
|
||||||
|
<mesh ref={meshRef} position={path.length > 0 ? path[0] : [0, 0.1, 0]}>
|
||||||
|
<boxGeometry args={[1, 1, 1]} />
|
||||||
|
<meshNormalMaterial />
|
||||||
|
</mesh>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
146
app/src/modules/builder/agv/polygonGenerator.tsx
Normal file
146
app/src/modules/builder/agv/polygonGenerator.tsx
Normal file
@@ -0,0 +1,146 @@
|
|||||||
|
import * as THREE from "three";
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import * as turf from "@turf/turf";
|
||||||
|
import * as Types from "../../../types/world/worldTypes";
|
||||||
|
import arrayLinesToObject from "../geomentries/lines/lineConvertions/arrayLinesToObject";
|
||||||
|
interface PolygonGeneratorProps {
|
||||||
|
groupRef: React.MutableRefObject<THREE.Group | null>;
|
||||||
|
lines: Types.RefLines;
|
||||||
|
plane: Types.RefMesh;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function PolygonGenerator({
|
||||||
|
groupRef,
|
||||||
|
lines,
|
||||||
|
plane,
|
||||||
|
}: PolygonGeneratorProps) {
|
||||||
|
// const [rooms, setRooms] = useState<THREE.Vector3[][]>([]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (groupRef.current && plane.current) {
|
||||||
|
groupRef.current.add(plane.current.clone());
|
||||||
|
}
|
||||||
|
}, [groupRef, plane]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let allLines = arrayLinesToObject(lines.current);
|
||||||
|
const wallLines = allLines?.filter((line) => line?.type === "WallLine");
|
||||||
|
const aisleLines = allLines?.filter((line) => line?.type === "AisleLine");
|
||||||
|
|
||||||
|
const wallPoints = wallLines
|
||||||
|
.map((pair) => pair?.line.map((vals) => vals.position))
|
||||||
|
.filter((wall): wall is THREE.Vector3[] => !!wall);
|
||||||
|
|
||||||
|
const result = aisleLines.map((pair) =>
|
||||||
|
pair?.line.map((point) => ({
|
||||||
|
position: [point.position.x, point.position.z],
|
||||||
|
uuid: point.uuid,
|
||||||
|
}))
|
||||||
|
);
|
||||||
|
if (!result || result.some((line) => !line)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const lineFeatures = result?.map((line: any) =>
|
||||||
|
turf.lineString(line.map((p: any) => p?.position))
|
||||||
|
);
|
||||||
|
|
||||||
|
const polygons = turf.polygonize(turf.featureCollection(lineFeatures));
|
||||||
|
renderWallGeometry(wallPoints);
|
||||||
|
|
||||||
|
let union: any = [];
|
||||||
|
|
||||||
|
polygons.features.forEach((feature) => {
|
||||||
|
union.push(feature);
|
||||||
|
});
|
||||||
|
|
||||||
|
if (union.length > 1) {
|
||||||
|
const unionResult = turf.union(turf.featureCollection(union));
|
||||||
|
|
||||||
|
if (unionResult?.geometry.type === "MultiPolygon") {
|
||||||
|
unionResult.geometry.coordinates.forEach((poly) => {
|
||||||
|
const coordinates = poly[0].map(([x, z]) => {
|
||||||
|
return new THREE.Vector3(x, 0, z);
|
||||||
|
});
|
||||||
|
renderBoxGeometry(coordinates);
|
||||||
|
});
|
||||||
|
} else if (unionResult?.geometry.type === "Polygon") {
|
||||||
|
const coordinates = unionResult.geometry.coordinates[0].map(
|
||||||
|
([x, z]) => {
|
||||||
|
return new THREE.Vector3(x, 0, z);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
renderBoxGeometry(coordinates);
|
||||||
|
}
|
||||||
|
} else if (union.length === 1) {
|
||||||
|
const coordinates = union[0].geometry.coordinates[0].map(
|
||||||
|
([x, z]: [number, number]) => {
|
||||||
|
return new THREE.Vector3(x, 0, z);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
// setRooms((prevRooms) => [...prevRooms, coordinates]);
|
||||||
|
}
|
||||||
|
}, [lines.current]);
|
||||||
|
|
||||||
|
const renderBoxGeometry = (coordinates: THREE.Vector3[]) => {
|
||||||
|
const minX = Math.min(...coordinates.map((p) => p.x));
|
||||||
|
const maxX = Math.max(...coordinates.map((p) => p.x));
|
||||||
|
const minZ = Math.min(...coordinates.map((p) => p.z));
|
||||||
|
const maxZ = Math.max(...coordinates.map((p) => p.z));
|
||||||
|
|
||||||
|
const width = maxX - minX;
|
||||||
|
const depth = maxZ - minZ;
|
||||||
|
const height = 3;
|
||||||
|
|
||||||
|
const geometry = new THREE.BoxGeometry(width, height, depth);
|
||||||
|
const material = new THREE.MeshBasicMaterial({
|
||||||
|
color: "#ff66cc",
|
||||||
|
visible: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
const mesh = new THREE.Mesh(geometry, material);
|
||||||
|
mesh.position.set((minX + maxX) / 2, height / 2, (minZ + maxZ) / 2);
|
||||||
|
groupRef.current?.add(mesh);
|
||||||
|
};
|
||||||
|
|
||||||
|
const renderWallGeometry = (walls: THREE.Vector3[][]) => {
|
||||||
|
walls.forEach((wall) => {
|
||||||
|
if (wall.length < 2) return;
|
||||||
|
|
||||||
|
for (let i = 0; i < wall.length - 1; i++) {
|
||||||
|
const start = new THREE.Vector3(wall[i].x, wall[i].y, wall[i].z);
|
||||||
|
const end = new THREE.Vector3(
|
||||||
|
wall[i + 1].x,
|
||||||
|
wall[i + 1].y,
|
||||||
|
wall[i + 1].z
|
||||||
|
);
|
||||||
|
|
||||||
|
const wallHeight = 10;
|
||||||
|
const direction = new THREE.Vector3().subVectors(end, start);
|
||||||
|
const length = direction.length();
|
||||||
|
direction.normalize();
|
||||||
|
|
||||||
|
const wallGeometry = new THREE.BoxGeometry(length, wallHeight);
|
||||||
|
const wallMaterial = new THREE.MeshBasicMaterial({
|
||||||
|
color: "#aaa",
|
||||||
|
transparent: true,
|
||||||
|
opacity: 0.5,
|
||||||
|
});
|
||||||
|
|
||||||
|
const wallMesh = new THREE.Mesh(wallGeometry, wallMaterial);
|
||||||
|
const midPoint = new THREE.Vector3()
|
||||||
|
.addVectors(start, end)
|
||||||
|
.multiplyScalar(0.5);
|
||||||
|
wallMesh.position.set(midPoint.x, wallHeight / 2, midPoint.z);
|
||||||
|
|
||||||
|
const quaternion = new THREE.Quaternion();
|
||||||
|
quaternion.setFromUnitVectors(new THREE.Vector3(1, 0, 0), direction);
|
||||||
|
wallMesh.quaternion.copy(quaternion);
|
||||||
|
|
||||||
|
groupRef.current?.add(wallMesh);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
@@ -58,6 +58,9 @@ export default function Scene() {
|
|||||||
<MqttEvents />
|
<MqttEvents />
|
||||||
<Environment files={background} environmentIntensity={1.5} />
|
<Environment files={background} environmentIntensity={1.5} />
|
||||||
</Canvas>
|
</Canvas>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</KeyboardControls>
|
</KeyboardControls>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import {
|
|||||||
useShadows,
|
useShadows,
|
||||||
useUpdateScene,
|
useUpdateScene,
|
||||||
useWalls,
|
useWalls,
|
||||||
useToolMode
|
useToolMode,
|
||||||
} from "../../../store/store";
|
} from "../../../store/store";
|
||||||
|
|
||||||
////////// 3D Function Imports //////////
|
////////// 3D Function Imports //////////
|
||||||
@@ -50,16 +50,17 @@ import { findEnvironment } from "../../../services/factoryBuilder/environment/fi
|
|||||||
import Layer2DVisibility from "../../builder/geomentries/layers/layer2DVisibility";
|
import Layer2DVisibility from "../../builder/geomentries/layers/layer2DVisibility";
|
||||||
import DrieHtmlTemp from "../mqttTemp/drieHtmlTemp";
|
import DrieHtmlTemp from "../mqttTemp/drieHtmlTemp";
|
||||||
import ZoneGroup from "../../builder/groups/zoneGroup";
|
import ZoneGroup from "../../builder/groups/zoneGroup";
|
||||||
|
import Agv from "../../builder/agv/agv";
|
||||||
|
|
||||||
export default function World() {
|
export default function World() {
|
||||||
const state = useThree<Types.ThreeState>(); // Importing the state from the useThree hook, which contains the scene, camera, and other Three.js elements.
|
const state = useThree<Types.ThreeState>(); // 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 csg = useRef(); // Reference for CSG object, used for 3D modeling.
|
||||||
const CSGGroup = useRef() as Types.RefMesh; // Reference to a group of CSG objects.
|
const CSGGroup = useRef() as Types.RefMesh; // Reference to a group of CSG objects.
|
||||||
const scene = useRef() as Types.RefScene; // Reference to the scene.
|
const scene = useRef() as Types.RefScene; // Reference to the scene.
|
||||||
const camera = useRef() as Types.RefCamera; // Reference to the camera object.
|
const camera = useRef() as Types.RefCamera; // Reference to the camera object.
|
||||||
const controls = useRef<any>(); // Reference to the controls object.
|
const controls = useRef<any>(); // 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 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 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.
|
// 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;
|
controls.current = state.controls;
|
||||||
raycaster.current = state.raycaster;
|
raycaster.current = state.raycaster;
|
||||||
|
|
||||||
const plane = useRef<THREE.Mesh>(null); // Reference for a plane object for raycaster reference.
|
const plane = useRef<THREE.Mesh>(null); // Reference for a plane object for raycaster reference.
|
||||||
const grid = useRef() as any; // Reference for a grid 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 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 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 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 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 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 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 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 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 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 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 lines = useRef([]) as Types.RefLines; // Reference for lines which stores all the lines that are ever drawn.
|
||||||
const onlyFloorline = useRef<Types.OnlyFloorLine>([]); // 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 onlyFloorline = useRef<Types.OnlyFloorLine>([]); // 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<Types.OnlyFloorLines>([]); // Reference for all the floor lines that are ever drawn.
|
const onlyFloorlines = useRef<Types.OnlyFloorLines>([]); // 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 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 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 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 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 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 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 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 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 floorPlanGroupPoint = useRef() as Types.RefGroup; // Reference for a THREE.Group that has the points that are created.
|
||||||
const floorGroupAisle = useRef() as Types.RefGroup;
|
const floorGroupAisle = useRef() as Types.RefGroup;
|
||||||
const zoneGroup = 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 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 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 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 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 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 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 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<Types.Number | null>(null); // State for tracking the index of the selected item.
|
const [selectedItemsIndex, setSelectedItemsIndex] =
|
||||||
const { activeLayer, setActiveLayer } = useActiveLayer(); // State that changes based on which layer the user chooses in Layers.jsx.
|
useState<Types.Number | null>(null); // State for tracking the index of the selected item.
|
||||||
const { toggleView, setToggleView } = useToggleView(); // State for toggling between 2D and 3D.
|
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 { 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 { deletePointOrLine, setDeletePointOrLine } = useDeletePointOrLine();
|
||||||
const { socket } = useSocketStore();
|
const { socket } = useSocketStore();
|
||||||
const { roofVisibility, setRoofVisibility } = useRoofVisibility();
|
const { roofVisibility, setRoofVisibility } = useRoofVisibility();
|
||||||
@@ -118,7 +120,6 @@ export default function World() {
|
|||||||
const { walls, setWalls } = useWalls();
|
const { walls, setWalls } = useWalls();
|
||||||
const [RefTextupdate, setRefTextUpdate] = useState(-1000);
|
const [RefTextupdate, setRefTextUpdate] = useState(-1000);
|
||||||
|
|
||||||
|
|
||||||
// const loader = new GLTFLoader();
|
// const loader = new GLTFLoader();
|
||||||
// const dracoLoader = new DRACOLoader();
|
// const dracoLoader = new DRACOLoader();
|
||||||
|
|
||||||
@@ -162,7 +163,14 @@ export default function World() {
|
|||||||
dragPointControls.current.enabled = false;
|
dragPointControls.current.enabled = false;
|
||||||
}
|
}
|
||||||
if (toggleView) {
|
if (toggleView) {
|
||||||
Layer2DVisibility(activeLayer, floorPlanGroup, floorPlanGroupLine, floorPlanGroupPoint, currentLayerPoint, dragPointControls);
|
Layer2DVisibility(
|
||||||
|
activeLayer,
|
||||||
|
floorPlanGroup,
|
||||||
|
floorPlanGroupLine,
|
||||||
|
floorPlanGroupPoint,
|
||||||
|
currentLayerPoint,
|
||||||
|
dragPointControls
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
setToolMode(null);
|
setToolMode(null);
|
||||||
setDeletePointOrLine(false);
|
setDeletePointOrLine(false);
|
||||||
@@ -179,11 +187,14 @@ export default function World() {
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const email = localStorage.getItem('email')
|
const email = localStorage.getItem("email");
|
||||||
const organization = (email!.split("@")[1]).split(".")[0];
|
const organization = email!.split("@")[1].split(".")[0];
|
||||||
|
|
||||||
async function fetchVisibility() {
|
async function fetchVisibility() {
|
||||||
const visibility = await findEnvironment(organization, localStorage.getItem('userId')!);
|
const visibility = await findEnvironment(
|
||||||
|
organization,
|
||||||
|
localStorage.getItem("userId")!
|
||||||
|
);
|
||||||
if (visibility) {
|
if (visibility) {
|
||||||
setRoofVisibility(visibility.roofVisibility);
|
setRoofVisibility(visibility.roofVisibility);
|
||||||
setWallVisibility(visibility.wallVisibility);
|
setWallVisibility(visibility.wallVisibility);
|
||||||
@@ -191,13 +202,33 @@ export default function World() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
fetchVisibility();
|
fetchVisibility();
|
||||||
}, [])
|
}, []);
|
||||||
|
|
||||||
////////// UseFrame is Here //////////
|
////////// UseFrame is Here //////////
|
||||||
|
|
||||||
useFrame(() => {
|
useFrame(() => {
|
||||||
if (toolMode) {
|
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}
|
anglesnappedPoint={anglesnappedPoint}
|
||||||
/> */}
|
/> */}
|
||||||
|
|
||||||
|
|
||||||
<ZoneGroup />
|
<ZoneGroup />
|
||||||
|
|
||||||
<FloorGroupAilse
|
<FloorGroupAilse
|
||||||
@@ -327,10 +357,9 @@ export default function World() {
|
|||||||
anglesnappedPoint={anglesnappedPoint}
|
anglesnappedPoint={anglesnappedPoint}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<DrieHtmlTemp
|
<DrieHtmlTemp itemsGroup={itemsGroup} />
|
||||||
itemsGroup={itemsGroup}
|
|
||||||
/>
|
|
||||||
|
|
||||||
|
<Agv lines={lines} plane={plane} />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user