Compare commits
No commits in common. "fda35b69272eee1c135c3eed4f72660c99eeb50c" and "760becfb0d84d87a412afb5153a877c4dca06949" have entirely different histories.
fda35b6927
...
760becfb0d
@ -852,10 +852,7 @@ export const usePolygon = () => {
|
|||||||
if (checkLineOverlap(innerLine, polygonLine)) {
|
if (checkLineOverlap(innerLine, polygonLine)) {
|
||||||
// innerLine의 type을 polygonLine의 type으로 변경
|
// innerLine의 type을 polygonLine의 type으로 변경
|
||||||
if (innerLine.attributes && polygonLine.attributes.type) {
|
if (innerLine.attributes && polygonLine.attributes.type) {
|
||||||
// innerLine이 polygonLine보다 긴 경우 polygonLine.need를 false로 변경
|
// polygonLine.need = false
|
||||||
if (polygonLine.length < innerLine.length) {
|
|
||||||
polygonLine.need = false
|
|
||||||
}
|
|
||||||
innerLine.attributes.planeSize = innerLine.attributes.planeSize ?? polygonLine.attributes.planeSize
|
innerLine.attributes.planeSize = innerLine.attributes.planeSize ?? polygonLine.attributes.planeSize
|
||||||
innerLine.attributes.actualSize = innerLine.attributes.actualSize ?? polygonLine.attributes.actualSize
|
innerLine.attributes.actualSize = innerLine.attributes.actualSize ?? polygonLine.attributes.actualSize
|
||||||
innerLine.attributes.type = polygonLine.attributes.type
|
innerLine.attributes.type = polygonLine.attributes.type
|
||||||
@ -1011,9 +1008,6 @@ export const usePolygon = () => {
|
|||||||
/*const originInnerStroke = innerLine.stroke
|
/*const originInnerStroke = innerLine.stroke
|
||||||
innerLine.set({ stroke: 'red' })
|
innerLine.set({ stroke: 'red' })
|
||||||
canvas.renderAll()*/
|
canvas.renderAll()*/
|
||||||
if (checkLineOverlap(line, innerLine)) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (isPointOnLine(line, innerLine.startPoint)) {
|
if (isPointOnLine(line, innerLine.startPoint)) {
|
||||||
canvas.renderAll()
|
canvas.renderAll()
|
||||||
if (isSamePoint(line.startPoint, innerLine.startPoint) || isSamePoint(line.endPoint, innerLine.startPoint)) {
|
if (isSamePoint(line.startPoint, innerLine.startPoint) || isSamePoint(line.endPoint, innerLine.startPoint)) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user