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

Minor stuff

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-10-04 09:24:42 +02:00
parent 0442db1c53
commit 68708c54f7
12 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Nazara/OpenGLRenderer/OpenGLCommandBuffer.cpp
View File

@@ -165,7 +165,7 @@ namespace Nz
{
std::size_t attachmentIndex = colorIndexes[i];
Nz::Color color = command.clearValues[attachmentIndex].color;
Color color = command.clearValues[attachmentIndex].color;
std::array<GLfloat, 4> clearColor = { color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f };
const auto& attachmentInfo = command.renderpass->GetAttachment(attachmentIndex);
@@ -230,7 +230,7 @@ namespace Nz
{
context->ResetColorWriteMasks();
Nz::Color color = command.clearValues[colorAttachmentIndex].color;
Color color = command.clearValues[colorAttachmentIndex].color;
context->glClearColor(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
clearFields |= GL_COLOR_BUFFER_BIT;

2
src/Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.cpp
View File

@@ -14,7 +14,7 @@
namespace Nz
{
void OpenGLCommandBufferBuilder::BeginDebugRegion(const std::string_view& regionName, const Nz::Color& color)
void OpenGLCommandBufferBuilder::BeginDebugRegion(const std::string_view& regionName, const Color& color)
{
m_commandBuffer.BeginDebugRegion(regionName, color);
}

2
src/Nazara/Shader/Ast/SanitizeVisitor.cpp
View File

@@ -1468,7 +1468,7 @@ namespace Nz::ShaderAst
throw AstError{ "pow only works with primitive and vector types" };
if ((IsPrimitiveType(type) && std::get<PrimitiveType>(type) != PrimitiveType::Float32) ||
(IsVectorType(type) && std::get<VectorType>(type).type != PrimitiveType::Float32))
(IsVectorType(type) && std::get<VectorType>(type).type != PrimitiveType::Float32))
throw AstError{ "pow only works with floating-point primitive or vectors" };
node.cachedExpressionType = type;

2
src/Nazara/Shader/ShaderLangParser.cpp
View File

@@ -740,7 +740,7 @@ namespace Nz::ShaderLang
break;
default:
break;
throw UnexpectedToken{};
}
return statement;

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

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

2
src/Nazara/Utility/SimpleTextDrawer.cpp
View File

@@ -142,7 +142,7 @@ namespace Nz
m_lines.emplace_back(Line{Rectf::Zero(), 0});
}
bool SimpleTextDrawer::GenerateGlyph(Glyph& glyph, char32_t character, float outlineThickness, bool lineWrap, Nz::Color color, int renderOrder, int* advance) const
bool SimpleTextDrawer::GenerateGlyph(Glyph& glyph, char32_t character, float outlineThickness, bool lineWrap, Color color, int renderOrder, int* advance) const
{
const Font::Glyph& fontGlyph = m_font->GetGlyph(m_characterSize, m_style, outlineThickness, character);
if (fontGlyph.valid && fontGlyph.fauxOutlineThickness <= 0.f)