Merge branch 'feature/design-remake' into dev
This commit is contained in:
commit
de005aefe7
@ -2591,6 +2591,9 @@ export const drawRoofByAttribute = (roofId, canvas, textMode) => {
|
|||||||
case LINE_TYPE.WALLLINE.JERKINHEAD:
|
case LINE_TYPE.WALLLINE.JERKINHEAD:
|
||||||
offset = oppLine.attributes.width / 2
|
offset = oppLine.attributes.width / 2
|
||||||
break
|
break
|
||||||
|
case LINE_TYPE.WALLLINE.WALL:
|
||||||
|
offset = 0
|
||||||
|
break
|
||||||
default:
|
default:
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
@ -2936,6 +2939,9 @@ export const drawRoofByAttribute = (roofId, canvas, textMode) => {
|
|||||||
case LINE_TYPE.WALLLINE.JERKINHEAD:
|
case LINE_TYPE.WALLLINE.JERKINHEAD:
|
||||||
offset = oppLine.attributes.width / 2
|
offset = oppLine.attributes.width / 2
|
||||||
break
|
break
|
||||||
|
case LINE_TYPE.WALLLINE.WALL:
|
||||||
|
offset = 0
|
||||||
|
break
|
||||||
default:
|
default:
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
@ -3396,6 +3402,9 @@ export const drawRoofByAttribute = (roofId, canvas, textMode) => {
|
|||||||
case LINE_TYPE.WALLLINE.JERKINHEAD:
|
case LINE_TYPE.WALLLINE.JERKINHEAD:
|
||||||
offset = oppLine.attributes.width / 2
|
offset = oppLine.attributes.width / 2
|
||||||
break
|
break
|
||||||
|
case LINE_TYPE.WALLLINE.WALL:
|
||||||
|
offset = 0
|
||||||
|
break
|
||||||
default:
|
default:
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
@ -3515,7 +3524,7 @@ export const drawRoofByAttribute = (roofId, canvas, textMode) => {
|
|||||||
const oMidX = (oppLine.x1 + oppLine.x2) / 2
|
const oMidX = (oppLine.x1 + oppLine.x2) / 2
|
||||||
const oMidY = (oppLine.y1 + oppLine.y2) / 2
|
const oMidY = (oppLine.y1 + oppLine.y2) / 2
|
||||||
const cOffset = currentLine.attributes.offset
|
const cOffset = currentLine.attributes.offset
|
||||||
const oOffset = oppLine.attributes.offset
|
const oOffset = oppLine.attributes.type === LINE_TYPE.WALLLINE.WALL ? 0 : oppLine.attributes.offset
|
||||||
const ridgeVector = { x: Math.sign(clamp01(cMidX - oMidX)), y: Math.sign(clamp01(cMidY - oMidY)) }
|
const ridgeVector = { x: Math.sign(clamp01(cMidX - oMidX)), y: Math.sign(clamp01(cMidY - oMidY)) }
|
||||||
const ridgePoint = [
|
const ridgePoint = [
|
||||||
cMidX + ridgeVector.x * cOffset,
|
cMidX + ridgeVector.x * cOffset,
|
||||||
@ -3531,6 +3540,9 @@ export const drawRoofByAttribute = (roofId, canvas, textMode) => {
|
|||||||
case LINE_TYPE.WALLLINE.JERKINHEAD:
|
case LINE_TYPE.WALLLINE.JERKINHEAD:
|
||||||
offset = oppLine.attributes.width / 2
|
offset = oppLine.attributes.width / 2
|
||||||
break
|
break
|
||||||
|
case LINE_TYPE.WALLLINE.WALL:
|
||||||
|
offset = 0
|
||||||
|
break
|
||||||
default:
|
default:
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user