2013-07-28 22:08:34 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Helper functions that ultimately draw stuff with gl.
|
|
|
|
//
|
|
|
|
// Copyright 2008-2013 Jonathan Westhues.
|
|
|
|
//-----------------------------------------------------------------------------
|
2008-04-11 11:13:47 +00:00
|
|
|
#include "solvespace.h"
|
|
|
|
|
|
|
|
// A public-domain Hershey vector font ("Simplex").
|
2013-09-16 21:14:53 +00:00
|
|
|
#include "font.table.h"
|
2008-04-11 11:13:47 +00:00
|
|
|
|
2010-04-26 07:52:49 +00:00
|
|
|
// A bitmap font.
|
2013-09-16 21:14:53 +00:00
|
|
|
#include "bitmapfont.table.h"
|
2010-04-26 07:52:49 +00:00
|
|
|
|
2008-04-19 11:09:47 +00:00
|
|
|
static bool ColorLocked;
|
2008-06-17 19:12:25 +00:00
|
|
|
static bool DepthOffsetLocked;
|
2008-04-19 11:09:47 +00:00
|
|
|
|
2009-09-24 15:52:48 +00:00
|
|
|
#define FONT_SCALE(h) ((h)/22.0)
|
2013-08-26 18:58:35 +00:00
|
|
|
double glxStrWidth(const char *str, double h)
|
2010-05-03 05:04:42 +00:00
|
|
|
{
|
2008-04-30 08:14:32 +00:00
|
|
|
int w = 0;
|
|
|
|
for(; *str; str++) {
|
|
|
|
int c = *str;
|
|
|
|
if(c < 32 || c > 126) c = 32;
|
|
|
|
c -= 32;
|
|
|
|
|
|
|
|
w += Font[c].width;
|
|
|
|
}
|
2009-09-24 15:52:48 +00:00
|
|
|
return w*FONT_SCALE(h)/SS.GW.scale;
|
2008-05-07 08:19:37 +00:00
|
|
|
}
|
2010-05-03 05:04:42 +00:00
|
|
|
double glxStrHeight(double h)
|
|
|
|
{
|
2009-09-24 15:52:48 +00:00
|
|
|
// The characters have height ~22, as they appear in the table.
|
|
|
|
return 22.0*FONT_SCALE(h)/SS.GW.scale;
|
2008-04-30 08:14:32 +00:00
|
|
|
}
|
2013-08-26 18:58:35 +00:00
|
|
|
void glxWriteTextRefCenter(const char *str, double h, Vector t, Vector u, Vector v,
|
|
|
|
glxLineFn *fn, void *fndata)
|
2008-04-30 08:14:32 +00:00
|
|
|
{
|
2009-07-03 20:55:57 +00:00
|
|
|
u = u.WithMagnitude(1);
|
|
|
|
v = v.WithMagnitude(1);
|
|
|
|
|
2009-09-24 15:52:48 +00:00
|
|
|
double scale = FONT_SCALE(h)/SS.GW.scale;
|
|
|
|
double fh = glxStrHeight(h);
|
|
|
|
double fw = glxStrWidth(str, h);
|
2009-07-03 20:55:57 +00:00
|
|
|
|
|
|
|
t = t.Plus(u.ScaledBy(-fw/2));
|
|
|
|
t = t.Plus(v.ScaledBy(-fh/2));
|
|
|
|
|
|
|
|
// Undo the (+5, +5) offset that glxWriteText applies.
|
|
|
|
t = t.Plus(u.ScaledBy(-5*scale));
|
|
|
|
t = t.Plus(v.ScaledBy(-5*scale));
|
|
|
|
|
2009-09-24 15:52:48 +00:00
|
|
|
glxWriteText(str, h, t, u, v, fn, fndata);
|
2008-04-30 08:14:32 +00:00
|
|
|
}
|
|
|
|
|
2009-07-03 20:55:57 +00:00
|
|
|
static void LineDrawCallback(void *fndata, Vector a, Vector b)
|
2008-04-11 11:13:47 +00:00
|
|
|
{
|
2009-09-17 07:32:36 +00:00
|
|
|
glLineWidth(1);
|
2009-07-03 20:55:57 +00:00
|
|
|
glBegin(GL_LINES);
|
|
|
|
glxVertex3v(a);
|
|
|
|
glxVertex3v(b);
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
2013-08-26 18:58:35 +00:00
|
|
|
void glxWriteText(const char *str, double h, Vector t, Vector u, Vector v,
|
|
|
|
glxLineFn *fn, void *fndata)
|
2009-07-03 20:55:57 +00:00
|
|
|
{
|
|
|
|
if(!fn) fn = LineDrawCallback;
|
|
|
|
u = u.WithMagnitude(1);
|
|
|
|
v = v.WithMagnitude(1);
|
|
|
|
|
2009-09-24 15:52:48 +00:00
|
|
|
double scale = FONT_SCALE(h)/SS.GW.scale;
|
2008-04-11 11:13:47 +00:00
|
|
|
int xo = 5;
|
|
|
|
int yo = 5;
|
|
|
|
|
|
|
|
for(; *str; str++) {
|
|
|
|
int c = *str;
|
|
|
|
if(c < 32 || c > 126) c = 32;
|
|
|
|
|
|
|
|
c -= 32;
|
|
|
|
|
|
|
|
int j;
|
2009-07-03 20:55:57 +00:00
|
|
|
Vector prevp = Vector::From(VERY_POSITIVE, 0, 0);
|
2008-04-11 11:13:47 +00:00
|
|
|
for(j = 0; j < Font[c].points; j++) {
|
|
|
|
int x = Font[c].coord[j*2];
|
|
|
|
int y = Font[c].coord[j*2+1];
|
|
|
|
|
|
|
|
if(x == PEN_UP && y == PEN_UP) {
|
2009-07-03 20:55:57 +00:00
|
|
|
prevp.x = VERY_POSITIVE;
|
2008-04-11 11:13:47 +00:00
|
|
|
} else {
|
2009-07-03 20:55:57 +00:00
|
|
|
Vector p = t;
|
|
|
|
p = p.Plus(u.ScaledBy((xo + x)*scale));
|
|
|
|
p = p.Plus(v.ScaledBy((yo + y)*scale));
|
|
|
|
if(prevp.x != VERY_POSITIVE) {
|
|
|
|
fn(fndata, prevp, p);
|
|
|
|
}
|
|
|
|
prevp = p;
|
2008-04-11 11:13:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
xo += Font[c].width;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void glxVertex3v(Vector u)
|
|
|
|
{
|
|
|
|
glVertex3f((GLfloat)u.x, (GLfloat)u.y, (GLfloat)u.z);
|
|
|
|
}
|
|
|
|
|
2013-09-09 20:05:33 +00:00
|
|
|
void glxAxisAlignedQuad(double l, double r, double t, double b, bool lone)
|
2010-05-03 05:04:42 +00:00
|
|
|
{
|
2013-09-09 20:05:33 +00:00
|
|
|
if(lone) glBegin(GL_QUADS);
|
2010-05-03 05:04:42 +00:00
|
|
|
glVertex2d(l, t);
|
|
|
|
glVertex2d(l, b);
|
|
|
|
glVertex2d(r, b);
|
|
|
|
glVertex2d(r, t);
|
2013-09-09 20:05:33 +00:00
|
|
|
if(lone) glEnd();
|
2010-05-03 05:04:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void glxAxisAlignedLineLoop(double l, double r, double t, double b)
|
|
|
|
{
|
|
|
|
glBegin(GL_LINE_LOOP);
|
|
|
|
glVertex2d(l, t);
|
|
|
|
glVertex2d(l, b);
|
|
|
|
glVertex2d(r, b);
|
|
|
|
glVertex2d(r, t);
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
2009-09-24 15:52:48 +00:00
|
|
|
static void FatLineEndcap(Vector p, Vector u, Vector v)
|
|
|
|
{
|
|
|
|
// A table of cos and sin of (pi*i/10 + pi/2), as i goes from 0 to 10
|
|
|
|
static const double Circle[11][2] = {
|
|
|
|
{ 0.0000, 1.0000 },
|
|
|
|
{ -0.3090, 0.9511 },
|
|
|
|
{ -0.5878, 0.8090 },
|
|
|
|
{ -0.8090, 0.5878 },
|
|
|
|
{ -0.9511, 0.3090 },
|
|
|
|
{ -1.0000, 0.0000 },
|
|
|
|
{ -0.9511, -0.3090 },
|
|
|
|
{ -0.8090, -0.5878 },
|
|
|
|
{ -0.5878, -0.8090 },
|
|
|
|
{ -0.3090, -0.9511 },
|
|
|
|
{ 0.0000, -1.0000 },
|
|
|
|
};
|
|
|
|
glBegin(GL_TRIANGLE_FAN);
|
|
|
|
for(int i = 0; i <= 10; i++) {
|
|
|
|
double c = Circle[i][0], s = Circle[i][1];
|
|
|
|
glxVertex3v(p.Plus(u.ScaledBy(c)).Plus(v.ScaledBy(s)));
|
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
2010-05-03 05:04:42 +00:00
|
|
|
void glxFatLine(Vector a, Vector b, double width)
|
|
|
|
{
|
2009-09-24 15:52:48 +00:00
|
|
|
// The half-width of the line we're drawing.
|
|
|
|
double hw = width / 2;
|
|
|
|
Vector ab = b.Minus(a);
|
|
|
|
Vector gn = (SS.GW.projRight).Cross(SS.GW.projUp);
|
|
|
|
Vector abn = (ab.Cross(gn)).WithMagnitude(1);
|
|
|
|
abn = abn.Minus(gn.ScaledBy(gn.Dot(abn)));
|
|
|
|
// So now abn is normal to the projection of ab into the screen, so the
|
|
|
|
// line will always have constant thickness as the view is rotated.
|
|
|
|
|
|
|
|
abn = abn.WithMagnitude(hw);
|
|
|
|
ab = gn.Cross(abn);
|
|
|
|
ab = ab. WithMagnitude(hw);
|
|
|
|
|
|
|
|
// The body of a line is a quad
|
|
|
|
glBegin(GL_QUADS);
|
|
|
|
glxVertex3v(a.Minus(abn));
|
|
|
|
glxVertex3v(b.Minus(abn));
|
|
|
|
glxVertex3v(b.Plus (abn));
|
|
|
|
glxVertex3v(a.Plus (abn));
|
|
|
|
glEnd();
|
|
|
|
// And the line has two semi-circular end caps.
|
|
|
|
FatLineEndcap(a, ab, abn);
|
|
|
|
FatLineEndcap(b, ab.ScaledBy(-1), abn);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
void glxLockColorTo(RgbColor rgb)
|
2008-04-19 11:09:47 +00:00
|
|
|
{
|
2009-09-17 07:32:36 +00:00
|
|
|
ColorLocked = false;
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
glColor3d(rgb.redF(), rgb.greenF(), rgb.blueF());
|
2008-04-19 11:09:47 +00:00
|
|
|
ColorLocked = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void glxUnlockColor(void)
|
|
|
|
{
|
2009-09-17 07:32:36 +00:00
|
|
|
ColorLocked = false;
|
2008-04-19 11:09:47 +00:00
|
|
|
}
|
|
|
|
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
void glxColorRGB(RgbColor rgb)
|
2008-04-19 11:09:47 +00:00
|
|
|
{
|
2009-09-17 07:32:36 +00:00
|
|
|
// Is there a bug in some graphics drivers where this is not equivalent
|
|
|
|
// to glColor3d? There seems to be...
|
|
|
|
glxColorRGBa(rgb, 1.0);
|
2008-04-25 07:04:09 +00:00
|
|
|
}
|
|
|
|
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
void glxColorRGBa(RgbColor rgb, double a)
|
2008-04-25 07:04:09 +00:00
|
|
|
{
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
if(!ColorLocked) glColor4d(rgb.redF(), rgb.greenF(), rgb.blueF(), a);
|
2008-04-25 07:04:09 +00:00
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
static void Stipple(bool forSel)
|
2008-06-02 05:38:12 +00:00
|
|
|
{
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
static bool Init;
|
2008-06-02 05:38:12 +00:00
|
|
|
const int BYTES = (32*32)/8;
|
|
|
|
static GLubyte HoverMask[BYTES];
|
|
|
|
static GLubyte SelMask[BYTES];
|
|
|
|
if(!Init) {
|
|
|
|
int x, y;
|
|
|
|
for(x = 0; x < 32; x++) {
|
|
|
|
for(y = 0; y < 32; y++) {
|
|
|
|
int i = y*4 + x/8, b = x % 8;
|
|
|
|
int ym = y % 4, xm = x % 4;
|
|
|
|
for(int k = 0; k < 2; k++) {
|
|
|
|
if(xm >= 1 && xm <= 2 && ym >= 1 && ym <= 2) {
|
|
|
|
(k == 0 ? SelMask : HoverMask)[i] |= (0x80 >> b);
|
|
|
|
}
|
|
|
|
ym = (ym + 2) % 4; xm = (xm + 2) % 4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
Init = true;
|
2008-06-02 05:38:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
glEnable(GL_POLYGON_STIPPLE);
|
|
|
|
if(forSel) {
|
|
|
|
glPolygonStipple(SelMask);
|
|
|
|
} else {
|
|
|
|
glPolygonStipple(HoverMask);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
static void StippleTriangle(STriangle *tr, bool s, RgbColor rgb)
|
2008-06-02 05:38:12 +00:00
|
|
|
{
|
|
|
|
glEnd();
|
|
|
|
glDisable(GL_LIGHTING);
|
2009-09-17 07:32:36 +00:00
|
|
|
glxColorRGB(rgb);
|
2008-06-02 05:38:12 +00:00
|
|
|
Stipple(s);
|
|
|
|
glBegin(GL_TRIANGLES);
|
|
|
|
glxVertex3v(tr->a);
|
|
|
|
glxVertex3v(tr->b);
|
|
|
|
glxVertex3v(tr->c);
|
|
|
|
glEnd();
|
|
|
|
glEnable(GL_LIGHTING);
|
|
|
|
glDisable(GL_POLYGON_STIPPLE);
|
|
|
|
glBegin(GL_TRIANGLES);
|
|
|
|
}
|
|
|
|
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
void glxFillMesh(RgbColor specColor, SMesh *m, uint32_t h, uint32_t s1, uint32_t s2)
|
2008-05-23 10:05:07 +00:00
|
|
|
{
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
RgbColor rgbHovered = Style::Color(Style::HOVERED),
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
rgbSelected = Style::Color(Style::SELECTED);
|
2009-09-17 07:32:36 +00:00
|
|
|
|
2008-05-23 10:05:07 +00:00
|
|
|
glEnable(GL_NORMALIZE);
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
RgbColor prevColor = NULL_COLOR;
|
2008-05-23 10:05:07 +00:00
|
|
|
glBegin(GL_TRIANGLES);
|
|
|
|
for(int i = 0; i < m->l.n; i++) {
|
|
|
|
STriangle *tr = &(m->l.elem[i]);
|
|
|
|
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
RgbColor color;
|
|
|
|
if(specColor.UseDefault()) {
|
2008-06-02 03:31:37 +00:00
|
|
|
color = tr->meta.color;
|
|
|
|
} else {
|
|
|
|
color = specColor;
|
|
|
|
}
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
if(!color.Equals(prevColor)) {
|
|
|
|
GLfloat mpf[] = { color.redF(), color.greenF(), color.blueF(), 1.0f };
|
2008-05-30 06:09:41 +00:00
|
|
|
glEnd();
|
|
|
|
glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, mpf);
|
|
|
|
prevColor = color;
|
|
|
|
glBegin(GL_TRIANGLES);
|
|
|
|
}
|
|
|
|
|
2013-10-19 05:36:45 +00:00
|
|
|
if(tr->an.EqualsExactly(Vector::From(0, 0, 0))) {
|
2009-01-19 10:37:10 +00:00
|
|
|
// Compute the normal from the vertices
|
|
|
|
Vector n = tr->Normal();
|
|
|
|
glNormal3d(n.x, n.y, n.z);
|
|
|
|
glxVertex3v(tr->a);
|
|
|
|
glxVertex3v(tr->b);
|
|
|
|
glxVertex3v(tr->c);
|
|
|
|
} else {
|
|
|
|
// Use the exact normals that are specified
|
|
|
|
glNormal3d((tr->an).x, (tr->an).y, (tr->an).z);
|
|
|
|
glxVertex3v(tr->a);
|
|
|
|
|
|
|
|
glNormal3d((tr->bn).x, (tr->bn).y, (tr->bn).z);
|
|
|
|
glxVertex3v(tr->b);
|
|
|
|
|
|
|
|
glNormal3d((tr->cn).x, (tr->cn).y, (tr->cn).z);
|
|
|
|
glxVertex3v(tr->c);
|
|
|
|
}
|
2008-06-02 05:38:12 +00:00
|
|
|
|
|
|
|
if((s1 != 0 && tr->meta.face == s1) ||
|
|
|
|
(s2 != 0 && tr->meta.face == s2))
|
|
|
|
{
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
StippleTriangle(tr, true, rgbSelected);
|
2008-06-02 05:38:12 +00:00
|
|
|
}
|
|
|
|
if(h != 0 && tr->meta.face == h) {
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
StippleTriangle(tr, false, rgbHovered);
|
2008-06-02 05:38:12 +00:00
|
|
|
}
|
2008-05-23 10:05:07 +00:00
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
2010-05-03 05:04:42 +00:00
|
|
|
static void GLX_CALLBACK Vertex(Vector *p)
|
|
|
|
{
|
2008-04-25 07:04:09 +00:00
|
|
|
glxVertex3v(*p);
|
|
|
|
}
|
2008-05-22 10:28:28 +00:00
|
|
|
void glxFillPolygon(SPolygon *p)
|
|
|
|
{
|
|
|
|
GLUtesselator *gt = gluNewTess();
|
|
|
|
gluTessCallback(gt, GLU_TESS_BEGIN, (glxCallbackFptr *)glBegin);
|
|
|
|
gluTessCallback(gt, GLU_TESS_END, (glxCallbackFptr *)glEnd);
|
|
|
|
gluTessCallback(gt, GLU_TESS_VERTEX, (glxCallbackFptr *)Vertex);
|
|
|
|
|
|
|
|
glxTesselatePolygon(gt, p);
|
|
|
|
|
|
|
|
gluDeleteTess(gt);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void GLX_CALLBACK Combine(double coords[3], void *vertexData[4],
|
|
|
|
float weight[4], void **outData)
|
2008-04-25 10:11:29 +00:00
|
|
|
{
|
|
|
|
Vector *n = (Vector *)AllocTemporary(sizeof(Vector));
|
|
|
|
n->x = coords[0];
|
|
|
|
n->y = coords[1];
|
|
|
|
n->z = coords[2];
|
|
|
|
|
|
|
|
*outData = n;
|
|
|
|
}
|
2008-05-22 10:28:28 +00:00
|
|
|
void glxTesselatePolygon(GLUtesselator *gt, SPolygon *p)
|
2008-04-25 07:04:09 +00:00
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
|
2008-05-22 10:28:28 +00:00
|
|
|
gluTessCallback(gt, GLU_TESS_COMBINE, (glxCallbackFptr *)Combine);
|
2008-04-25 07:04:09 +00:00
|
|
|
gluTessProperty(gt, GLU_TESS_WINDING_RULE, GLU_TESS_WINDING_ODD);
|
|
|
|
|
2008-05-05 09:47:23 +00:00
|
|
|
Vector normal = p->normal;
|
2008-05-02 10:54:22 +00:00
|
|
|
glNormal3d(normal.x, normal.y, normal.z);
|
2008-05-05 09:47:23 +00:00
|
|
|
gluTessNormal(gt, normal.x, normal.y, normal.z);
|
2008-05-02 10:54:22 +00:00
|
|
|
|
2008-04-25 07:04:09 +00:00
|
|
|
gluTessBeginPolygon(gt, NULL);
|
|
|
|
for(i = 0; i < p->l.n; i++) {
|
|
|
|
SContour *sc = &(p->l.elem[i]);
|
|
|
|
gluTessBeginContour(gt);
|
|
|
|
for(j = 0; j < (sc->l.n-1); j++) {
|
|
|
|
SPoint *sp = &(sc->l.elem[j]);
|
|
|
|
double ap[3];
|
|
|
|
ap[0] = sp->p.x;
|
|
|
|
ap[1] = sp->p.y;
|
|
|
|
ap[2] = sp->p.z;
|
|
|
|
gluTessVertex(gt, ap, &(sp->p));
|
|
|
|
}
|
|
|
|
gluTessEndContour(gt);
|
2008-04-19 11:09:47 +00:00
|
|
|
}
|
2008-04-25 07:04:09 +00:00
|
|
|
gluTessEndPolygon(gt);
|
2008-04-19 11:09:47 +00:00
|
|
|
}
|
2008-04-25 07:04:09 +00:00
|
|
|
|
2008-05-19 09:23:49 +00:00
|
|
|
void glxDebugPolygon(SPolygon *p)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
glLineWidth(2);
|
|
|
|
glPointSize(7);
|
|
|
|
glDisable(GL_DEPTH_TEST);
|
|
|
|
for(i = 0; i < p->l.n; i++) {
|
|
|
|
SContour *sc = &(p->l.elem[i]);
|
|
|
|
for(j = 0; j < (sc->l.n-1); j++) {
|
|
|
|
Vector a = (sc->l.elem[j]).p;
|
|
|
|
Vector b = (sc->l.elem[j+1]).p;
|
|
|
|
|
2009-09-17 07:32:36 +00:00
|
|
|
glxLockColorTo(RGB(0, 0, 255));
|
2008-05-19 09:23:49 +00:00
|
|
|
Vector d = (a.Minus(b)).WithMagnitude(-0);
|
|
|
|
glBegin(GL_LINES);
|
|
|
|
glxVertex3v(a.Plus(d));
|
|
|
|
glxVertex3v(b.Minus(d));
|
|
|
|
glEnd();
|
2009-09-17 07:32:36 +00:00
|
|
|
glxLockColorTo(RGB(255, 0, 0));
|
2008-05-19 09:23:49 +00:00
|
|
|
glBegin(GL_POINTS);
|
|
|
|
glxVertex3v(a.Plus(d));
|
|
|
|
glxVertex3v(b.Minus(d));
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-05-24 11:37:07 +00:00
|
|
|
void glxDrawEdges(SEdgeList *el, bool endpointsToo)
|
2008-05-19 09:23:49 +00:00
|
|
|
{
|
2009-01-25 09:19:59 +00:00
|
|
|
SEdge *se;
|
2008-07-06 07:56:24 +00:00
|
|
|
glBegin(GL_LINES);
|
2009-01-25 09:19:59 +00:00
|
|
|
for(se = el->l.First(); se; se = el->l.NextAfter(se)) {
|
2009-04-19 05:53:16 +00:00
|
|
|
glxVertex3v(se->a);
|
|
|
|
glxVertex3v(se->b);
|
|
|
|
}
|
|
|
|
glEnd();
|
2009-05-24 11:37:07 +00:00
|
|
|
|
|
|
|
if(endpointsToo) {
|
|
|
|
glPointSize(12);
|
|
|
|
glBegin(GL_POINTS);
|
|
|
|
for(se = el->l.First(); se; se = el->l.NextAfter(se)) {
|
|
|
|
glxVertex3v(se->a);
|
|
|
|
glxVertex3v(se->b);
|
|
|
|
}
|
|
|
|
glEnd();
|
2008-05-19 09:23:49 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-05-22 10:28:28 +00:00
|
|
|
void glxDebugMesh(SMesh *m)
|
|
|
|
{
|
|
|
|
int i;
|
2008-05-23 10:05:07 +00:00
|
|
|
glLineWidth(1);
|
2008-05-22 10:28:28 +00:00
|
|
|
glPointSize(7);
|
2008-06-17 19:12:25 +00:00
|
|
|
glxDepthRangeOffset(1);
|
2008-05-22 10:28:28 +00:00
|
|
|
glxUnlockColor();
|
2008-06-23 08:48:19 +00:00
|
|
|
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
|
2009-09-17 07:32:36 +00:00
|
|
|
glxColorRGBa(RGB(0, 255, 0), 1.0);
|
2008-06-23 08:48:19 +00:00
|
|
|
glBegin(GL_TRIANGLES);
|
2008-05-22 10:28:28 +00:00
|
|
|
for(i = 0; i < m->l.n; i++) {
|
|
|
|
STriangle *t = &(m->l.elem[i]);
|
|
|
|
if(t->tag) continue;
|
|
|
|
|
2008-06-23 08:48:19 +00:00
|
|
|
glxVertex3v(t->a);
|
|
|
|
glxVertex3v(t->b);
|
|
|
|
glxVertex3v(t->c);
|
2008-05-22 10:28:28 +00:00
|
|
|
}
|
2008-06-23 08:48:19 +00:00
|
|
|
glEnd();
|
2008-06-17 19:12:25 +00:00
|
|
|
glxDepthRangeOffset(0);
|
2008-06-23 08:48:19 +00:00
|
|
|
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
|
2008-05-22 10:28:28 +00:00
|
|
|
}
|
|
|
|
|
2008-05-19 09:23:49 +00:00
|
|
|
void glxMarkPolygonNormal(SPolygon *p)
|
|
|
|
{
|
2008-06-01 08:45:11 +00:00
|
|
|
Vector tail = Vector::From(0, 0, 0);
|
2008-05-05 09:47:23 +00:00
|
|
|
int i, j, cnt = 0;
|
|
|
|
// Choose some reasonable center point.
|
|
|
|
for(i = 0; i < p->l.n; i++) {
|
|
|
|
SContour *sc = &(p->l.elem[i]);
|
|
|
|
for(j = 0; j < (sc->l.n-1); j++) {
|
|
|
|
SPoint *sp = &(sc->l.elem[j]);
|
|
|
|
tail = tail.Plus(sp->p);
|
|
|
|
cnt++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(cnt == 0) return;
|
|
|
|
tail = tail.ScaledBy(1.0/cnt);
|
|
|
|
|
|
|
|
Vector gn = SS.GW.projRight.Cross(SS.GW.projUp);
|
|
|
|
Vector tip = tail.Plus((p->normal).WithMagnitude(40/SS.GW.scale));
|
|
|
|
Vector arrow = (p->normal).WithMagnitude(15/SS.GW.scale);
|
|
|
|
|
|
|
|
glColor3d(1, 1, 0);
|
|
|
|
glBegin(GL_LINES);
|
|
|
|
glxVertex3v(tail);
|
|
|
|
glxVertex3v(tip);
|
|
|
|
glxVertex3v(tip);
|
|
|
|
glxVertex3v(tip.Minus(arrow.RotatedAbout(gn, 0.6)));
|
|
|
|
glxVertex3v(tip);
|
|
|
|
glxVertex3v(tip.Minus(arrow.RotatedAbout(gn, -0.6)));
|
|
|
|
glEnd();
|
|
|
|
glEnable(GL_LIGHTING);
|
|
|
|
}
|
|
|
|
|
2010-05-03 05:04:42 +00:00
|
|
|
void glxDepthRangeOffset(int units)
|
|
|
|
{
|
2008-06-17 19:12:25 +00:00
|
|
|
if(!DepthOffsetLocked) {
|
|
|
|
// The size of this step depends on the resolution of the Z buffer; for
|
|
|
|
// a 16-bit buffer, this should be fine.
|
|
|
|
double d = units/60000.0;
|
|
|
|
glDepthRange(0.1-d, 1-d);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-05-03 05:04:42 +00:00
|
|
|
void glxDepthRangeLockToFront(bool yes)
|
|
|
|
{
|
2008-06-17 19:12:25 +00:00
|
|
|
if(yes) {
|
|
|
|
DepthOffsetLocked = true;
|
|
|
|
glDepthRange(0, 0);
|
|
|
|
} else {
|
|
|
|
DepthOffsetLocked = false;
|
|
|
|
glxDepthRangeOffset(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-05-03 05:04:42 +00:00
|
|
|
void glxCreateBitmapFont(void)
|
|
|
|
{
|
2010-05-09 01:20:02 +00:00
|
|
|
// Place the font in our texture in a two-dimensional grid; 1d would
|
|
|
|
// be simpler, but long skinny textures (256*16 = 4096 pixels wide)
|
|
|
|
// won't work.
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
static uint8_t MappedTexture[4*16*64*16];
|
2010-05-09 01:20:02 +00:00
|
|
|
int a, i;
|
|
|
|
for(a = 0; a < 256; a++) {
|
|
|
|
int row = a / 4, col = a % 4;
|
|
|
|
|
|
|
|
for(i = 0; i < 16; i++) {
|
|
|
|
memcpy(MappedTexture + row*4*16*16 + col*16 + i*4*16,
|
|
|
|
FontTexture + a*16*16 + i*16,
|
|
|
|
16);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-04-26 07:52:49 +00:00
|
|
|
glBindTexture(GL_TEXTURE_2D, TEXTURE_BITMAP_FONT);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
|
|
|
|
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
|
|
|
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA,
|
2010-05-09 01:20:02 +00:00
|
|
|
16*4, 64*16,
|
2010-04-26 07:52:49 +00:00
|
|
|
0,
|
|
|
|
GL_ALPHA, GL_UNSIGNED_BYTE,
|
2010-05-09 01:20:02 +00:00
|
|
|
MappedTexture);
|
2010-04-26 07:52:49 +00:00
|
|
|
}
|
|
|
|
|
2010-05-03 05:04:42 +00:00
|
|
|
void glxBitmapCharQuad(char c, double x, double y)
|
|
|
|
{
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
uint8_t b = (uint8_t)c;
|
2010-05-09 01:20:02 +00:00
|
|
|
int w, h;
|
|
|
|
|
|
|
|
if(b & 0x80) {
|
|
|
|
// Special character, like a checkbox or a radio button
|
|
|
|
w = h = 16;
|
2010-05-09 18:25:23 +00:00
|
|
|
x -= 3;
|
2010-05-09 01:20:02 +00:00
|
|
|
} else {
|
|
|
|
// Normal character from our font
|
|
|
|
w = SS.TW.CHAR_WIDTH,
|
2010-04-26 07:52:49 +00:00
|
|
|
h = SS.TW.CHAR_HEIGHT;
|
2010-05-09 01:20:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if(b != ' ' && b != 0) {
|
|
|
|
int row = b / 4, col = b % 4;
|
|
|
|
double s0 = col/4.0,
|
|
|
|
s1 = (col+1)/4.0,
|
|
|
|
t0 = row/64.0,
|
|
|
|
t1 = t0 + (w/16.0)/64;
|
2010-04-26 07:52:49 +00:00
|
|
|
|
|
|
|
glTexCoord2d(s1, t0);
|
|
|
|
glVertex2d(x, y);
|
|
|
|
|
|
|
|
glTexCoord2d(s1, t1);
|
|
|
|
glVertex2d(x + w, y);
|
|
|
|
|
|
|
|
glTexCoord2d(s0, t1);
|
|
|
|
glVertex2d(x + w, y - h);
|
|
|
|
|
|
|
|
glTexCoord2d(s0, t0);
|
|
|
|
glVertex2d(x, y - h);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-26 18:58:35 +00:00
|
|
|
void glxBitmapText(const char *str, Vector p)
|
2010-05-03 05:04:42 +00:00
|
|
|
{
|
2010-04-26 07:52:49 +00:00
|
|
|
glEnable(GL_TEXTURE_2D);
|
|
|
|
glBegin(GL_QUADS);
|
|
|
|
while(*str) {
|
|
|
|
glxBitmapCharQuad(*str, p.x, p.y);
|
|
|
|
|
|
|
|
str++;
|
|
|
|
p.x += SS.TW.CHAR_WIDTH;
|
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
glDisable(GL_TEXTURE_2D);
|
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void glxDrawPixelsWithTexture(uint8_t *data, int w, int h)
|
2010-05-03 05:04:42 +00:00
|
|
|
{
|
|
|
|
#define MAX_DIM 32
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
static uint8_t Texture[MAX_DIM*MAX_DIM*3];
|
2010-05-03 05:04:42 +00:00
|
|
|
int i, j;
|
|
|
|
if(w > MAX_DIM || h > MAX_DIM) oops();
|
|
|
|
|
|
|
|
for(i = 0; i < w; i++) {
|
|
|
|
for(j = 0; j < h; j++) {
|
|
|
|
Texture[(j*MAX_DIM + i)*3 + 0] = data[(j*w + i)*3 + 0];
|
|
|
|
Texture[(j*MAX_DIM + i)*3 + 1] = data[(j*w + i)*3 + 1];
|
|
|
|
Texture[(j*MAX_DIM + i)*3 + 2] = data[(j*w + i)*3 + 2];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
glBindTexture(GL_TEXTURE_2D, TEXTURE_DRAW_PIXELS);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
|
|
|
|
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
|
|
|
|
|
|
|
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, MAX_DIM, MAX_DIM, 0,
|
|
|
|
GL_RGB, GL_UNSIGNED_BYTE, Texture);
|
|
|
|
|
|
|
|
glEnable(GL_TEXTURE_2D);
|
|
|
|
glBegin(GL_QUADS);
|
|
|
|
glTexCoord2d(0, 0);
|
|
|
|
glVertex2d(0, h);
|
|
|
|
|
|
|
|
glTexCoord2d(((double)w)/MAX_DIM, 0);
|
|
|
|
glVertex2d(w, h);
|
|
|
|
|
|
|
|
glTexCoord2d(((double)w)/MAX_DIM, ((double)h)/MAX_DIM);
|
|
|
|
glVertex2d(w, 0);
|
|
|
|
|
|
|
|
glTexCoord2d(0, ((double)h)/MAX_DIM);
|
|
|
|
glVertex2d(0, 0);
|
|
|
|
glEnd();
|
|
|
|
glDisable(GL_TEXTURE_2D);
|
|
|
|
}
|
|
|
|
|