sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core: Make Color constexpr

Browse Source
This commit is contained in:
SirLynix
2022-12-29 12:13:00 +01:00
parent 3d88746060
commit 9a553e5e9d
38 changed files with 227 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Utility/Formats/MD2Loader.cpp
View File

@@ -228,7 +228,7 @@ namespace Nz
if (auto colorPtr = vertexMapper.GetComponentPtr<Color>(VertexComponent::Color))
{
for (UInt32 v = 0; v < header.num_vertices; ++v)
*colorPtr++ = Color::White;
*colorPtr++ = Color::White();
}
vertexMapper.Unmap();

4
src/Nazara/Utility/Formats/MD5MeshLoader.cpp
View File

@@ -205,7 +205,7 @@ namespace Nz
if (auto colorPtr = vertexMapper.GetComponentPtr<Color>(VertexComponent::Color))
{
for (std::size_t j = 0; j < md5Mesh.vertices.size(); ++j)
*colorPtr++ = Color::White;
*colorPtr++ = Color::White();
}
vertexMapper.Unmap();
@@ -316,7 +316,7 @@ namespace Nz
if (auto colorPtr = vertexMapper.GetComponentPtr<Color>(VertexComponent::Color))
{
for (std::size_t j = 0; j < md5Mesh.vertices.size(); ++j)
*colorPtr++ = Color::White;
*colorPtr++ = Color::White();
}
vertexMapper.Unmap();

2
src/Nazara/Utility/Formats/OBJLoader.cpp
View File

@@ -313,7 +313,7 @@ namespace Nz
if (auto colorPtr = vertexMapper.GetComponentPtr<Color>(VertexComponent::Color))
{
for (UInt32 j = 0; j < vertexCount; ++j)
colorPtr[j] = Color::White;
colorPtr[j] = Color::White();
}
vertexMapper.Unmap();

4
src/Nazara/Utility/RichTextDrawer.cpp
View File

@@ -10,8 +10,8 @@
namespace Nz
{
RichTextDrawer::RichTextDrawer() :
m_defaultColor(Color::White),
m_defaultOutlineColor(Color::Black),
m_defaultColor(Color::White()),
m_defaultOutlineColor(Color::Black()),
m_defaultStyle(TextStyle_Regular),
m_glyphUpdated(false),
m_defaultCharacterSpacingOffset(0.f),