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

love.graphics.setColor no longer uses the main per-vertex color attribute. This lets it affect the color of ParticleSystems, and SpriteBatches and Meshes even when they use custom per-vertex colors.

Browse Source
This commit is contained in:
Alex Szpakowski
2015-06-21 11:20:26 -03:00
parent 42ae9c9585
commit c82ccbb89b
10 changed files with 21 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Polyline.cpp
+6 -10
View File
@@ -379,9 +379,8 @@ void Polyline::draw()
if (overdraw)
{
// prepare colors:
Color c = gl.getColor();
Color *colors = new Color[overdraw_vertex_count];
fill_color_array(colors, c);
fill_color_array(colors);
glEnableVertexAttribArray(ATTRIB_COLOR);
glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, colors);
@@ -393,10 +392,9 @@ void Polyline::draw()
gl.drawArrays(draw_mode, 0, (int) overdraw_vertex_count);
glDisableVertexAttribArray(ATTRIB_COLOR);
glVertexAttrib4f(ATTRIB_COLOR, 1.0f, 1.0f, 1.0f, 1.0f);
delete[] colors;
gl.setColor(c);
}
glDisableVertexAttribArray(ATTRIB_POS);
@@ -405,23 +403,21 @@ void Polyline::draw()
delete[] indices;
}
void Polyline::fill_color_array(Color *colors, const Color &c)
void Polyline::fill_color_array(Color *colors)
{
for (size_t i = 0; i < overdraw_vertex_count; ++i)
{
colors[i] = c;
// avoids branching. equiv to if (i%2 == 1) colors[i].a = 0;
colors[i].a *= GLubyte((i+1) % 2);
colors[i] = {255, 255, 255, GLubyte(255 * ((i+1) % 2))};
}
}
void NoneJoinPolyline::fill_color_array(Color *colors, const Color &c)
void NoneJoinPolyline::fill_color_array(Color *colors)
{
for (size_t i = 0; i < overdraw_vertex_count; ++i)
{
colors[i] = c;
// if (i % 4 == 1 || i % 4 == 2) colors[i].a = 0
colors[i].a *= GLubyte((i+1) % 4 < 2);
colors[i] = {255, 255, 255, GLubyte(255 * ((i+1) % 4 < 2))};
}
}