Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to a floating point co-ordinate system which better reflects the underlying APIs (Cairo and OpenGL). 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5736 4a71c877-e1ca-e34f-864e-861f7616d084
master
Freddie Witherden 2008-08-02 14:47:12 +00:00
parent eb01bc2b64
commit 81ba4bec25
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/betawidget/geom.h
View File

@ -12,8 +12,8 @@ typedef point size;
struct _point
{
int x;
int y;
float x;
float y;
};
/*

23
lib/betawidget/widget.c
View File

@ -193,6 +193,9 @@ void widgetInit(widget *self, const char *id)
// By default we need drawing
self->needsRedraw = true;
// Enabled by default
self->isEnabled = true;
// Also by default we need to be shown (hence are invisible)
self->isVisible = false;
@ -736,17 +739,17 @@ void widgetCompositeImpl(widget *self)
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, self->textureId);
glBegin(GL_QUADS);
glTexCoord2i(0, 0);
glVertex2i(0, 0);
glTexCoord2f(0, 0);
glVertex2f(0, 0);
glTexCoord2i(0, self->size.y);
glVertex2i(0, self->size.y);
glTexCoord2f(0, self->size.y);
glVertex2f(0, self->size.y);
glTexCoord2i(self->size.x, self->size.y);
glVertex2i(self->size.x, self->size.y);
glTexCoord2f(self->size.x, self->size.y);
glVertex2f(self->size.x, self->size.y);
glTexCoord2i(self->size.x, 0);
glVertex2i(self->size.x, 0);
glTexCoord2f(self->size.x, 0);
glVertex2f(self->size.x, 0);
glEnd();
// Now our children
@ -982,10 +985,10 @@ bool widgetPointMasked(widget *self, point loc)
const uint32_t *data = (uint32_t *) cairo_image_surface_get_data(surface);
// The 32-bit segment of data we are interested in
const uint32_t bits = data[loc.y * (stride / 4) + (loc.x / 32)];
const uint32_t bits = data[(int) loc.y * (stride / 4) + ((int) loc.x / 32)];
// Where in the 32-bit segment the pixel is located
const uint32_t pixelMask = 1 << (loc.x % 32);
const uint32_t pixelMask = 1 << ((int) loc.x % 32);
// Check to see if the pixel is set or not
if (bits & pixelMask)