diff --git a/src/ShaderNode/DataModels/BufferField.cpp b/src/ShaderNode/DataModels/BufferField.cpp index 5bde16d76..3e1f96fcf 100644 --- a/src/ShaderNode/DataModels/BufferField.cpp +++ b/src/ShaderNode/DataModels/BufferField.cpp @@ -49,7 +49,7 @@ ShaderNode(graph) UpdatePreview(); } -nzsl::Ast::NodePtr BufferField::BuildNode(nzsl::Ast::ExpressionPtr* expressions, std::size_t count, std::size_t outputIndex) const +nzsl::Ast::NodePtr BufferField::BuildNode(nzsl::Ast::ExpressionPtr* /*expressions*/, std::size_t count, std::size_t outputIndex) const { assert(count == 0); assert(outputIndex == 0); diff --git a/src/ShaderNode/DataModels/Cast.hpp b/src/ShaderNode/DataModels/Cast.hpp index 1439f8cbd..de26fa21f 100644 --- a/src/ShaderNode/DataModels/Cast.hpp +++ b/src/ShaderNode/DataModels/Cast.hpp @@ -17,7 +17,7 @@ class CastVec : public ShaderNode CastVec(ShaderGraph& graph); ~CastVec() = default; - nzsl::Ast::NodePtr BuildNode(nzsl::Ast::ExpressionPtr* expressions, std::size_t count, std::size_t outputIndex) const; + nzsl::Ast::NodePtr BuildNode(nzsl::Ast::ExpressionPtr* expressions, std::size_t count, std::size_t outputIndex) const override; void BuildNodeEdition(QFormLayout* layout) override; QString caption() const override; diff --git a/src/ShaderNode/DataModels/Discard.cpp b/src/ShaderNode/DataModels/Discard.cpp index 4910a9b96..4b36aade6 100644 --- a/src/ShaderNode/DataModels/Discard.cpp +++ b/src/ShaderNode/DataModels/Discard.cpp @@ -54,7 +54,7 @@ unsigned int Discard::nPorts(QtNodes::PortType portType) const return 0; } -std::shared_ptr Discard::outData(QtNodes::PortIndex port) +std::shared_ptr Discard::outData(QtNodes::PortIndex /*port*/) { return {}; } diff --git a/src/ShaderNode/DataModels/Discard.hpp b/src/ShaderNode/DataModels/Discard.hpp index e1f309df8..0f8cf183e 100644 --- a/src/ShaderNode/DataModels/Discard.hpp +++ b/src/ShaderNode/DataModels/Discard.hpp @@ -15,7 +15,7 @@ class Discard : public ShaderNode Discard(ShaderGraph& graph); nzsl::Ast::NodePtr BuildNode(nzsl::Ast::ExpressionPtr* expressions, std::size_t count, std::size_t outputIndex) const override; - int GetOutputOrder() const; + int GetOutputOrder() const override; QString caption() const override { return "Discard"; } QString name() const override { return "Discard"; } diff --git a/src/ShaderNode/DataModels/FloatValue.cpp b/src/ShaderNode/DataModels/FloatValue.cpp index a94b339ef..5349b62d3 100644 --- a/src/ShaderNode/DataModels/FloatValue.cpp +++ b/src/ShaderNode/DataModels/FloatValue.cpp @@ -89,7 +89,7 @@ void FloatValue::BuildNodeEdition(QFormLayout* layout) layout->addRow(tr("Value"), spinbox); } -nzsl::Ast::NodePtr FloatValue::BuildNode(nzsl::Ast::ExpressionPtr* expressions, std::size_t count, std::size_t outputIndex) const +nzsl::Ast::NodePtr FloatValue::BuildNode(nzsl::Ast::ExpressionPtr* /*expressions*/, std::size_t count, std::size_t outputIndex) const { assert(count == 0); assert(outputIndex == 0); diff --git a/src/ShaderNode/DataModels/Mat4BinOp.hpp b/src/ShaderNode/DataModels/Mat4BinOp.hpp index 7f4ab2942..05fb803ee 100644 --- a/src/ShaderNode/DataModels/Mat4BinOp.hpp +++ b/src/ShaderNode/DataModels/Mat4BinOp.hpp @@ -13,7 +13,7 @@ class Mat4BinOp : public ShaderNode Mat4BinOp(ShaderGraph& graph); ~Mat4BinOp() = default; - nzsl::Ast::NodePtr BuildNode(nzsl::Ast::ExpressionPtr* expressions, std::size_t count, std::size_t outputIndex) const; + nzsl::Ast::NodePtr BuildNode(nzsl::Ast::ExpressionPtr* expressions, std::size_t count, std::size_t outputIndex) const override; unsigned int nPorts(QtNodes::PortType portType) const override; diff --git a/src/ShaderNode/DataModels/TextureValue.cpp b/src/ShaderNode/DataModels/TextureValue.cpp index bffa786ef..a1e6e14b1 100644 --- a/src/ShaderNode/DataModels/TextureValue.cpp +++ b/src/ShaderNode/DataModels/TextureValue.cpp @@ -170,7 +170,7 @@ std::shared_ptr TextureValue::outData(QtNodes::PortIndex port return textureData; } -QString TextureValue::portCaption(QtNodes::PortType portType, QtNodes::PortIndex portIndex) const +QString TextureValue::portCaption(QtNodes::PortType portType, QtNodes::PortIndex /*portIndex*/) const { assert(portType == QtNodes::PortType::Out); @@ -181,7 +181,7 @@ QString TextureValue::portCaption(QtNodes::PortType portType, QtNodes::PortIndex return QString::fromStdString(textureEntry.name); } -bool TextureValue::portCaptionVisible(QtNodes::PortType portType, QtNodes::PortIndex portIndex) const +bool TextureValue::portCaptionVisible(QtNodes::PortType portType, QtNodes::PortIndex /*portIndex*/) const { switch (portType) { diff --git a/src/ShaderNode/DataModels/VecDecomposition.cpp b/src/ShaderNode/DataModels/VecDecomposition.cpp index a4fde827f..93da6acb6 100644 --- a/src/ShaderNode/DataModels/VecDecomposition.cpp +++ b/src/ShaderNode/DataModels/VecDecomposition.cpp @@ -63,7 +63,7 @@ unsigned int VecDecomposition::nPorts(QtNodes::PortType portType) const switch (portType) { case QtNodes::PortType::In: return 1; - case QtNodes::PortType::Out: return m_outputs.size(); + case QtNodes::PortType::Out: return static_cast(m_outputs.size()); default: break; diff --git a/src/ShaderNode/ShaderGraph.cpp b/src/ShaderNode/ShaderGraph.cpp index 4caf2085d..2fd5497dd 100644 --- a/src/ShaderNode/ShaderGraph.cpp +++ b/src/ShaderNode/ShaderGraph.cpp @@ -488,8 +488,8 @@ nzsl::Ast::ModulePtr ShaderGraph::ToModule() const const auto& structInfo = m_structs[buffer.structIndex]; auto& extVar = external->externalVars.emplace_back(); - extVar.bindingIndex = buffer.bindingIndex; - extVar.bindingSet = buffer.setIndex; + extVar.bindingIndex = Nz::SafeCast(buffer.bindingIndex); + extVar.bindingSet = Nz::SafeCast(buffer.setIndex); extVar.name = buffer.name; extVar.type = nzsl::Ast::ExpressionPtr{ nzsl::ShaderBuilder::Identifier(structInfo.name) }; } @@ -497,8 +497,8 @@ nzsl::Ast::ModulePtr ShaderGraph::ToModule() const for (const auto& texture : m_textures) { auto& extVar = external->externalVars.emplace_back(); - extVar.bindingIndex = texture.bindingIndex; - extVar.bindingSet = texture.setIndex; + extVar.bindingIndex = Nz::SafeCast(texture.bindingIndex); + extVar.bindingSet = Nz::SafeCast(texture.setIndex); extVar.name = texture.name; extVar.type = ToShaderExpressionType(texture.type); } diff --git a/src/ShaderNode/Widgets/BufferEditDialog.cpp b/src/ShaderNode/Widgets/BufferEditDialog.cpp index 83215fb04..8f8436a4a 100644 --- a/src/ShaderNode/Widgets/BufferEditDialog.cpp +++ b/src/ShaderNode/Widgets/BufferEditDialog.cpp @@ -52,7 +52,7 @@ BufferEditDialog(shaderGraph, parent) m_bindingIndex->setValue(int(buffer.bindingIndex)); m_setIndex->setValue(int(buffer.setIndex)); m_outputName->setText(QString::fromStdString(buffer.name)); - m_structList->setCurrentIndex(buffer.structIndex); + m_structList->setCurrentIndex(int(buffer.structIndex)); m_typeList->setCurrentIndex(int(buffer.type)); } diff --git a/tests/GraphicsTest/main.cpp b/tests/GraphicsTest/main.cpp index 2bf40d807..51ba0d417 100644 --- a/tests/GraphicsTest/main.cpp +++ b/tests/GraphicsTest/main.cpp @@ -95,7 +95,7 @@ int main() Nz::ElementRendererRegistry elementRegistry; Nz::ForwardFramePipeline framePipeline(elementRegistry); - std::size_t cameraIndex = framePipeline.RegisterViewer(&camera, 0); + [[maybe_unused]] std::size_t cameraIndex = framePipeline.RegisterViewer(&camera, 0); std::size_t worldInstanceIndex1 = framePipeline.RegisterWorldInstance(modelInstance); std::size_t worldInstanceIndex2 = framePipeline.RegisterWorldInstance(modelInstance2); framePipeline.RegisterRenderable(worldInstanceIndex1, Nz::FramePipeline::NoSkeletonInstance, &model, 0xFFFFFFFF, scissorBox); diff --git a/tests/UnitTests/Engine/Core/ParameterListTest.cpp b/tests/UnitTests/Engine/Core/ParameterListTest.cpp index 9cdf4c45e..77dc2f4ef 100644 --- a/tests/UnitTests/Engine/Core/ParameterListTest.cpp +++ b/tests/UnitTests/Engine/Core/ParameterListTest.cpp @@ -106,8 +106,8 @@ SCENARIO("ParameterList", "[CORE][PARAMETERLIST]") THEN("Conversion from bool to int should also work if strict mode is disabled") { - CHECK(parameterList.GetIntegerParameter("trueInt", false).GetValue() == trueInt); - CHECK(parameterList.GetIntegerParameter("falseInt", false).GetValue() == falseInt); + CHECK(parameterList.GetIntegerParameter("trueInt", false).GetValue() == +trueInt); + CHECK(parameterList.GetIntegerParameter("falseInt", false).GetValue() == +falseInt); } THEN("Conversion from double to int should also work if strict mode is disabled")