thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

An attempt to implement thick line drawing.

Browse source 
svn-id: r29639
This commit is contained in:
Eugene Sandulenko 2007-11-25 13:33:28 +00:00
parent 8151e1672f
commit 7844ad6f2c
3 changed files with 65 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/scumm/he/wiz_he.cpp
View file

@ -1789,14 +1789,16 @@ void Wiz::fillWizLine(const WizParameters *params) {
int x2 = params->box2.right; int x2 = params->box2.right;
int y2 = params->box2.bottom; int y2 = params->box2.bottom;
if (params->processFlags & kWPFThickLine) { drawProcP lineP;
debug(0, "Unsupported ThickLine (%d, %d)", params->lineUnk1, params->lineUnk2);
} else {
drawProcP lineP;
lineP.imageRect = &imageRect; lineP.imageRect = &imageRect;
lineP.wizd = wizd; lineP.wizd = wizd;
lineP.width = w; lineP.width = w;
if (params->processFlags & kWPFThickLine) {
assert (params->lineUnk2 == 1); // Catch untested usage
Graphics::drawThickLine(x1, y1, x2, y2, params->lineUnk1, color, drawProc, &lineP);
} else {
Graphics::drawLine(x1, y1, x2, y2, color, drawProc, &lineP); Graphics::drawLine(x1, y1, x2, y2, color, drawProc, &lineP);
} }

55
graphics/primitives.cpp
View file

@ -64,4 +64,59 @@ void drawLine(int x0, int y0, int x1, int y1, int color, void (*plotProc)(int, i
} }
} }
// 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 = sqrtf(dx * dx + dy * dy);
if (!d)
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);
}
}
} // End of namespace Graphics } // End of namespace Graphics

1
graphics/primitives.h
View file

@ -28,6 +28,7 @@
namespace Graphics { namespace Graphics {
void drawLine(int x0, int y0, int x1, int y1, int color, void (*plotProc)(int, int, int, void *), void *data); 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);
} // End of namespace Graphics } // End of namespace Graphics