supleed2/ELEC60015-HLP-CW
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC60015-HLP-CW.git synced 2024-11-10 02:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix / Tidy segmentIntersectsSegment

Browse source
This commit is contained in:
Aadi Desai 2022-03-14 13:23:41 +00:00
parent 8cf10dfd9e
commit 044c574af2
No known key found for this signature in database
GPG key ID: CFFFE425830EF4D9
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Renderer/DrawBlock/BusWire.fs
View file

@ -394,30 +394,30 @@ let segmentIntersectsSegment ((p1', q1') : (XYPos * XYPos)) ((p2', q2') : (XYPos
// the manual or auto route info per segment should be a separate field in Segmnet, not encoded in the sign of the coordinates // the manual or auto route info per segment should be a separate field in Segmnet, not encoded in the sign of the coordinates
// that is needed when writing out or reading from Issie, but the write/read process can easily translate to a sane internal data structure in the draw blokc model // that is needed when writing out or reading from Issie, but the write/read process can easily translate to a sane internal data structure in the draw blokc model
let p1, q1, p2, q2 = absXYPos p1', absXYPos q1', absXYPos p2', absXYPos q2' // TODO: Fix import function so this can be removed let p1, q1, p2, q2 = absXYPos p1', absXYPos q1', absXYPos p2', absXYPos q2' // TODO: Fix import function so this can be removed
let commonCoord (segStart: XYPos) (segEnd: XYPos) : (Orientation * float) = let segmentOrientation (segStart: XYPos) (segEnd: XYPos) : Orientation =
match segStart with match segStart with
| {X = x} when segStart.X = segEnd.X -> Vertical, x | _ when segStart.X = segEnd.X -> Vertical
| {Y = y} when segStart.Y = segEnd.Y -> Horizontal, y | _ when segStart.Y = segEnd.Y -> Horizontal
| _ -> failwithf "Segment must have a common coordinate" | _ -> failwithf "Segment must have a common coordinate"
let seg1Ori, seg1Coord = commonCoord p1 q1 let seg1Ori = segmentOrientation p1 q1
let seg2Ori, seg2Coord = commonCoord p2 q2 let seg2Ori = segmentOrientation p2 q2
if seg1Ori = seg2Ori then if seg1Ori = seg2Ori then
false false
elif seg1Ori = Horizontal then elif seg1Ori = Horizontal then
( // seg 1 horizontal and seg 2 vertical ( // seg 1 horizontal and seg 2 vertical
seg1Coord >= min p2.Y q2.Y && p1.Y >= min p2.Y q2.Y &&
seg1Coord <= max p2.Y q2.Y && p1.Y <= max p2.Y q2.Y &&
seg2Coord >= min p1.X q1.X && p2.X >= min p1.X q1.X &&
seg2Coord <= max p1.X q1.X p2.X <= max p1.X q1.X
) )
else else
( // seg 1 vertical and seg 2 horizontal ( // seg 1 vertical and seg 2 horizontal
seg1Coord >= min p2.X q2.X && p1.X >= min p2.X q2.X &&
seg1Coord <= max p2.X q2.X && p1.X <= max p2.X q2.X &&
seg2Coord >= min p1.Y q1.Y && p2.Y >= min p1.Y q1.Y &&
seg2Coord <= max p1.Y q1.Y p2.Y <= max p1.Y q1.Y
) )
///Returns the absolute segment with positive Start and End coordinates ///Returns the absolute segment with positive Start and End coordinates