Improve drawing with digital zone highligts, futher colour tweaks, & thicker lines in GL.

It's also now no longer possible to trigger NW & SE angles when digital is set to 4 direction.
This commit is contained in:
2022-11-18 05:44:30 +11:00
parent 0cf89816cd
commit 4255841a6b
9 changed files with 177 additions and 42 deletions

View File

@ -45,6 +45,8 @@ int InitDraw(SDL_Window* w)
SetDrawViewport(GetDrawSizeInPixels()); // Fills scaleWidth & scaleHeight
glLineWidth(2.0f);
// Setup orthographic viewport
glMatrixMode(GL_PROJECTION);
glOrtho(0.0, 1.0f, 1.0f, 0.0, 1.0, -1.0);
@ -176,6 +178,35 @@ void DrawCircleSteps(int x, int y, int r, int steps)
glEnd();
}
void DrawArc(int x, int y, int r, int startAng, int endAng)
{
const int steps = (int)(sqrt((double)r) * (double)abs(endAng - startAng) / 360.0 * 8.0);
DrawArcSteps(x, y, r, startAng, endAng, steps);
}
void DrawArcSteps(int x, int y, int r, int startAng, int endAng, int steps)
{
// Arcs look better when offset negatively by half a pixel w/o MSAA
const double fx = (antialias ? (double)x : (double)x - 0.5f) * scaleWidth;
const double fy = (antialias ? (double)y : (double)y - 0.5f) * scaleHeight;
const double magw = (double)r * scaleWidth;
const double magh = (double)r * scaleHeight;
glBegin(GL_LINE_STRIP);
GlColour();
const double fstart = (double)startAng * DEG2RAD;
const double fstepSz = (double)(endAng - startAng) / abs(steps) * DEG2RAD;
for (int i = 0; i <= steps; ++i)
{
const double theta = fstart + fstepSz * (double)i;
double ofsx = cos(theta) * magw;
double ofsy = sin(theta) * magh;
glVertex2d(fx + ofsx, fy - ofsy);
}
glEnd();
}
void DrawPresent(void)
{
SDL_GL_SwapWindow(window);