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 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ddc005ed8b - Show all commits

10
src/devctxt.c
View File

@ -44,7 +44,7 @@ static BOOL line_clip(PINT32 output, INT32 x1, INT32 y1, INT32 x2, INT32 y2, INT
} }
if (outcode1 == 0) if (outcode1 == 0)
{ {
Log(LDEBUG, "exchange points") Log(LDEBUG, "exchange points");
tmp = x1; tmp = x1;
x1 = x2; x1 = x2;
x2 = tmp; x2 = tmp;
@ -59,25 +59,25 @@ static BOOL line_clip(PINT32 output, INT32 x1, INT32 y1, INT32 x2, INT32 y2, INT
{ {
x1 += (x2 - x1) * (ymin - y1) / (y2 - y1); x1 += (x2 - x1) * (ymin - y1) / (y2 - y1);
y1 = ymin; y1 = ymin;
Log.debug("clipped against top to point (%d, %d)", x1 >> 16, y1 >> 16); Log(LDEBUG, "clipped against top to point (%d, %d)", x1 >> 16, y1 >> 16);
} }
else if (outcode1 & 0x4) else if (outcode1 & 0x4)
{ {
x1 += (x2 - x1) * (ymax - y1) / (y2 - y1); x1 += (x2 - x1) * (ymax - y1) / (y2 - y1);
y1 = ymax; y1 = ymax;
Log.debug("clipped against bottom to point (%d, %d)", x1 >> 16, y1 >> 16); Log(LDEBUG, "clipped against bottom to point (%d, %d)", x1 >> 16, y1 >> 16);
} }
else if (outcode1 & 0x2) else if (outcode1 & 0x2)
{ {
y1 += (y2 - y1) * (xmax - x1) / (x2 - x1); y1 += (y2 - y1) * (xmax - x1) / (x2 - x1);
x1 = xmax; x1 = xmax;
Log.debug("clipped against right to point (%d, %d)", x1 >> 16, y1 >> 16); Log(LDEBUG, "clipped against right to point (%d, %d)", x1 >> 16, y1 >> 16);
} }
else if (outcode1 & 0x1) else if (outcode1 & 0x1)
{ {
y1 += (y2 - y1) * (xmin - x1) / (x2 - x1); y1 += (y2 - y1) * (xmin - x1) / (x2 - x1);
x1 = xmin; x1 = xmin;
Log.debug("clipped against left to point (%d, %d)", x1 >> 16, y1 >> 16); Log(LDEBUG, "clipped against left to point (%d, %d)", x1 >> 16, y1 >> 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);