gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 23:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r25118) -Codechange: Deduplicate basic line clipping code. (fonsinchen)

Browse Source
This commit is contained in:
frosch 2013-03-24 11:20:37 +00:00
parent 5046922f61
commit 166513bbd4
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/gfx.cpp
View File

@ -191,6 +191,32 @@ void GfxFillRect(int left, int top, int right, int bottom, int colour, FillRectM
}
}
/**
* Align parameters of a line to the given DPI and check simple clipping.
* @param dpi Screen parameters to align with.
* @param x X coordinate of first point.
* @param y Y coordinate of first point.
* @param x2 X coordinate of second point.
* @param y2 Y coordinate of second point.
* @param width Width of the line.
* @return True if the line is likely to be visible, false if it's certainly
* invisible.
*/
static inline bool GfxPreprocessLine(DrawPixelInfo *dpi, int &x, int &y, int &x2, int &y2, int width)
{
x -= dpi->left;
x2 -= dpi->left;
y -= dpi->top;
y2 -= dpi->top;
/* Check simple clipping */
if (x + width / 2 < 0 && x2 + width / 2 < 0 ) return false;
if (y + width / 2 < 0 && y2 + width / 2 < 0 ) return false;
if (x - width / 2 > dpi->width && x2 - width / 2 > dpi->width ) return false;
if (y - width / 2 > dpi->height && y2 - width / 2 > dpi->height) return false;
return true;
}
void GfxDrawLine(int x, int y, int x2, int y2, int colour, int width)
{
Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter();
@ -198,18 +224,9 @@ void GfxDrawLine(int x, int y, int x2, int y2, int colour, int width)
assert(width > 0);
x -= dpi->left;
x2 -= dpi->left;
y -= dpi->top;
y2 -= dpi->top;
/* Check clipping */
if (x + width / 2 < 0 && x2 + width / 2 < 0 ) return;
if (y + width / 2 < 0 && y2 + width / 2 < 0 ) return;
if (x - width / 2 > dpi->width && x2 - width / 2 > dpi->width ) return;
if (y - width / 2 > dpi->height && y2 - width / 2 > dpi->height) return;
blitter->DrawLine(dpi->dst_ptr, x, y, x2, y2, dpi->width, dpi->height, colour, width);
if (GfxPreprocessLine(dpi, x, y, x2, y2, width)) {
blitter->DrawLine(dpi->dst_ptr, x, y, x2, y2, dpi->width, dpi->height, colour, width);
}
}
void GfxDrawLineUnscaled(int x, int y, int x2, int y2, int colour)
@ -217,20 +234,12 @@ void GfxDrawLineUnscaled(int x, int y, int x2, int y2, int colour)
Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter();
DrawPixelInfo *dpi = _cur_dpi;
x -= dpi->left;
x2 -= dpi->left;
y -= dpi->top;
y2 -= dpi->top;
/* Check clipping */
if (x < 0 && x2 < 0) return;
if (y < 0 && y2 < 0) return;
if (x > dpi->width && x2 > dpi->width) return;
if (y > dpi->height && y2 > dpi->height) return;
blitter->DrawLine(dpi->dst_ptr, UnScaleByZoom(x, dpi->zoom), UnScaleByZoom(y, dpi->zoom),
UnScaleByZoom(x2, dpi->zoom), UnScaleByZoom(y2, dpi->zoom),
UnScaleByZoom(dpi->width, dpi->zoom), UnScaleByZoom(dpi->height, dpi->zoom), colour, 1);
if (GfxPreprocessLine(dpi, x, y, x2, y2, 1)) {
blitter->DrawLine(dpi->dst_ptr,
UnScaleByZoom(x, dpi->zoom), UnScaleByZoom(y, dpi->zoom),
UnScaleByZoom(x2, dpi->zoom), UnScaleByZoom(y2, dpi->zoom),
UnScaleByZoom(dpi->width, dpi->zoom), UnScaleByZoom(dpi->height, dpi->zoom), colour, 1);
}
}
/**