From c198a90ac6e141940524484396118c34e3c06684 Mon Sep 17 00:00:00 2001 From: Jerald-Golden-B Date: Sat, 3 May 2025 10:45:36 +0530 Subject: [PATCH] Refactor PointsCreator and RoboticArmInstance: remove unused hooks and clean up code; comment out scene.add(helper) in IKInstance; streamline imports in ArmBotUI. --- .../events/points/creator/pointsCreator.tsx | 41 +++---------------- .../armInstance/roboticArmInstance.tsx | 4 +- .../instances/ikInstance/ikInstance.tsx | 2 +- .../modules/simulation/ui/arm/armBotUI.tsx | 1 - 4 files changed, 7 insertions(+), 41 deletions(-) diff --git a/app/src/modules/simulation/events/points/creator/pointsCreator.tsx b/app/src/modules/simulation/events/points/creator/pointsCreator.tsx index 0ed7e13..94128ce 100644 --- a/app/src/modules/simulation/events/points/creator/pointsCreator.tsx +++ b/app/src/modules/simulation/events/points/creator/pointsCreator.tsx @@ -7,8 +7,6 @@ import { detectModifierKeys } from "../../../../../utils/shortcutkeys/detectModi import { useSelectedEventSphere, useSelectedEventData, - useIsDragging, - useIsRotating, } from "../../../../../store/simulation/useSimulationStore"; import { useThree } from "@react-three/fiber"; @@ -21,9 +19,7 @@ function PointsCreator() { const [transformMode, setTransformMode] = useState<"translate" | "rotate" | null>(null); const sphereRefs = useRef<{ [key: string]: THREE.Mesh }>({}); const { selectedEventSphere, setSelectedEventSphere, clearSelectedEventSphere, } = useSelectedEventSphere(); - const { selectedEventData,setSelectedEventData, clearSelectedEventData } = useSelectedEventData(); - const { isDragging } = useIsDragging(); - const { isRotating } = useIsRotating(); + const { selectedEventData, setSelectedEventData, clearSelectedEventData } = useSelectedEventData(); useEffect(() => { if (selectedEventSphere) { @@ -59,24 +55,11 @@ function PointsCreator() { const updatePointToState = (selectedEventSphere: THREE.Mesh) => { let point = JSON.parse( - JSON.stringify( - getPointByUuid( - selectedEventSphere.userData.modelUuid, - selectedEventSphere.userData.pointUuid - ) - ) + JSON.stringify(getPointByUuid(selectedEventSphere.userData.modelUuid, selectedEventSphere.userData.pointUuid)) ); if (point) { - point.position = [ - selectedEventSphere.position.x, - selectedEventSphere.position.y, - selectedEventSphere.position.z, - ]; - updatePoint( - selectedEventSphere.userData.modelUuid, - selectedEventSphere.userData.pointUuid, - point - ); + point.position = [selectedEventSphere.position.x, selectedEventSphere.position.y, selectedEventSphere.position.z,]; + updatePoint(selectedEventSphere.userData.modelUuid, selectedEventSphere.userData.pointUuid, point); } }; @@ -139,7 +122,7 @@ function PointsCreator() { key={i} position={new THREE.Vector3(...event.position)} > - {event.points.map((point, j) => ( + {event.points.map((point) => ( { - if (selectedEventData?.data.type !== 'vehicle') { - // clearSelectedEventSphere(); - } - setTransformMode(null); - }} - key={`${i}-${j}`} position={new THREE.Vector3(...point.position)} userData={{ modelUuid: event.modelUuid, @@ -212,9 +188,6 @@ function PointsCreator() { sphereRefs.current[event.point.uuid] ); }} - onPointerMissed={() => { - setTransformMode(null); - }} position={new THREE.Vector3(...event.point.position)} userData={{ modelUuid: event.modelUuid, @@ -242,10 +215,6 @@ function PointsCreator() { sphereRefs.current[event.point.uuid] ); }} - onPointerMissed={() => { - // clearSelectedEventSphere(); - setTransformMode(null); - }} position={new THREE.Vector3(...event.point.position)} userData={{ modelUuid: event.modelUuid, diff --git a/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx b/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx index 9199ede..d2f2dba 100644 --- a/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx +++ b/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx @@ -5,7 +5,6 @@ import { usePauseButtonStore, usePlayButtonStore, useResetButtonStore } from '.. import { useArmBotStore } from '../../../../../store/simulation/useArmBotStore'; import armModel from "../../../../../assets/gltf-glb/rigged/ik_arm_4.glb"; import { useThree } from "@react-three/fiber"; -import { useFloorItems } from '../../../../../store/store'; import useModuleStore from '../../../../../store/useModuleStore'; import * as THREE from "three"; import { useSelectedAction, useSelectedProduct } from '../../../../../store/simulation/useSimulationStore'; @@ -26,9 +25,8 @@ function RoboticArmInstance({ armBot }: { armBot: ArmBotStatus }) { let startTime: number; //zustand const { addCurrentAction, setArmBotActive, setArmBotState, removeCurrentAction } = useArmBotStore(); - const { products, getActionByUuid } = useProductStore(); + const { getActionByUuid } = useProductStore(); const { selectedProduct } = useSelectedProduct(); - const { floorItems } = useFloorItems(); const { activeModule } = useModuleStore(); const { isPlaying } = usePlayButtonStore(); const { isReset, setReset } = useResetButtonStore(); diff --git a/app/src/modules/simulation/roboticArm/instances/ikInstance/ikInstance.tsx b/app/src/modules/simulation/roboticArm/instances/ikInstance/ikInstance.tsx index e692ca5..3070c3a 100644 --- a/app/src/modules/simulation/roboticArm/instances/ikInstance/ikInstance.tsx +++ b/app/src/modules/simulation/roboticArm/instances/ikInstance/ikInstance.tsx @@ -71,7 +71,7 @@ function IKInstance({ modelUrl, setIkSolver, ikSolver, armBot, groupRef }: IKIns setSelectedArm(OOI.Target_Bone); - scene.add(helper) + // scene.add(helper); }, [gltf]); diff --git a/app/src/modules/simulation/ui/arm/armBotUI.tsx b/app/src/modules/simulation/ui/arm/armBotUI.tsx index cc926aa..11d36e2 100644 --- a/app/src/modules/simulation/ui/arm/armBotUI.tsx +++ b/app/src/modules/simulation/ui/arm/armBotUI.tsx @@ -1,6 +1,5 @@ import React, { useEffect, useState } from 'react'; import { useSelectedAction, useSelectedEventData, useSelectedProduct } from '../../../../store/simulation/useSimulationStore'; -import { useArmBotStore } from '../../../../store/simulation/useArmBotStore'; import { useGLTF } from '@react-three/drei'; import { useThree } from '@react-three/fiber'; import { useProductStore } from '../../../../store/simulation/useProductStore';