libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-05 00:36:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: Make drawThickLine take a thickness in both x and y directions

Browse Source
This commit is contained in:
Matthew Hoops 2011-10-27 19:20:02 -04:00
parent 1bd2480f5f
commit 627684ca73
3 changed files with 14 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/scumm/he/wiz_he.cpp
View File

@ -2286,8 +2286,7 @@ void Wiz::fillWizLine(const WizParameters *params) {
lineP.depth = bitDepth;
if (params->processFlags & kWPFParams) {
assert (params->params2 == 1); // Catch untested usage
Graphics::drawThickLine(x1, y1, x2, y2, params->params1, color, drawProc, &lineP);
Graphics::drawThickLine(x1, y1, x2, y2, params->params1, params->params2, color, drawProc, &lineP);
} else {
Graphics::drawLine(x1, y1, x2, y2, color, drawProc, &lineP);
}

62
graphics/primitives.cpp
View File

@ -61,59 +61,21 @@ void drawLine(int x0, int y0, int x1, int y1, int color, void (*plotProc)(int, i
}
}
void drawThickLine(int x0, int y0, int x1, int y1, int penX, int penY, int color, void (*plotProc)(int, int, int, void *), void *data) {
assert(penX > 0 && penY > 0);
// FIXME: This is a limited version of thick line drawing
// it draws striped lines at some angles. Better algorithm could
// be found here:
//
// http://homepages.enterprise.net/murphy/thickline/index.html
//
// Feel free to replace it with better implementation
void drawThickLine(int x0, int y0, int x1, int y1, int thickness, int color, void (*plotProc)(int, int, int, void *), void *data) {
const bool steep = ABS(y1 - y0) > ABS(x1 - x0);
if (steep) {
SWAP(x0, y0);
SWAP(x1, y1);
}
float dx = x1 - x0;
float dy = y1 - y0;
float d = (float)sqrt(dx * dx + dy * dy);
if (!d)
// Shortcut
if (penX == 1 && penY == 1) {
drawLine(x0, y0, x1, y1, color, plotProc, data);
return;
int thickX = (int)((float)thickness * dy / d / 2);
int thickY = (int)((float)thickness * dx / d / 2);
const int delta_x = ABS(x1 - x0);
const int delta_y = ABS(y1 - y0);
const int delta_err = delta_y;
int x = x0;
int y = y0;
int err = 0;
const int x_step = (x0 < x1) ? 1 : -1;
const int y_step = (y0 < y1) ? 1 : -1;
if (steep)
drawLine(y - thickY, x + thickX, y + thickY, x - thickX, color, plotProc, data);
else
drawLine(x - thickX, y + thickY, x + thickX, y - thickY, color, plotProc, data);
while (x != x1) {
x += x_step;
err += delta_err;
if (2 * err > delta_x) {
y += y_step;
err -= delta_x;
}
if (steep)
drawLine(y - thickY, x + thickX, y + thickY, x - thickX, color, plotProc, data);
else
drawLine(x - thickX, y + thickY, x + thickX, y - thickY, color, plotProc, data);
}
// TODO: Optimize this. It currently is a very naive way of handling
// thick lines since quite often it will be drawing to the same pixel
// multiple times.
for (int x = 0; x < penX; x++)
for (int y = 0; y < penY; y++)
drawLine(x0 + x, y0 + y, x1 + x, y1 + y, color, plotProc, data);
}
} // End of namespace Graphics

2
graphics/primitives.h
View File

@ -25,7 +25,7 @@
namespace Graphics {
void drawLine(int x0, int y0, int x1, int y1, int color, void (*plotProc)(int, int, int, void *), void *data);
void drawThickLine(int x0, int y0, int x1, int y1, int thickness, int color, void (*plotProc)(int, int, int, void *), void *data);
void drawThickLine(int x0, int y0, int x1, int y1, int penX, int penY, int color, void (*plotProc)(int, int, int, void *), void *data);
} // End of namespace Graphics