mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2025-08-30 10:20:58 +00:00
remove last traces of GL_BLEND/glBlendFunc() manipulation
everything goes through RenderState now some calls are left in FTGL but properly invalidated afterwards
This commit is contained in:
parent
d3cbc181bd
commit
70b8e69402
13 changed files with 33 additions and 61 deletions
|
@ -265,15 +265,14 @@ void Bone::renderCollision(const RenderState& rs) const
|
|||
{
|
||||
if (!collisionMask.empty())
|
||||
{
|
||||
glPushAttrib(GL_ALL_ATTRIB_BITS);
|
||||
glPushMatrix();
|
||||
glBindTexture(GL_TEXTURE_2D, 0);
|
||||
RenderObject::lastTextureApplied = 0;
|
||||
|
||||
glLoadIdentity();
|
||||
core->setupRenderPositionAndScale();
|
||||
|
||||
glEnable(GL_BLEND);
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
rs.gpu.setBlend(BLEND_DEFAULT);
|
||||
|
||||
glColor4f(1,1,0,0.5);
|
||||
|
||||
|
@ -290,10 +289,7 @@ void Bone::renderCollision(const RenderState& rs) const
|
|||
glTranslatef(-collide.x, -collide.y, 0);
|
||||
}
|
||||
|
||||
|
||||
glDisable(GL_BLEND);
|
||||
glPopMatrix();
|
||||
glPopAttrib();
|
||||
}
|
||||
else
|
||||
CollideQuad::renderCollision(rs);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue