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

Refactor mouse button handling and key event logic in MoveControls3D for improved clarity

Browse Source
This commit is contained in:
Jerald-Golden-B
2025-07-28 14:13:27 +05:30
parent f86d36c59f
commit 2ac6bbeb9d
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/modules/scene/controls/selectionControls/selection3D/moveControls3D.tsx
View File

@@ -46,10 +46,7 @@ function MoveControls3D({
const [initialPositions, setInitialPositions] = useState<Record<string, THREE.Vector3>>({}); const [initialPositions, setInitialPositions] = useState<Record<string, THREE.Vector3>>({});
const [initialStates, setInitialStates] = useState<Record<string, { position: THREE.Vector3; rotation?: THREE.Euler; }>>({}); const [initialStates, setInitialStates] = useState<Record<string, { position: THREE.Vector3; rotation?: THREE.Euler; }>>({});
const [isMoving, setIsMoving] = useState(false); const [isMoving, setIsMoving] = useState(false);
const mouseButtonsDown = useRef<{ left: boolean; right: boolean }>({ const mouseButtonsDown = useRef<{ left: boolean; right: boolean }>({ left: false, right: false, });
left: false,
right: false,
});
const updateBackend = ( const updateBackend = (
productName: string, productName: string,
@@ -79,9 +76,9 @@ function MoveControls3D({
}; };
const onKeyUp = (event: KeyboardEvent) => { const onKeyUp = (event: KeyboardEvent) => {
const isModifierKey = event.key === "Control" || event.key === "Shift"; const isModifierKey = (!event.shiftKey && !event.ctrlKey);
if (isModifierKey) { if (isModifierKey && keyEvent !== "") {
setKeyEvent(""); setKeyEvent("");
} }
}; };
@@ -196,7 +193,6 @@ function MoveControls3D({
raycaster.setFromCamera(pointer, camera); raycaster.setFromCamera(pointer, camera);
const hit = raycaster.ray.intersectPlane(plane, intersectionPoint); const hit = raycaster.ray.intersectPlane(plane, intersectionPoint);
if (hit) { if (hit) {
if (mouseButtonsDown.current.left || mouseButtonsDown.current.right) { if (mouseButtonsDown.current.left || mouseButtonsDown.current.right) {
if (movedObjects[0]) { if (movedObjects[0]) {
@@ -209,18 +205,18 @@ function MoveControls3D({
if (dragOffset) { if (dragOffset) {
const rawBasePosition = new THREE.Vector3().addVectors(intersectionPoint, dragOffset); const rawBasePosition = new THREE.Vector3().addVectors(intersectionPoint, dragOffset);
let moveSpeed = keyEvent.includes("Shift") ? 0.05 : 1; let moveDistance = keyEvent.includes("Shift") ? 0.05 : 1;
const initialBasePosition = initialPositions[movedObjects[0].uuid]; const initialBasePosition = initialPositions[movedObjects[0].uuid];
const positionDifference = new THREE.Vector3().subVectors(rawBasePosition, initialBasePosition); const positionDifference = new THREE.Vector3().subVectors(rawBasePosition, initialBasePosition);
const adjustedDifference = positionDifference.multiplyScalar(moveSpeed); const adjustedDifference = positionDifference.multiplyScalar(moveDistance);
const baseNewPosition = new THREE.Vector3().addVectors(initialBasePosition, adjustedDifference); const baseNewPosition = new THREE.Vector3().addVectors(initialBasePosition, adjustedDifference);
if (keyEvent.includes("Ctrl")) { if (keyEvent.includes("Ctrl")) {
baseNewPosition.x = snapControls(baseNewPosition.x, "Ctrl"); baseNewPosition.x = snapControls(baseNewPosition.x, keyEvent);
baseNewPosition.z = snapControls(baseNewPosition.z, "Ctrl"); baseNewPosition.z = snapControls(baseNewPosition.z, keyEvent);
} }
movedObjects.forEach((movedAsset: THREE.Object3D) => { movedObjects.forEach((movedAsset: THREE.Object3D) => {