LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 08:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ensure the current color is set properly after drawing particlesystems and spritebatches

Browse Source
This commit is contained in:
Alex Szpakowski
2013-04-12 15:40:53 -03:00
parent 3edf033498
commit 6a27e1aa2f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/ParticleSystem.cpp
+4 -2
View File
@@ -514,8 +514,9 @@ void ParticleSystem::draw(float x, float y, float angle, float sx, float sy, flo
int numParticles = count();
if (numParticles == 0) return; // don't bother if there's nothing to do
Color curcolor = opengl::getCurrentColor();
glPushMatrix();
glPushAttrib(GL_CURRENT_BIT);
static Matrix t;
t.setTransformation(x, y, angle, sx, sy, ox, oy, kx, ky);
@@ -576,8 +577,9 @@ void ParticleSystem::draw(float x, float y, float angle, float sx, float sy, flo
glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_COLOR_ARRAY);
glPopAttrib();
glPopMatrix();
opengl::setCurrentColor(curcolor);
}
void ParticleSystem::update(float dt)
src/modules/graphics/opengl/SpriteBatch.cpp
+5
View File
@@ -218,6 +218,8 @@ void SpriteBatch::draw(float x, float y, float angle, float sx, float sy, float
VertexBuffer::Bind array_bind(*array_buf);
VertexBuffer::Bind element_bind(*element_buf->getVertexBuffer());
Color curcolor = opengl::getCurrentColor();
// Apply per-sprite color, if a color is set.
if (color)
{
@@ -237,7 +239,10 @@ void SpriteBatch::draw(float x, float y, float angle, float sx, float sy, float
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
if (color)
{
glDisableClientState(GL_COLOR_ARRAY);
opengl::setCurrentColor(curcolor);
}
glPopMatrix();
}