amy/upiwin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hackathon-dev #1

Merged
amy merged 101 commits from hackathon-dev into develop 2019-12-12 13:56:11 -07:00
Conversation 0 Commits 101 Files Changed 67 +12 -8
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3b7f326768 - Show all commits

20
src/devctxt.c
View File

@ -57,27 +57,31 @@ static BOOL line_clip(PINT32 output, INT32 x1, INT32 y1, INT32 x2, INT32 y2, INT
} }
if (outcode1 & 0x8) if (outcode1 & 0x8)
{ {
x1 += (x2 - x1) * ((ymin - y1) / (y2 - y1)); tmp = (x2 - x1) * ((ymin - y1) / (y2 - y1));
x1 += tmp;
y1 = ymin; y1 = ymin;
Log(LDEBUG, "clipped against top to point (%d, %d)", x1 >> 16, y1 >> 16); Log(LDEBUG, "clipped against top to point (%d, %d), dx=%d", x1 >> 16, y1 >> 16, tmp >> 16);
} }
else if (outcode1 & 0x4) else if (outcode1 & 0x4)
{ {
x1 += (x2 - x1) * ((ymax - y1) / (y2 - y1)); tmp = (x2 - x1) * ((ymax - y1) / (y2 - y1));
x1 += tmp;
y1 = ymax; y1 = ymax;
Log(LDEBUG, "clipped against bottom to point (%d, %d)", x1 >> 16, y1 >> 16); Log(LDEBUG, "clipped against bottom to point (%d, %d), dx=%d", x1 >> 16, y1 >> 16, tmp >> 16);
} }
else if (outcode1 & 0x2) else if (outcode1 & 0x2)
{ {
y1 -= (y2 - y1) * ((xmax - x1) / (x2 - x1)); tmp = (y2 - y1) * ((xmax - x1) / (x2 - x1));
y1 -= tmp;
x1 = xmax; x1 = xmax;
Log(LDEBUG, "clipped against right to point (%d, %d)", x1 >> 16, y1 >> 16); Log(LDEBUG, "clipped against right to point (%d, %d), dy=%d", x1 >> 16, y1 >> 16, tmp >> 16);
} }
else if (outcode1 & 0x1) else if (outcode1 & 0x1)
{ {
y1 -= (y2 - y1) * ((xmin - x1) / (x2 - x1)); tmp = (y2 - y1) * ((xmin - x1) / (x2 - x1));
y1 -= tmp;
x1 = xmin; x1 = xmin;
Log(LDEBUG, "clipped against left to point (%d, %d)", x1 >> 16, y1 >> 16); Log(LDEBUG, "clipped against left to point (%d, %d), dy=%d", x1 >> 16, y1 >> 16, tmp >> 16);
} }
} }
Log(LDEBUG, "final line is from (%d, %d) to (%d, %d)", x1 >> 16, y1 >> 16, x2 >> 16, y2 >> 16); Log(LDEBUG, "final line is from (%d, %d) to (%d, %d)", x1 >> 16, y1 >> 16, x2 >> 16, y2 >> 16);