Refactor tool and builder modules: remove unused movePoint state and related logic; enhance clarity in tool handling and state management.
This commit is contained in:
@@ -6,7 +6,6 @@ import {
|
||||
useActiveLayer,
|
||||
useDeleteTool,
|
||||
useDeletePointOrLine,
|
||||
useMovePoint,
|
||||
useSocketStore,
|
||||
useToggleView,
|
||||
useToolMode,
|
||||
@@ -36,7 +35,6 @@ const ZoneGroup: React.FC = () => {
|
||||
const { deletePointOrLine, setDeletePointOrLine } = useDeletePointOrLine();
|
||||
const { removedLayer, setRemovedLayer } = useRemovedLayer();
|
||||
const { toolMode } = useToolMode();
|
||||
const { movePoint, setMovePoint } = useMovePoint();
|
||||
const { setDeleteTool } = useDeleteTool();
|
||||
const { activeLayer } = useActiveLayer();
|
||||
const { socket } = useSocketStore();
|
||||
@@ -139,7 +137,6 @@ const ZoneGroup: React.FC = () => {
|
||||
setEndPoint(null);
|
||||
} else {
|
||||
setDeletePointOrLine(false);
|
||||
setMovePoint(false);
|
||||
setDeleteTool(false);
|
||||
}
|
||||
if (!toggleView) {
|
||||
@@ -311,7 +308,7 @@ const ZoneGroup: React.FC = () => {
|
||||
true
|
||||
);
|
||||
|
||||
if (intersects.length > 0 && movePoint) {
|
||||
if (intersects.length > 0 && toolMode === 'move') {
|
||||
const clickedObject = intersects[0].object;
|
||||
const sphereIndex = zonePoints.findIndex((point: any) =>
|
||||
point.equals(clickedObject.position)
|
||||
@@ -329,7 +326,7 @@ const ZoneGroup: React.FC = () => {
|
||||
if (evt.button === 0 && !drag && !isDragging && !deletePointOrLine) {
|
||||
isLeftMouseDown = false;
|
||||
|
||||
if (!startPoint && !movePoint) {
|
||||
if (!startPoint && toolMode !== 'move') {
|
||||
raycaster.setFromCamera(pointer, camera);
|
||||
const intersectionPoint = new THREE.Vector3();
|
||||
const point = raycaster.ray.intersectPlane(plane, intersectionPoint);
|
||||
@@ -337,7 +334,7 @@ const ZoneGroup: React.FC = () => {
|
||||
setStartPoint(point);
|
||||
setEndPoint(null);
|
||||
}
|
||||
} else if (startPoint && !movePoint) {
|
||||
} else if (startPoint && toolMode !== 'move') {
|
||||
raycaster.setFromCamera(pointer, camera);
|
||||
const intersectionPoint = new THREE.Vector3();
|
||||
const point = raycaster.ray.intersectPlane(plane, intersectionPoint);
|
||||
@@ -439,7 +436,7 @@ const ZoneGroup: React.FC = () => {
|
||||
intersects.length > 0 &&
|
||||
intersects[0].object.name.includes("point")
|
||||
) {
|
||||
gl.domElement.style.cursor = movePoint ? "pointer" : "default";
|
||||
gl.domElement.style.cursor = toolMode === 'move' ? "pointer" : "default";
|
||||
} else {
|
||||
gl.domElement.style.cursor = "default";
|
||||
}
|
||||
@@ -479,7 +476,7 @@ const ZoneGroup: React.FC = () => {
|
||||
setEndPoint(null);
|
||||
};
|
||||
|
||||
if (toolMode === "Zone" || deletePointOrLine || movePoint) {
|
||||
if (toolMode === "Zone" || deletePointOrLine || toolMode === 'move') {
|
||||
canvasElement.addEventListener("mousedown", onMouseDown);
|
||||
canvasElement.addEventListener("mouseup", onMouseUp);
|
||||
canvasElement.addEventListener("mousemove", onMouseMove);
|
||||
@@ -503,7 +500,6 @@ const ZoneGroup: React.FC = () => {
|
||||
deletePointOrLine,
|
||||
zonePoints,
|
||||
draggedSphere,
|
||||
movePoint,
|
||||
activeLayer,
|
||||
raycaster,
|
||||
pointer,
|
||||
|
||||
Reference in New Issue
Block a user