Dwinzo-Beta/Dwinzo_dev
4
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor MaterialAnimator to replace sphereRef with materialRef for clarity and consistency

Browse Source
This commit is contained in:
Jerald-Golden-B
2025-05-21 17:06:07 +05:30
parent 406b52b0d8
commit 2b4153f520
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/modules/simulation/roboticArm/instances/animator/materialAnimator.tsx
View File

@@ -10,7 +10,7 @@ type MaterialAnimatorProps = {
}; };
export default function MaterialAnimator({ ikSolver, armBot, currentPhase }: Readonly<MaterialAnimatorProps>) { export default function MaterialAnimator({ ikSolver, armBot, currentPhase }: Readonly<MaterialAnimatorProps>) {
const sphereRef = useRef<any>(null); const materialRef = useRef<any>(null);
const [isRendered, setIsRendered] = useState<boolean>(false); const [isRendered, setIsRendered] = useState<boolean>(false);
useEffect(() => { useEffect(() => {
@@ -22,7 +22,7 @@ export default function MaterialAnimator({ ikSolver, armBot, currentPhase }: Rea
}, [currentPhase]); }, [currentPhase]);
useFrame(() => { useFrame(() => {
if (!ikSolver || !sphereRef.current) return; if (!ikSolver || !materialRef.current) return;
const boneTarget = ikSolver.mesh.skeleton.bones.find((b: any) => b.name === "Bone004"); const boneTarget = ikSolver.mesh.skeleton.bones.find((b: any) => b.name === "Bone004");
const bone = ikSolver.mesh.skeleton.bones.find((b: any) => b.name === "Effector"); const bone = ikSolver.mesh.skeleton.bones.find((b: any) => b.name === "Effector");
@@ -39,17 +39,16 @@ export default function MaterialAnimator({ ikSolver, armBot, currentPhase }: Rea
// Calculate direction // Calculate direction
const direction = new THREE.Vector3(); const direction = new THREE.Vector3();
direction.subVectors(boneWorldPos, boneTargetWorldPos).normalize(); direction.subVectors(boneWorldPos, boneTargetWorldPos).normalize();
const downwardDirection = direction.clone().negate();
const adjustedPosition = boneWorldPos.clone().addScaledVector(downwardDirection, -0.01); const adjustedPosition = boneWorldPos.clone().addScaledVector(direction, 0.01);
//set position //set position
sphereRef.current.position.copy(adjustedPosition); materialRef.current.position.copy(adjustedPosition);
// Set rotation // Set rotation
const worldQuaternion = new THREE.Quaternion(); const worldQuaternion = new THREE.Quaternion();
bone.getWorldQuaternion(worldQuaternion); bone.getWorldQuaternion(worldQuaternion);
sphereRef.current.quaternion.copy(worldQuaternion); materialRef.current.quaternion.copy(worldQuaternion);
} }
}); });
@@ -58,7 +57,7 @@ export default function MaterialAnimator({ ikSolver, armBot, currentPhase }: Rea
{isRendered && ( {isRendered && (
<MaterialModel <MaterialModel
materialId={armBot.currentAction?.materialId ?? ''} materialId={armBot.currentAction?.materialId ?? ''}
matRef={sphereRef} matRef={materialRef}
materialType={armBot.currentAction?.materialType ?? 'Default material'} materialType={armBot.currentAction?.materialType ?? 'Default material'}
/> />
)} )}