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

Rename internal C++ Color struct to Color32 to help differentiate it from Colorf.

Browse Source
This commit is contained in:
Alex Szpakowski
2019-09-14 23:13:40 -03:00
parent e824a1e26b
commit 9ab2a94037
17 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/SpriteBatch.cpp
+3 -3
View File
@@ -196,13 +196,13 @@ void SpriteBatch::setColor(const Colorf &c)
cclamped.b = std::min(std::max(c.b, 0.0f), 1.0f);
cclamped.a = std::min(std::max(c.a, 0.0f), 1.0f);
this->color = toColor(cclamped);
this->color = toColor32(cclamped);
}
void SpriteBatch::setColor()
{
color_active = false;
color = Color(255, 255, 255, 255);
color = Color32(255, 255, 255, 255);
}
Colorf SpriteBatch::getColor(bool &active) const
@@ -357,7 +357,7 @@ void SpriteBatch::draw(Graphics *gfx, const Matrix4 &m)
// If the attribute is one of the LOVE-defined ones, use the constant
// attribute index for it, otherwise query the index from the shader.
VertexAttribID builtinattrib;
BuiltinVertexAttribute builtinattrib;
if (vertex::getConstant(it.first.c_str(), builtinattrib))
attributeindex = (int) builtinattrib;
else if (Shader::current)