From 87cb72217ed69b8274851bf17407f7fa32d0c08d Mon Sep 17 00:00:00 2001 From: SirLynix Date: Tue, 28 Jun 2022 12:40:12 +0200 Subject: [PATCH] ShaderNode: Fix compilation --- src/ShaderNode/DataModels/BinOp.hpp | 10 +++---- src/ShaderNode/DataModels/BinOp.inl | 10 +++---- src/ShaderNode/DataModels/BoolValue.cpp | 4 +-- src/ShaderNode/DataModels/Cast.inl | 6 ++--- src/ShaderNode/DataModels/CompOp.hpp | 14 +++++----- src/ShaderNode/DataModels/CompOp.inl | 26 +++++++++---------- src/ShaderNode/DataModels/Discard.cpp | 2 +- src/ShaderNode/DataModels/FloatValue.cpp | 4 +-- src/ShaderNode/DataModels/Mat4VecMul.cpp | 10 +++---- src/ShaderNode/DataModels/SampleTexture.cpp | 6 ++--- src/ShaderNode/DataModels/TextureValue.cpp | 2 +- src/ShaderNode/DataModels/VecComposition.inl | 4 +-- .../DataModels/VecDecomposition.cpp | 10 +++---- src/ShaderNode/DataModels/VecDot.cpp | 8 +++--- src/ShaderNode/DataModels/VecFloatMul.cpp | 8 +++--- src/ShaderNode/DataModels/VecValue.inl | 4 +-- src/ShaderNode/DataTypes/BoolData.inl | 2 +- src/ShaderNode/DataTypes/FloatData.inl | 2 +- src/ShaderNode/DataTypes/TextureData.inl | 2 +- src/ShaderNode/DataTypes/VecData.inl | 2 +- src/ShaderNode/Previews/PreviewValues.cpp | 20 +++++++------- src/ShaderNode/Previews/PreviewValues.hpp | 14 +++++----- src/ShaderNode/Previews/PreviewValues.inl | 4 +-- src/ShaderNode/Previews/QuadPreview.cpp | 4 +-- 24 files changed, 89 insertions(+), 89 deletions(-) diff --git a/src/ShaderNode/DataModels/BinOp.hpp b/src/ShaderNode/DataModels/BinOp.hpp index ce4576f9f..3009b47fc 100644 --- a/src/ShaderNode/DataModels/BinOp.hpp +++ b/src/ShaderNode/DataModels/BinOp.hpp @@ -33,7 +33,7 @@ class BinOp : public ShaderNode QString validationMessage() const override; private: - virtual void ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) = 0; + virtual void ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) = 0; bool ComputePreview(QPixmap& pixmap) override; void UpdateOutput(); @@ -50,7 +50,7 @@ class BinAdd : public BinOp public: using BinOp::BinOp; - void ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) override; + void ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) override; QString GetOperationString() const final; }; @@ -60,7 +60,7 @@ class BinMul : public BinOp public: using BinOp::BinOp; - void ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) override; + void ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) override; QString GetOperationString() const final; }; @@ -70,7 +70,7 @@ class BinSub : public BinOp public: using BinOp::BinOp; - void ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) override; + void ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) override; QString GetOperationString() const final; }; @@ -80,7 +80,7 @@ class BinDiv : public BinOp public: using BinOp::BinOp; - void ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) override; + void ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) override; QString GetOperationString() const final; }; diff --git a/src/ShaderNode/DataModels/BinOp.inl b/src/ShaderNode/DataModels/BinOp.inl index 33fa64a99..18181aabc 100644 --- a/src/ShaderNode/DataModels/BinOp.inl +++ b/src/ShaderNode/DataModels/BinOp.inl @@ -154,7 +154,7 @@ void BinOp::UpdateOutput() m_output = std::make_shared(); m_output->preview = PreviewValues(1, 1); - m_output->preview.Fill(nzsl::Vector4f(0.f, 0.f, 0.f, 0.f)); + m_output->preview.Fill(nzsl::Vector4f32(0.f, 0.f, 0.f, 0.f)); return; } @@ -186,7 +186,7 @@ void BinOp::UpdateOutput() } template -void BinAdd::ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) +void BinAdd::ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) { for (std::size_t i = 0; i < pixelCount; ++i) output[i] = left[i] + right[i]; @@ -199,7 +199,7 @@ QString BinAdd::GetOperationString() const } template -void BinMul::ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) +void BinMul::ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) { for (std::size_t i = 0; i < pixelCount; ++i) output[i] = left[i] * right[i]; @@ -212,7 +212,7 @@ QString BinMul::GetOperationString() const } template -void BinSub::ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) +void BinSub::ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) { for (std::size_t i = 0; i < pixelCount; ++i) output[i] = left[i] - right[i]; @@ -225,7 +225,7 @@ QString BinSub::GetOperationString() const } template -void BinDiv::ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) +void BinDiv::ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) { for (std::size_t i = 0; i < pixelCount; ++i) output[i] = left[i] / right[i]; diff --git a/src/ShaderNode/DataModels/BoolValue.cpp b/src/ShaderNode/DataModels/BoolValue.cpp index e1ee4f362..ae4263819 100644 --- a/src/ShaderNode/DataModels/BoolValue.cpp +++ b/src/ShaderNode/DataModels/BoolValue.cpp @@ -53,7 +53,7 @@ std::shared_ptr BoolValue::outData(QtNodes::PortIndex port) float c = (m_value) ? 1.f : 0.f; auto out = std::make_shared(); - out->preview(0, 0) = nzsl::Vector4f(c, c, c, 1.f); + out->preview(0, 0) = nzsl::Vector4f32(c, c, c, 1.f); return out; } @@ -94,7 +94,7 @@ nzsl::Ast::NodePtr BoolValue::BuildNode(nzsl::Ast::ExpressionPtr* /*expressions* assert(count == 0); assert(outputIndex == 0); - return nzsl::ShaderBuilder::Constant(m_value); + return nzsl::ShaderBuilder::ConstantValue(m_value); } bool BoolValue::ComputePreview(QPixmap& pixmap) diff --git a/src/ShaderNode/DataModels/Cast.inl b/src/ShaderNode/DataModels/Cast.inl index 5c07d701e..49fd1aba1 100644 --- a/src/ShaderNode/DataModels/Cast.inl +++ b/src/ShaderNode/DataModels/Cast.inl @@ -33,7 +33,7 @@ nzsl::Ast::NodePtr CastVec::BuildNode(nzsl::Ast::ExpressionPtr std::vector params; params.emplace_back(std::move(expressions[0])); for (std::size_t i = 0; i < overflowComponentCount; ++i) - params.emplace_back(nzsl::ShaderBuilder::Constant(m_overflowComponents[i])); + params.emplace_back(nzsl::ShaderBuilder::ConstantValue(m_overflowComponents[i])); return nzsl::ShaderBuilder::Cast(nzsl::Ast::ExpressionType{ nzsl::Ast::VectorType{ ToComponentCount, nzsl::Ast::PrimitiveType::Float32 } }, std::move(params)); } @@ -187,7 +187,7 @@ void CastVec::UpdateOutput() if (!m_input) { m_output->preview = PreviewValues(1, 1); - m_output->preview(0, 0) = nzsl::Vector4f(0.f, 0.f, 0.f, 0.f); + m_output->preview(0, 0) = nzsl::Vector4f32(0.f, 0.f, 0.f, 0.f); return; } @@ -208,7 +208,7 @@ void CastVec::UpdateOutput() { for (std::size_t x = 0; x < inputWidth; ++x) { - nzsl::Vector4f color = input(x, y); + nzsl::Vector4f32 color = input(x, y); float* colorPtr = &color[0]; for (std::size_t i = 0; i < overflowComponentCount; ++i) diff --git a/src/ShaderNode/DataModels/CompOp.hpp b/src/ShaderNode/DataModels/CompOp.hpp index db9efd2f6..921e9a2de 100644 --- a/src/ShaderNode/DataModels/CompOp.hpp +++ b/src/ShaderNode/DataModels/CompOp.hpp @@ -34,7 +34,7 @@ class CompOp : public ShaderNode QString validationMessage() const override; private: - virtual void ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) = 0; + virtual void ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) = 0; bool ComputePreview(QPixmap& pixmap) override; void UpdateOutput(); @@ -51,7 +51,7 @@ class CompEq : public CompOp public: using CompOp::CompOp; - void ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) override; + void ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) override; QString GetOperationString() const final; }; @@ -61,7 +61,7 @@ class CompGe : public CompOp public: using CompOp::CompOp; - void ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) override; + void ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) override; QString GetOperationString() const final; }; @@ -71,7 +71,7 @@ class CompGt : public CompOp public: using CompOp::CompOp; - void ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) override; + void ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) override; QString GetOperationString() const final; }; @@ -81,7 +81,7 @@ class CompLe : public CompOp public: using CompOp::CompOp; - void ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) override; + void ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) override; QString GetOperationString() const final; }; @@ -91,7 +91,7 @@ class CompLt : public CompOp public: using CompOp::CompOp; - void ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) override; + void ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) override; QString GetOperationString() const final; }; @@ -101,7 +101,7 @@ class CompNe : public CompOp public: using CompOp::CompOp; - void ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) override; + void ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) override; QString GetOperationString() const final; }; diff --git a/src/ShaderNode/DataModels/CompOp.inl b/src/ShaderNode/DataModels/CompOp.inl index 07ba38ea1..c05822b19 100644 --- a/src/ShaderNode/DataModels/CompOp.inl +++ b/src/ShaderNode/DataModels/CompOp.inl @@ -166,7 +166,7 @@ void CompOp::UpdateOutput() { m_output = std::make_shared(); m_output->preview = PreviewValues(1, 1); - m_output->preview.Fill(nzsl::Vector4f(0.f, 0.f, 0.f, 0.f)); + m_output->preview.Fill(nzsl::Vector4f32(0.f, 0.f, 0.f, 0.f)); return; } @@ -195,12 +195,12 @@ void CompOp::UpdateOutput() } template -void CompEq::ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) +void CompEq::ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) { for (std::size_t i = 0; i < pixelCount; ++i) { float r = (left[i] == right[i]) ? 1.f : 0.f; - output[i] = nzsl::Vector4f(r, r, r, r); + output[i] = nzsl::Vector4f32(r, r, r, r); } } @@ -211,12 +211,12 @@ QString CompEq::GetOperationString() const } template -void CompGe::ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) +void CompGe::ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) { for (std::size_t i = 0; i < pixelCount; ++i) { float r = (left[i][0] >= right[i][0]) ? 1.f : 0.f; - output[i] = nzsl::Vector4f(r, r, r, r); + output[i] = nzsl::Vector4f32(r, r, r, r); } } @@ -227,12 +227,12 @@ QString CompGe::GetOperationString() const } template -void CompGt::ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) +void CompGt::ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) { for (std::size_t i = 0; i < pixelCount; ++i) { float r = (left[i][0] > right[i][0]) ? 1.f : 0.f; - output[i] = nzsl::Vector4f(r, r, r, r); + output[i] = nzsl::Vector4f32(r, r, r, r); } } @@ -243,12 +243,12 @@ QString CompGt::GetOperationString() const } template -void CompLe::ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) +void CompLe::ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) { for (std::size_t i = 0; i < pixelCount; ++i) { float r = (left[i][0] <= right[i][0]) ? 1.f : 0.f; - output[i] = nzsl::Vector4f(r, r, r, r); + output[i] = nzsl::Vector4f32(r, r, r, r); } } @@ -259,12 +259,12 @@ QString CompLe::GetOperationString() const } template -void CompLt::ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) +void CompLt::ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) { for (std::size_t i = 0; i < pixelCount; ++i) { float r = (left[i][0] < right[i][0]) ? 1.f : 0.f; - output[i] = nzsl::Vector4f(r, r, r, r); + output[i] = nzsl::Vector4f32(r, r, r, r); } } @@ -275,12 +275,12 @@ QString CompLt::GetOperationString() const } template -void CompNe::ApplyOp(const nzsl::Vector4f* left, const nzsl::Vector4f* right, nzsl::Vector4f* output, std::size_t pixelCount) +void CompNe::ApplyOp(const nzsl::Vector4f32* left, const nzsl::Vector4f32* right, nzsl::Vector4f32* output, std::size_t pixelCount) { for (std::size_t i = 0; i < pixelCount; ++i) { float r = (left[i] != right[i]) ? 1.f : 0.f; - output[i] = nzsl::Vector4f(r, r, r, r); + output[i] = nzsl::Vector4f32(r, r, r, r); } } diff --git a/src/ShaderNode/DataModels/Discard.cpp b/src/ShaderNode/DataModels/Discard.cpp index 0f22f24a8..724a64e04 100644 --- a/src/ShaderNode/DataModels/Discard.cpp +++ b/src/ShaderNode/DataModels/Discard.cpp @@ -23,7 +23,7 @@ nzsl::Ast::NodePtr Discard::BuildNode(nzsl::Ast::ExpressionPtr* expressions, std using namespace nzsl; - auto condition = ShaderBuilder::Binary(nzsl::Ast::BinaryType::CompEq, std::move(expressions[0]), ShaderBuilder::Constant(true)); + auto condition = ShaderBuilder::Binary(nzsl::Ast::BinaryType::CompEq, std::move(expressions[0]), ShaderBuilder::ConstantValue(true)); return ShaderBuilder::Branch(std::move(condition), ShaderBuilder::Discard()); } diff --git a/src/ShaderNode/DataModels/FloatValue.cpp b/src/ShaderNode/DataModels/FloatValue.cpp index c29bde220..a94b339ef 100644 --- a/src/ShaderNode/DataModels/FloatValue.cpp +++ b/src/ShaderNode/DataModels/FloatValue.cpp @@ -50,7 +50,7 @@ std::shared_ptr FloatValue::outData(QtNodes::PortIndex port) assert(port == 0); auto out = std::make_shared(); - out->preview(0, 0) = nzsl::Vector4f(m_value, m_value, m_value, 1.f); + out->preview(0, 0) = nzsl::Vector4f32(m_value, m_value, m_value, 1.f); return out; } @@ -94,7 +94,7 @@ nzsl::Ast::NodePtr FloatValue::BuildNode(nzsl::Ast::ExpressionPtr* expressions, assert(count == 0); assert(outputIndex == 0); - return nzsl::ShaderBuilder::Constant(m_value); + return nzsl::ShaderBuilder::ConstantValue(m_value); } bool FloatValue::ComputePreview(QPixmap& pixmap) diff --git a/src/ShaderNode/DataModels/Mat4VecMul.cpp b/src/ShaderNode/DataModels/Mat4VecMul.cpp index 905ee24cb..b60a6455c 100644 --- a/src/ShaderNode/DataModels/Mat4VecMul.cpp +++ b/src/ShaderNode/DataModels/Mat4VecMul.cpp @@ -148,13 +148,13 @@ void Mat4VecMul::UpdateOutput() { m_output = std::make_shared(4); m_output->preview = PreviewValues(1, 1); - m_output->preview.Fill(nzsl::Vector4f(0.f, 0.f, 0.f, 0.f)); + m_output->preview.Fill(nzsl::Vector4f32(0.f, 0.f, 0.f, 0.f)); return; } m_output = std::make_shared(4); m_output->preview = PreviewValues(1, 1); - m_output->preview.Fill(nzsl::Vector4f(0.f, 0.f, 0.f, 0.f)); + m_output->preview.Fill(nzsl::Vector4f32(0.f, 0.f, 0.f, 0.f)); /*m_output = std::make_shared(m_rhs->componentCount); @@ -174,9 +174,9 @@ void Mat4VecMul::UpdateOutput() m_output->preview = PreviewValues(maxWidth, maxHeight); - const nzsl::Vector4f* left = leftResized.GetData(); - const nzsl::Vector4f* right = rightPreview.GetData(); - nzsl::Vector4f* output = m_output->preview.GetData(); + const nzsl::Vector4f32* left = leftResized.GetData(); + const nzsl::Vector4f32* right = rightPreview.GetData(); + nzsl::Vector4f32* output = m_output->preview.GetData(); std::size_t pixelCount = maxWidth * maxHeight; for (std::size_t i = 0; i < pixelCount; ++i) diff --git a/src/ShaderNode/DataModels/SampleTexture.cpp b/src/ShaderNode/DataModels/SampleTexture.cpp index fe467cbfa..8b89764ac 100644 --- a/src/ShaderNode/DataModels/SampleTexture.cpp +++ b/src/ShaderNode/DataModels/SampleTexture.cpp @@ -28,7 +28,7 @@ void SampleTexture::UpdateOutput() if (!m_texture || !m_uv) { output = PreviewValues(1, 1); - output.Fill(nzsl::Vector4f(0.f, 0.f, 0.f, 0.f)); + output.Fill(nzsl::Vector4f32(0.f, 0.f, 0.f, 0.f)); return; } @@ -48,12 +48,12 @@ void SampleTexture::UpdateOutput() { for (std::size_t x = 0; x < uvWidth; ++x) { - nzsl::Vector4f uvValue = uv(x, y); + nzsl::Vector4f32 uvValue = uv(x, y); if (textureWidth > 0 && textureHeight > 0) output(x, y) = texturePreview.Sample(uvValue.x(), uvValue.y()); else - output(x, y) = nzsl::Vector4f(0.f, 0.f, 0.f, 1.f); + output(x, y) = nzsl::Vector4f32(0.f, 0.f, 0.f, 1.f); } } diff --git a/src/ShaderNode/DataModels/TextureValue.cpp b/src/ShaderNode/DataModels/TextureValue.cpp index 72ca51550..5e55e3515 100644 --- a/src/ShaderNode/DataModels/TextureValue.cpp +++ b/src/ShaderNode/DataModels/TextureValue.cpp @@ -160,7 +160,7 @@ std::shared_ptr TextureValue::outData(QtNodes::PortIndex port { QColor pixelColor = previewImage.pixelColor(int(x), int(y)); - textureData->preview(x, y) = nzsl::Vector4f(pixelColor.redF(), pixelColor.greenF(), pixelColor.blueF(), pixelColor.alphaF()); + textureData->preview(x, y) = nzsl::Vector4f32(pixelColor.redF(), pixelColor.greenF(), pixelColor.blueF(), pixelColor.alphaF()); } } diff --git a/src/ShaderNode/DataModels/VecComposition.inl b/src/ShaderNode/DataModels/VecComposition.inl index 308296991..7983b881e 100644 --- a/src/ShaderNode/DataModels/VecComposition.inl +++ b/src/ShaderNode/DataModels/VecComposition.inl @@ -147,7 +147,7 @@ void VecComposition::UpdateOutput() if (validationState() != QtNodes::NodeValidationState::Valid) { m_output->preview = PreviewValues(1, 1); - m_output->preview(0, 0) = nzsl::Vector4f(0.f, 0.f, 0.f, 0.f); + m_output->preview(0, 0) = nzsl::Vector4f32(0.f, 0.f, 0.f, 0.f); return; } @@ -177,7 +177,7 @@ void VecComposition::UpdateOutput() { for (std::size_t x = 0; x < maxInputWidth; ++x) { - nzsl::Vector4f color(0.f, 0.f, 0.f, 1.f); + nzsl::Vector4f32 color(0.f, 0.f, 0.f, 1.f); for (std::size_t i = 0; i < ComponentCount; ++i) color[i] = previewResized[i](x, y)[0]; diff --git a/src/ShaderNode/DataModels/VecDecomposition.cpp b/src/ShaderNode/DataModels/VecDecomposition.cpp index 0fedb26da..a4fde827f 100644 --- a/src/ShaderNode/DataModels/VecDecomposition.cpp +++ b/src/ShaderNode/DataModels/VecDecomposition.cpp @@ -139,7 +139,7 @@ void VecDecomposition::UpdateOutputs() { auto dummy = std::make_shared(); dummy->preview = PreviewValues(1, 1); - dummy->preview.Fill(nzsl::Vector4f(0.f, 0.f, 0.f, 0.f)); + dummy->preview.Fill(nzsl::Vector4f32(0.f, 0.f, 0.f, 0.f)); m_outputs.fill(dummy); return; @@ -154,13 +154,13 @@ void VecDecomposition::UpdateOutputs() m_outputs[i] = std::make_shared(); m_outputs[i]->preview = PreviewValues(previewWidth, previewHeight); - const nzsl::Vector4f* inputData = m_input->preview.GetData(); - nzsl::Vector4f* outputData = m_outputs[i]->preview.GetData(); + const nzsl::Vector4f32* inputData = m_input->preview.GetData(); + nzsl::Vector4f32* outputData = m_outputs[i]->preview.GetData(); for (std::size_t j = 0; j < pixelCount; ++j) { - const nzsl::Vector4f& input = *inputData++; + const nzsl::Vector4f32& input = *inputData++; - *outputData++ = nzsl::Vector4f(input[i], input[i], input[i], input[i]); + *outputData++ = nzsl::Vector4f32(input[i], input[i], input[i], input[i]); } Q_EMIT dataUpdated(i); diff --git a/src/ShaderNode/DataModels/VecDot.cpp b/src/ShaderNode/DataModels/VecDot.cpp index 933e90bad..bb5206b9a 100644 --- a/src/ShaderNode/DataModels/VecDot.cpp +++ b/src/ShaderNode/DataModels/VecDot.cpp @@ -126,7 +126,7 @@ void VecDot::UpdateOutput() if (validationState() != QtNodes::NodeValidationState::Valid) { m_output->preview = PreviewValues(1, 1); - m_output->preview.Fill(nzsl::Vector4f(0.f, 0.f, 0.f, 0.f)); + m_output->preview.Fill(nzsl::Vector4f32(0.f, 0.f, 0.f, 0.f)); return; } @@ -146,9 +146,9 @@ void VecDot::UpdateOutput() m_output->preview = PreviewValues(maxWidth, maxHeight); - const nzsl::Vector4f* left = leftResized.GetData(); - const nzsl::Vector4f* right = rightPreview.GetData(); - nzsl::Vector4f* output = m_output->preview.GetData(); + const nzsl::Vector4f32* left = leftResized.GetData(); + const nzsl::Vector4f32* right = rightPreview.GetData(); + nzsl::Vector4f32* output = m_output->preview.GetData(); std::size_t pixelCount = maxWidth * maxHeight; for (std::size_t i = 0; i < pixelCount; ++i) diff --git a/src/ShaderNode/DataModels/VecFloatMul.cpp b/src/ShaderNode/DataModels/VecFloatMul.cpp index 3056fd86a..b2bde56e9 100644 --- a/src/ShaderNode/DataModels/VecFloatMul.cpp +++ b/src/ShaderNode/DataModels/VecFloatMul.cpp @@ -142,7 +142,7 @@ void VecFloatMul::UpdateOutput() { m_output = std::make_shared(4); m_output->preview = PreviewValues(1, 1); - m_output->preview.Fill(nzsl::Vector4f(0.f, 0.f, 0.f, 0.f)); + m_output->preview.Fill(nzsl::Vector4f32(0.f, 0.f, 0.f, 0.f)); return; } @@ -164,9 +164,9 @@ void VecFloatMul::UpdateOutput() m_output->preview = PreviewValues(maxWidth, maxHeight); - const nzsl::Vector4f* left = leftResized.GetData(); - const nzsl::Vector4f* right = rightPreview.GetData(); - nzsl::Vector4f* output = m_output->preview.GetData(); + const nzsl::Vector4f32* left = leftResized.GetData(); + const nzsl::Vector4f32* right = rightPreview.GetData(); + nzsl::Vector4f32* output = m_output->preview.GetData(); std::size_t pixelCount = maxWidth * maxHeight; for (std::size_t i = 0; i < pixelCount; ++i) diff --git a/src/ShaderNode/DataModels/VecValue.inl b/src/ShaderNode/DataModels/VecValue.inl index 84ffd59e3..835e961a1 100644 --- a/src/ShaderNode/DataModels/VecValue.inl +++ b/src/ShaderNode/DataModels/VecValue.inl @@ -66,7 +66,7 @@ std::shared_ptr VecValue::outData(QtNodes::Po values[i] = m_value[i]; out->preview = PreviewValues(1, 1); - out->preview(0, 0) = nzsl::Vector4f(values[0], values[1], values[2], values[3]); + out->preview(0, 0) = nzsl::Vector4f32(values[0], values[1], values[2], values[3]); return out; } @@ -128,7 +128,7 @@ nzsl::Ast::NodePtr VecValue::BuildNode(nzsl::Ast::ExpressionPtr* assert(count == 0); assert(outputIndex == 0); - return nzsl::ShaderBuilder::Constant(m_value); + return nzsl::ShaderBuilder::ConstantValue(m_value); } template diff --git a/src/ShaderNode/DataTypes/BoolData.inl b/src/ShaderNode/DataTypes/BoolData.inl index 1a736c1ba..3a0d5407b 100644 --- a/src/ShaderNode/DataTypes/BoolData.inl +++ b/src/ShaderNode/DataTypes/BoolData.inl @@ -3,5 +3,5 @@ inline BoolData::BoolData() : preview(1, 1) { - preview(0, 0) = nzsl::Vector4f(1.f, 1.f, 1.f, 0.f); + preview(0, 0) = nzsl::Vector4f32(1.f, 1.f, 1.f, 0.f); } diff --git a/src/ShaderNode/DataTypes/FloatData.inl b/src/ShaderNode/DataTypes/FloatData.inl index 0081ca894..ed31db762 100644 --- a/src/ShaderNode/DataTypes/FloatData.inl +++ b/src/ShaderNode/DataTypes/FloatData.inl @@ -3,5 +3,5 @@ inline FloatData::FloatData() : preview(1, 1) { - preview(0, 0) = nzsl::Vector4f(1.f, 1.f, 1.f, 0.f); + preview(0, 0) = nzsl::Vector4f32(1.f, 1.f, 1.f, 0.f); } diff --git a/src/ShaderNode/DataTypes/TextureData.inl b/src/ShaderNode/DataTypes/TextureData.inl index b9e923d41..c66dc1099 100644 --- a/src/ShaderNode/DataTypes/TextureData.inl +++ b/src/ShaderNode/DataTypes/TextureData.inl @@ -3,5 +3,5 @@ inline TextureData::TextureData() : preview(64, 64) { - preview.Fill(nzsl::Vector4f(1.f, 1.f, 1.f, 0.f)); + preview.Fill(nzsl::Vector4f32(1.f, 1.f, 1.f, 0.f)); } diff --git a/src/ShaderNode/DataTypes/VecData.inl b/src/ShaderNode/DataTypes/VecData.inl index a4d629fc2..b25e1568b 100644 --- a/src/ShaderNode/DataTypes/VecData.inl +++ b/src/ShaderNode/DataTypes/VecData.inl @@ -4,7 +4,7 @@ inline VecData::VecData(std::size_t ComponentCount) : componentCount(ComponentCount), preview(64, 64) { - preview.Fill(nzsl::Vector4f(1.f, 1.f, 1.f, 0.f)); + preview.Fill(nzsl::Vector4f32(1.f, 1.f, 1.f, 0.f)); } inline QtNodes::NodeDataType VecData::type() const diff --git a/src/ShaderNode/Previews/PreviewValues.cpp b/src/ShaderNode/Previews/PreviewValues.cpp index 5467d029d..6d90781c2 100644 --- a/src/ShaderNode/Previews/PreviewValues.cpp +++ b/src/ShaderNode/Previews/PreviewValues.cpp @@ -13,7 +13,7 @@ m_width(width) m_values.resize(m_width * m_height); //< RGBA } -void PreviewValues::Fill(const nzsl::Vector4f& value) +void PreviewValues::Fill(const nzsl::Vector4f32& value) { std::fill(m_values.begin(), m_values.end(), value); } @@ -24,7 +24,7 @@ QImage PreviewValues::GenerateImage() const Nz::UInt8* ptr = preview.bits(); - const nzsl::Vector4f* src = m_values.data(); + const nzsl::Vector4f32* src = m_values.data(); for (std::size_t i = 0; i < m_values.size(); ++i) { for (std::size_t y = 0; y < 4; ++y) @@ -52,7 +52,7 @@ PreviewValues PreviewValues::Resized(std::size_t newWidth, std::size_t newHeight return resizedPreview; } -nzsl::Vector4f PreviewValues::Sample(float u, float v) const +nzsl::Vector4f32 PreviewValues::Sample(float u, float v) const { // Bilinear filtering float x = std::clamp(u * m_width, 0.f, m_width - 1.f); @@ -64,7 +64,7 @@ nzsl::Vector4f PreviewValues::Sample(float u, float v) const float dX = x - iX; float dY = y - iY; - auto ColorAt = [&](std::size_t x, std::size_t y) -> nzsl::Vector4f + auto ColorAt = [&](std::size_t x, std::size_t y) -> nzsl::Vector4f32 { x = std::min(x, m_width - 1); y = std::min(y, m_height - 1); @@ -72,22 +72,22 @@ nzsl::Vector4f PreviewValues::Sample(float u, float v) const return m_values[y * m_width + x]; }; - nzsl::Vector4f d00 = ColorAt(iX, iY); - nzsl::Vector4f d10 = ColorAt(iX + 1, iY); - nzsl::Vector4f d01 = ColorAt(iX, iY + 1); - nzsl::Vector4f d11 = ColorAt(iX + 1, iY + 1); + nzsl::Vector4f32 d00 = ColorAt(iX, iY); + nzsl::Vector4f32 d10 = ColorAt(iX + 1, iY); + nzsl::Vector4f32 d01 = ColorAt(iX, iY + 1); + nzsl::Vector4f32 d11 = ColorAt(iX + 1, iY + 1); return Nz::Lerp(Nz::Lerp(d00, d10, dX), Nz::Lerp(d01, d11, dX), dY); } -nzsl::Vector4f& PreviewValues::operator()(std::size_t x, std::size_t y) +nzsl::Vector4f32& PreviewValues::operator()(std::size_t x, std::size_t y) { assert(x < m_width); assert(y < m_height); return m_values[y * m_width + x]; } -nzsl::Vector4f PreviewValues::operator()(std::size_t x, std::size_t y) const +nzsl::Vector4f32 PreviewValues::operator()(std::size_t x, std::size_t y) const { assert(x < m_width); assert(y < m_height); diff --git a/src/ShaderNode/Previews/PreviewValues.hpp b/src/ShaderNode/Previews/PreviewValues.hpp index a69ca68d6..84b322411 100644 --- a/src/ShaderNode/Previews/PreviewValues.hpp +++ b/src/ShaderNode/Previews/PreviewValues.hpp @@ -20,21 +20,21 @@ class PreviewValues PreviewValues(PreviewValues&&) = default; ~PreviewValues() = default; - void Fill(const nzsl::Vector4f& value); + void Fill(const nzsl::Vector4f32& value); QImage GenerateImage() const; - inline nzsl::Vector4f* GetData(); - inline const nzsl::Vector4f* GetData() const; + inline nzsl::Vector4f32* GetData(); + inline const nzsl::Vector4f32* GetData() const; inline std::size_t GetHeight() const; inline std::size_t GetWidth() const; PreviewValues Resized(std::size_t newWidth, std::size_t newHeight) const; - nzsl::Vector4f Sample(float u, float v) const; + nzsl::Vector4f32 Sample(float u, float v) const; - nzsl::Vector4f& operator()(std::size_t x, std::size_t y); - nzsl::Vector4f operator()(std::size_t x, std::size_t y) const; + nzsl::Vector4f32& operator()(std::size_t x, std::size_t y); + nzsl::Vector4f32 operator()(std::size_t x, std::size_t y) const; PreviewValues& operator=(const PreviewValues&) = default; PreviewValues& operator=(PreviewValues&&) = default; @@ -42,7 +42,7 @@ class PreviewValues private: std::size_t m_height; std::size_t m_width; - std::vector m_values; + std::vector m_values; }; #include diff --git a/src/ShaderNode/Previews/PreviewValues.inl b/src/ShaderNode/Previews/PreviewValues.inl index af243bb5c..b47b29bf2 100644 --- a/src/ShaderNode/Previews/PreviewValues.inl +++ b/src/ShaderNode/Previews/PreviewValues.inl @@ -1,11 +1,11 @@ #include -inline nzsl::Vector4f* PreviewValues::GetData() +inline nzsl::Vector4f32* PreviewValues::GetData() { return m_values.data(); } -inline const nzsl::Vector4f* PreviewValues::GetData() const +inline const nzsl::Vector4f32* PreviewValues::GetData() const { return m_values.data(); } diff --git a/src/ShaderNode/Previews/QuadPreview.cpp b/src/ShaderNode/Previews/QuadPreview.cpp index bae037857..8b252686d 100644 --- a/src/ShaderNode/Previews/QuadPreview.cpp +++ b/src/ShaderNode/Previews/QuadPreview.cpp @@ -6,7 +6,7 @@ PreviewValues QuadPreview::GetPreview(InputRole role, std::size_t roleIndex) con if (role != InputRole::TexCoord) { PreviewValues dummy(1, 1); - dummy(0, 0) = nzsl::Vector4f(0.f, 0.f, 0.f, 0.f); + dummy(0, 0) = nzsl::Vector4f32(0.f, 0.f, 0.f, 0.f); return dummy; } @@ -19,7 +19,7 @@ PreviewValues QuadPreview::GetPreview(InputRole role, std::size_t roleIndex) con for (std::size_t y = 0; y < uv.GetHeight(); ++y) { for (std::size_t x = 0; x < uv.GetWidth(); ++x) - uv(x, y) = nzsl::Vector4f(x * invWidth, y * invHeight, 0.f, 1.f); + uv(x, y) = nzsl::Vector4f32(x * invWidth, y * invHeight, 0.f, 1.f); } return uv;