Merge pull request 'dev' (#312) from dev into dev-deploy

Reviewed-on: #312
This commit is contained in:
ysCha 2025-08-26 18:23:01 +09:00
commit 568f80efa1

View File

@ -1,20 +1,10 @@
import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil' import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'
import { import { adsorptionPointModeState, adsorptionRangeState, canvasState, globalPitchState, verticalHorizontalModeState } from '@/store/canvasAtom'
adsorptionPointAddModeState,
adsorptionPointModeState,
adsorptionRangeState,
canvasSettingState,
canvasState,
dotLineIntervalSelector,
globalPitchState,
verticalHorizontalModeState,
} from '@/store/canvasAtom'
import { useEvent } from '@/hooks/useEvent' import { useEvent } from '@/hooks/useEvent'
import { useMouse } from '@/hooks/useMouse' import { useMouse } from '@/hooks/useMouse'
import { useLine } from '@/hooks/useLine' import { useLine } from '@/hooks/useLine'
import { useTempGrid } from '@/hooks/useTempGrid'
import { useEffect, useRef } from 'react' import { useEffect, useRef } from 'react'
import { calculateIntersection, distanceBetweenPoints, findClosestPoint } from '@/util/canvas-util' import { distanceBetweenPoints } from '@/util/canvas-util'
import { fabric } from 'fabric' import { fabric } from 'fabric'
import { calculateAngle } from '@/util/qpolygon-utils' import { calculateAngle } from '@/util/qpolygon-utils'
import { import {
@ -36,8 +26,6 @@ import { useSurfaceShapeBatch } from './useSurfaceShapeBatch'
import { roofDisplaySelector } from '@/store/settingAtom' import { roofDisplaySelector } from '@/store/settingAtom'
import { useRoofFn } from '@/hooks/common/useRoofFn' import { useRoofFn } from '@/hooks/common/useRoofFn'
import PlacementSurfaceLineProperty from '@/components/floor-plan/modal/placementShape/PlacementSurfaceLineProperty'
import { useAdsorptionPoint } from '@/hooks/useAdsorptionPoint'
import { useObject } from '@/hooks/useObject' import { useObject } from '@/hooks/useObject'
// 배치면 그리기 // 배치면 그리기
@ -894,7 +882,7 @@ export function usePlacementShapeDrawing(id) {
const firstPoint = points[0] const firstPoint = points[0]
points.forEach((point, idx) => { /*points.forEach((point, idx) => {
if (idx === 0 || !isAllRightAngle) { if (idx === 0 || !isAllRightAngle) {
return return
} }
@ -908,7 +896,7 @@ export function usePlacementShapeDrawing(id) {
if (isAllRightAngle) { if (isAllRightAngle) {
// alert('부정확한 다각형입니다.') // alert('부정확한 다각형입니다.')
return return
} }*/
setPoints((prev) => { setPoints((prev) => {
return [...prev, { x: prev[0].x, y: prev[0].y }] return [...prev, { x: prev[0].x, y: prev[0].y }]