hackathon-dev #1

Merged
amy merged 101 commits from hackathon-dev into develop 2019-12-12 13:56:11 -07:00
Showing only changes of commit f5cab0010e - Show all commits

View File

@ -76,14 +76,14 @@ static BOOL line_clip(PINT32 output, INT32 x1, INT32 y1, INT32 x2, INT32 y2, INT
else if (outcode1 & 0x2) else if (outcode1 & 0x2)
{ {
tmp = M(y2 - y1, D(xmax - x1, x2 - x1)); tmp = M(y2 - y1, D(xmax - x1, x2 - x1));
y1 -= tmp; y1 += tmp;
x1 = xmax; x1 = xmax;
Log(LDEBUG, "clipped against right to point (%d, %d), dy=%d/%d", x1 >> CPX, y1 >> CPX, tmp >> CPX, tmp); Log(LDEBUG, "clipped against right to point (%d, %d), dy=%d/%d", x1 >> CPX, y1 >> CPX, tmp >> CPX, tmp);
} }
else if (outcode1 & 0x1) else if (outcode1 & 0x1)
{ {
tmp = M(y2 - y1, D(xmin - x1, x2 - x1)); tmp = M(y2 - y1, D(xmin - x1, x2 - x1));
y1 -= tmp; y1 += tmp;
x1 = xmin; x1 = xmin;
Log(LDEBUG, "clipped against left to point (%d, %d), dy=%d/%d", x1 >> CPX, y1 >> CPX, tmp >> CPX, tmp); Log(LDEBUG, "clipped against left to point (%d, %d), dy=%d/%d", x1 >> CPX, y1 >> CPX, tmp >> CPX, tmp);
} }