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

Use glPushMatrix and glPopMatrix when compositing as opposed to manually restoring it. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6046 4a71c877-e1ca-e34f-864e-861f7616d084
master
Freddie Witherden 2008-09-18 21:56:02 +00:00
parent 22eacc8210
commit f499f08a49
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/betawidget/widget.c
View File

@ -1252,6 +1252,9 @@ void widgetCompositeImpl(widget *self)
return;
}
// Save the current model-view matrix
glPushMatrix();
// Translate such that (0,0) is the top-left of ourself
glTranslatef(self->offset.x, self->offset.y, 0.0f);
@ -1291,11 +1294,11 @@ void widgetCompositeImpl(widget *self)
widgetComposite(child);
}
// Restore the matrix
// Restore the model-view matrix
glPopMatrix();
// Restore the blend colour
glBlendColor(1.0f, 1.0f, 1.0f, blendColour[3]);
glRotatef(-self->rotate, 0.0f, 0.0f, 1.0f);
glScalef(1.0f / self->scale.x, 1.0f / self->scale.y, 1.0f);
glTranslatef(-self->offset.x, -self->offset.y, 0.0f);
}
void widgetEnableMask(widget *self)