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

ShaderNodes: Use PreviewValues instead of QImage

This commit is contained in:
Jérôme Leclercq 2020-07-03 22:53:00 +02:00
parent 4f671873c1
commit 33d94c05f3
24 changed files with 314 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/ShaderNode/DataModels/Cast.inl
View File

@ -176,7 +176,7 @@ bool CastVec<ToComponentCount>::ComputePreview(QPixmap& pixmap)
if (!m_input) if (!m_input)
return false; return false;
pixmap = QPixmap::fromImage(m_output->preview); pixmap = QPixmap::fromImage(m_output->preview.GenerateImage());
return true; return true;
} }
@ -185,47 +185,38 @@ void CastVec<ToComponentCount>::UpdateOutput()
{ {
if (!m_input) if (!m_input)
{ {
m_output->preview = QImage(1, 1, QImage::Format_RGBA8888); m_output->preview = PreviewValues(1, 1);
m_output->preview.fill(QColor::fromRgb(0, 0, 0, 0)); m_output->preview(0, 0) = Nz::Vector4f::Zero();
return; return;
} }
const QImage& input = m_input->preview; const PreviewValues& input = m_input->preview;
int inputWidth = input.width(); std::size_t inputWidth = input.GetWidth();
int inputHeight = input.height(); std::size_t inputHeight = input.GetHeight();
QImage& output = m_output->preview; PreviewValues& output = m_output->preview;
output = QImage(inputWidth, inputHeight, QImage::Format_RGBA8888); output = PreviewValues(inputWidth, inputHeight);
std::size_t fromComponentCount = m_input->componentCount; std::size_t fromComponentCount = m_input->componentCount;
std::size_t commonComponents = std::min(fromComponentCount, ToComponentCount); std::size_t commonComponents = std::min(fromComponentCount, ToComponentCount);
std::size_t overflowComponentCount = (ToComponentCount > fromComponentCount) ? ToComponentCount - fromComponentCount : 0; std::size_t overflowComponentCount = (ToComponentCount > fromComponentCount) ? ToComponentCount - fromComponentCount : 0;
std::size_t voidComponents = 4 - overflowComponentCount - commonComponents; std::size_t voidComponents = 4 - overflowComponentCount - commonComponents;
std::array<std::uint8_t, 4> constants; for (std::size_t y = 0; y < inputHeight; ++y)
if (ToComponentCount > fromComponentCount)
{ {
for (std::size_t i = 0; i < overflowComponentCount; ++i) for (std::size_t x = 0; x < inputWidth; ++x)
constants[i] = static_cast<std::uint8_t>(std::clamp(int(m_overflowComponents[i] * 255), 0, 255)); {
} Nz::Vector4f color = input(x, y);
std::uint8_t* outputPtr = output.bits();
const std::uint8_t* inputPtr = input.constBits();
for (int y = 0; y < inputHeight; ++y)
{
for (int x = 0; x < inputWidth; ++x)
{
for (std::size_t i = 0; i < commonComponents; ++i)
*outputPtr++ = inputPtr[i];
float* colorPtr = &color.x;
for (std::size_t i = 0; i < overflowComponentCount; ++i) for (std::size_t i = 0; i < overflowComponentCount; ++i)
*outputPtr++ = constants[i]; *colorPtr++ = m_overflowComponents[i];
for (std::size_t i = 0; i < voidComponents; ++i) for (std::size_t i = 0; i < voidComponents; ++i)
*outputPtr++ = (i == voidComponents - 1) ? 255 : 0; *colorPtr++ = (i == voidComponents - 1) ? 1.f : 0.f;
inputPtr += 4; output(x, y) = color;
} }
} }

2
src/ShaderNode/DataModels/FloatValue.cpp
View File

@ -46,7 +46,7 @@ std::shared_ptr<QtNodes::NodeData> FloatValue::outData(QtNodes::PortIndex port)
assert(port == 0); assert(port == 0);
auto out = std::make_shared<FloatData>(); auto out = std::make_shared<FloatData>();
out->preview.fill(ToColor()); out->preview(0, 0) = Nz::Vector4f(m_value, m_value, m_value, 1.f);
return out; return out;
} }

4
src/ShaderNode/DataModels/InputValue.cpp
View File

@ -48,7 +48,7 @@ bool InputValue::ComputePreview(QPixmap& pixmap)
const auto& inputEntry = graph.GetInput(*m_currentInputIndex); const auto& inputEntry = graph.GetInput(*m_currentInputIndex);
const auto& preview = graph.GetPreviewModel(); const auto& preview = graph.GetPreviewModel();
pixmap = QPixmap::fromImage(preview.GetImage(inputEntry.role, inputEntry.roleIndex)); pixmap = QPixmap::fromImage(preview.GetPreview(inputEntry.role, inputEntry.roleIndex).GenerateImage());
return true; return true;
} }
@ -171,7 +171,7 @@ std::shared_ptr<QtNodes::NodeData> InputValue::outData(QtNodes::PortIndex port)
const auto& preview = graph.GetPreviewModel(); const auto& preview = graph.GetPreviewModel();
auto vecData = std::make_shared<VecData>(GetComponentCount(inputEntry.type)); auto vecData = std::make_shared<VecData>(GetComponentCount(inputEntry.type));
vecData->preview = preview.GetImage(inputEntry.role, inputEntry.roleIndex); vecData->preview = preview.GetPreview(inputEntry.role, inputEntry.roleIndex);
return vecData; return vecData;
} }

2
src/ShaderNode/DataModels/OutputValue.cpp
View File

@ -170,7 +170,7 @@ bool OutputValue::ComputePreview(QPixmap& pixmap)
if (!m_input) if (!m_input)
return false; return false;
pixmap = QPixmap::fromImage(m_input->preview); pixmap = QPixmap::fromImage(m_input->preview.GenerateImage());
return true; return true;
} }

52
src/ShaderNode/DataModels/SampleTexture.cpp
View File

@ -23,57 +23,37 @@ unsigned int SampleTexture::nPorts(QtNodes::PortType portType) const
void SampleTexture::UpdateOutput() void SampleTexture::UpdateOutput()
{ {
QImage& output = m_output->preview; PreviewValues& output = m_output->preview;
if (!m_texture || !m_uv) if (!m_texture || !m_uv)
{ {
output = QImage(1, 1, QImage::Format_RGBA8888); output = PreviewValues(1, 1);
output.fill(QColor::fromRgb(0, 0, 0, 0)); output.Fill(Nz::Vector4f::Zero());
return; return;
} }
const QImage& texturePreview = m_texture->preview; const PreviewValues& texturePreview = m_texture->preview;
int textureWidth = texturePreview.width(); std::size_t textureWidth = texturePreview.GetWidth();
int textureHeight = texturePreview.height(); std::size_t textureHeight = texturePreview.GetHeight();
const QImage& uv = m_uv->preview; const PreviewValues& uv = m_uv->preview;
int uvWidth = uv.width(); std::size_t uvWidth = uv.GetWidth();
int uvHeight = uv.height(); std::size_t uvHeight = uv.GetHeight();
output = QImage(uvWidth, uvHeight, QImage::Format_RGBA8888); output = PreviewValues(uvWidth, uvHeight);
std::uint8_t* outputPtr = output.bits(); for (std::size_t y = 0; y < uvHeight; ++y)
const std::uint8_t* uvPtr = uv.constBits();
const std::uint8_t* texturePtr = texturePreview.constBits();
for (int y = 0; y < uvHeight; ++y)
{ {
for (int x = 0; x < uvWidth; ++x) for (std::size_t x = 0; x < uvWidth; ++x)
{ {
float u = float(uvPtr[0]) / 255; Nz::Vector4f uvValue = uv(x, y);
float v = float(uvPtr[1]) / 255;
if (textureWidth > 0 && textureHeight > 0) if (textureWidth > 0 && textureHeight > 0)
{ output(x, y) = texturePreview.Sample(uvValue.x, uvValue.y);
int texX = std::clamp(int(u * textureWidth), 0, textureWidth - 1);
int texY = std::clamp(int(v * textureHeight), 0, textureHeight - 1);
int texPixel = (texY * textureWidth + texX) * 4;
*outputPtr++ = texturePtr[texPixel + 0];
*outputPtr++ = texturePtr[texPixel + 1];
*outputPtr++ = texturePtr[texPixel + 2];
*outputPtr++ = texturePtr[texPixel + 3];
}
else else
{ output(x, y) = Nz::Vector4f(0.f, 0.f, 0.f, 1.f);
*outputPtr++ = 0;
*outputPtr++ = 0;
*outputPtr++ = 0;
*outputPtr++ = 0xFF;
}
uvPtr += 4;
} }
} }
@ -87,7 +67,7 @@ bool SampleTexture::ComputePreview(QPixmap& pixmap)
if (!m_texture || !m_uv) if (!m_texture || !m_uv)
return false; return false;
pixmap = QPixmap::fromImage(m_output->preview); pixmap = QPixmap::fromImage(m_output->preview.GenerateImage());
return true; return true;
} }

13
src/ShaderNode/DataModels/TextureValue.cpp
View File

@ -158,7 +158,18 @@ std::shared_ptr<QtNodes::NodeData> TextureValue::outData(QtNodes::PortIndex port
assert(textureData); assert(textureData);
textureData->preview = textureEntry.preview; const QImage& previewImage = textureEntry.preview;
textureData->preview = PreviewValues(previewImage.width(), previewImage.height());
for (std::size_t y = 0; y < textureData->preview.GetHeight(); ++y)
{
for (std::size_t x = 0; x < textureData->preview.GetWidth(); ++x)
{
QColor pixelColor = previewImage.pixelColor(int(x), int(y));
textureData->preview(x, y) = Nz::Vector4f(pixelColor.redF(), pixelColor.greenF(), pixelColor.blueF(), pixelColor.alphaF());
}
}
return textureData; return textureData;
} }

46
src/ShaderNode/DataModels/VecBinOp.cpp
View File

@ -12,15 +12,10 @@ QString VecAdd::name() const
return name; return name;
} }
void VecAdd::ApplyOp(const std::uint8_t* left, const std::uint8_t* right, std::uint8_t* output, std::size_t pixelCount) void VecAdd::ApplyOp(const Nz::Vector4f* left, const Nz::Vector4f* right, Nz::Vector4f* output, std::size_t pixelCount)
{ {
for (std::size_t i = 0; i < pixelCount; ++i) for (std::size_t i = 0; i < pixelCount; ++i)
{ output[i] = left[i] + right[i];
unsigned int lValue = left[i];
unsigned int rValue = right[i];
output[i] = static_cast<std::uint8_t>(std::min(lValue + rValue, 255U));
}
} }
QString VecMul::caption() const QString VecMul::caption() const
@ -35,15 +30,10 @@ QString VecMul::name() const
return name; return name;
} }
void VecMul::ApplyOp(const std::uint8_t* left, const std::uint8_t* right, std::uint8_t* output, std::size_t pixelCount) void VecMul::ApplyOp(const Nz::Vector4f* left, const Nz::Vector4f* right, Nz::Vector4f* output, std::size_t pixelCount)
{ {
for (std::size_t i = 0; i < pixelCount; ++i) for (std::size_t i = 0; i < pixelCount; ++i)
{ output[i] = left[i] * right[i];
unsigned int lValue = left[i];
unsigned int rValue = right[i];
output[i] = static_cast<std::uint8_t>(lValue * rValue / 255);
}
} }
QString VecSub::caption() const QString VecSub::caption() const
@ -59,17 +49,10 @@ QString VecSub::name() const
return name; return name;
} }
void VecSub::ApplyOp(const std::uint8_t* left, const std::uint8_t* right, std::uint8_t* output, std::size_t pixelCount) void VecSub::ApplyOp(const Nz::Vector4f* left, const Nz::Vector4f* right, Nz::Vector4f* output, std::size_t pixelCount)
{ {
for (std::size_t i = 0; i < pixelCount; ++i) for (std::size_t i = 0; i < pixelCount; ++i)
{ output[i] = left[i] - right[i];
unsigned int lValue = left[i];
unsigned int rValue = right[i];
unsigned int sub = (lValue >= rValue) ? lValue - rValue : 0u;
output[i] = static_cast<std::uint8_t>(sub);
}
} }
QString VecDiv::caption() const QString VecDiv::caption() const
@ -85,21 +68,8 @@ QString VecDiv::name() const
return name; return name;
} }
void VecDiv::ApplyOp(const std::uint8_t* left, const std::uint8_t* right, std::uint8_t* output, std::size_t pixelCount) void VecDiv::ApplyOp(const Nz::Vector4f* left, const Nz::Vector4f* right, Nz::Vector4f* output, std::size_t pixelCount)
{ {
for (std::size_t i = 0; i < pixelCount; ++i) for (std::size_t i = 0; i < pixelCount; ++i)
{ output[i] = left[i] / right[i];
unsigned int lValue = left[i];
unsigned int rValue = right[i];
unsigned res;
if (rValue != 0)
res = lValue / rValue;
else if (lValue != 0)
res = 0xFF; //< positive / 0 = +inf, which we clamp to 0xFF
else
res = 0; //< 0 / 0 = NaN, which we set to zero
output[i] = static_cast<std::uint8_t>(res);
}
} }

10
src/ShaderNode/DataModels/VecBinOp.hpp
View File

@ -27,7 +27,7 @@ class VecBinOp : public ShaderNode
QString validationMessage() const override; QString validationMessage() const override;
private: private:
virtual void ApplyOp(const std::uint8_t* left, const std::uint8_t* right, std::uint8_t* output, std::size_t pixelCount) = 0; virtual void ApplyOp(const Nz::Vector4f* left, const Nz::Vector4f* right, Nz::Vector4f* output, std::size_t pixelCount) = 0;
bool ComputePreview(QPixmap& pixmap) override; bool ComputePreview(QPixmap& pixmap) override;
void UpdateOutput(); void UpdateOutput();
@ -45,7 +45,7 @@ class VecAdd : public VecBinOp<Nz::ShaderNodes::BinaryType::Add>
QString caption() const override; QString caption() const override;
QString name() const override; QString name() const override;
void ApplyOp(const std::uint8_t* left, const std::uint8_t* right, std::uint8_t* output, std::size_t pixelCount) override; void ApplyOp(const Nz::Vector4f* left, const Nz::Vector4f* right, Nz::Vector4f* output, std::size_t pixelCount) override;
}; };
class VecMul : public VecBinOp<Nz::ShaderNodes::BinaryType::Multiply> class VecMul : public VecBinOp<Nz::ShaderNodes::BinaryType::Multiply>
@ -56,7 +56,7 @@ class VecMul : public VecBinOp<Nz::ShaderNodes::BinaryType::Multiply>
QString caption() const override; QString caption() const override;
QString name() const override; QString name() const override;
void ApplyOp(const std::uint8_t* left, const std::uint8_t* right, std::uint8_t* output, std::size_t pixelCount) override; void ApplyOp(const Nz::Vector4f* left, const Nz::Vector4f* right, Nz::Vector4f* output, std::size_t pixelCount) override;
}; };
class VecSub : public VecBinOp<Nz::ShaderNodes::BinaryType::Substract> class VecSub : public VecBinOp<Nz::ShaderNodes::BinaryType::Substract>
@ -67,7 +67,7 @@ class VecSub : public VecBinOp<Nz::ShaderNodes::BinaryType::Substract>
QString caption() const override; QString caption() const override;
QString name() const override; QString name() const override;
void ApplyOp(const std::uint8_t* left, const std::uint8_t* right, std::uint8_t* output, std::size_t pixelCount) override; void ApplyOp(const Nz::Vector4f* left, const Nz::Vector4f* right, Nz::Vector4f* output, std::size_t pixelCount) override;
}; };
class VecDiv : public VecBinOp<Nz::ShaderNodes::BinaryType::Divide> class VecDiv : public VecBinOp<Nz::ShaderNodes::BinaryType::Divide>
@ -78,7 +78,7 @@ class VecDiv : public VecBinOp<Nz::ShaderNodes::BinaryType::Divide>
QString caption() const override; QString caption() const override;
QString name() const override; QString name() const override;
void ApplyOp(const std::uint8_t* left, const std::uint8_t* right, std::uint8_t* output, std::size_t pixelCount) override; void ApplyOp(const Nz::Vector4f* left, const Nz::Vector4f* right, Nz::Vector4f* output, std::size_t pixelCount) override;
}; };
#include <ShaderNode/DataModels/VecBinOp.inl> #include <ShaderNode/DataModels/VecBinOp.inl>

32
src/ShaderNode/DataModels/VecBinOp.inl
View File

@ -95,7 +95,7 @@ bool VecBinOp<BinOp>::ComputePreview(QPixmap& pixmap)
if (!m_lhs || !m_rhs) if (!m_lhs || !m_rhs)
return false; return false;
pixmap = QPixmap::fromImage(m_output->preview); pixmap = QPixmap::fromImage(m_output->preview.GenerateImage());
return true; return true;
} }
@ -105,29 +105,29 @@ void VecBinOp<BinOp>::UpdateOutput()
if (validationState() != QtNodes::NodeValidationState::Valid) if (validationState() != QtNodes::NodeValidationState::Valid)
{ {
m_output = std::make_shared<VecData>(4); m_output = std::make_shared<VecData>(4);
m_output->preview = QImage(1, 1, QImage::Format_RGBA8888); m_output->preview = PreviewValues(1, 1);
m_output->preview.fill(QColor::fromRgb(0, 0, 0, 0)); m_output->preview.Fill(Nz::Vector4f::Zero());
return; return;
} }
m_output = std::make_shared<VecData>(m_lhs->componentCount); m_output = std::make_shared<VecData>(m_lhs->componentCount);
const QImage& leftPreview = m_lhs->preview; const PreviewValues& leftPreview = m_lhs->preview;
const QImage& rightPreview = m_rhs->preview; const PreviewValues& rightPreview = m_rhs->preview;
int maxWidth = std::max(leftPreview.width(), rightPreview.width()); std::size_t maxWidth = std::max(leftPreview.GetWidth(), rightPreview.GetWidth());
int maxHeight = std::max(leftPreview.height(), rightPreview.height()); std::size_t maxHeight = std::max(leftPreview.GetHeight(), rightPreview.GetHeight());
// Exploit COW // FIXME: Prevent useless copy
QImage leftResized = leftPreview; PreviewValues leftResized = leftPreview;
if (leftResized.width() != maxWidth || leftResized.height() != maxHeight) if (leftResized.GetWidth() != maxWidth || leftResized.GetHeight() != maxHeight)
leftResized = leftResized.scaled(maxWidth, maxHeight); leftResized = leftResized.Resized(maxWidth, maxHeight);
QImage rightResized = rightPreview; PreviewValues rightResized = rightPreview;
if (rightResized.width() != maxWidth || rightResized.height() != maxHeight) if (rightResized.GetWidth() != maxWidth || rightResized.GetHeight() != maxHeight)
rightResized = rightResized.scaled(maxWidth, maxHeight); rightResized = rightResized.Resized(maxWidth, maxHeight);
m_output->preview = QImage(maxWidth, maxHeight, QImage::Format_RGBA8888); m_output->preview = PreviewValues(maxWidth, maxHeight);
ApplyOp(leftResized.constBits(), rightResized.constBits(), m_output->preview.bits(), maxWidth * maxHeight * 4); ApplyOp(leftResized.GetData(), rightResized.GetData(), m_output->preview.GetData(), maxWidth * maxHeight);
Q_EMIT dataUpdated(0); Q_EMIT dataUpdated(0);

48
src/ShaderNode/DataModels/VecDot.cpp
View File

@ -112,7 +112,7 @@ bool VecDot::ComputePreview(QPixmap& pixmap)
if (validationState() != QtNodes::NodeValidationState::Valid) if (validationState() != QtNodes::NodeValidationState::Valid)
return false; return false;
pixmap = QPixmap::fromImage(m_output->preview); pixmap = QPixmap::fromImage(m_output->preview.GenerateImage());
return true; return true;
} }
@ -120,45 +120,41 @@ void VecDot::UpdateOutput()
{ {
if (validationState() != QtNodes::NodeValidationState::Valid) if (validationState() != QtNodes::NodeValidationState::Valid)
{ {
m_output->preview = QImage(1, 1, QImage::Format_RGBA8888); m_output->preview = PreviewValues(1, 1);
m_output->preview.fill(QColor::fromRgb(0, 0, 0, 0)); m_output->preview.Fill(Nz::Vector4f::Zero());
return; return;
} }
const QImage& leftPreview = m_lhs->preview; const PreviewValues& leftPreview = m_lhs->preview;
const QImage& rightPreview = m_rhs->preview; const PreviewValues& rightPreview = m_rhs->preview;
int maxWidth = std::max(leftPreview.width(), rightPreview.width()); std::size_t maxWidth = std::max(leftPreview.GetWidth(), rightPreview.GetWidth());
int maxHeight = std::max(leftPreview.height(), rightPreview.height()); std::size_t maxHeight = std::max(leftPreview.GetHeight(), rightPreview.GetHeight());
// Exploit COW // FIXME: Prevent useless copy
QImage leftResized = leftPreview; PreviewValues leftResized = leftPreview;
if (leftResized.width() != maxWidth || leftResized.height() != maxHeight) if (leftResized.GetWidth() != maxWidth || leftResized.GetHeight() != maxHeight)
leftResized = leftResized.scaled(maxWidth, maxHeight); leftResized = leftResized.Resized(maxWidth, maxHeight);
QImage rightResized = rightPreview; PreviewValues rightResized = rightPreview;
if (rightResized.width() != maxWidth || rightResized.height() != maxHeight) if (rightResized.GetWidth() != maxWidth || rightResized.GetHeight() != maxHeight)
rightResized = rightResized.scaled(maxWidth, maxHeight); rightResized = rightResized.Resized(maxWidth, maxHeight);
m_output->preview = QImage(maxWidth, maxHeight, QImage::Format_RGBA8888); m_output->preview = PreviewValues(maxWidth, maxHeight);
const uchar* left = leftResized.constBits(); const Nz::Vector4f* left = leftResized.GetData();
const uchar* right = rightPreview.constBits(); const Nz::Vector4f* right = rightPreview.GetData();
uchar* output = m_output->preview.bits(); Nz::Vector4f* output = m_output->preview.GetData();
std::size_t pixelCount = maxWidth * maxHeight; std::size_t pixelCount = maxWidth * maxHeight;
for (std::size_t i = 0; i < pixelCount; ++i) for (std::size_t i = 0; i < pixelCount; ++i)
{ {
unsigned int acc = 0; float acc = 0.f;
for (std::size_t j = 0; j < m_lhs->componentCount; ++j) for (std::size_t j = 0; j < m_lhs->componentCount; ++j)
acc += left[j] * right[j] / 255; acc += left[i][j] * right[i][j];
unsigned int result = static_cast<std::uint8_t>(std::min(acc, 255U));
for (std::size_t j = 0; j < 3; ++j) for (std::size_t j = 0; j < 3; ++j)
*output++ = result; output[i][j] = acc;
*output++ = 255; //< leave alpha at maximum output[i][3] = 1.f; //< leave alpha at maximum
left += 4;
right += 4;
} }
Q_EMIT dataUpdated(0); Q_EMIT dataUpdated(0);

45
src/ShaderNode/DataModels/VecFloatMul.cpp
View File

@ -132,7 +132,7 @@ bool VecFloatMul::ComputePreview(QPixmap& pixmap)
if (validationState() != QtNodes::NodeValidationState::Valid) if (validationState() != QtNodes::NodeValidationState::Valid)
return false; return false;
pixmap = QPixmap::fromImage(m_output->preview); pixmap = QPixmap::fromImage(m_output->preview.GenerateImage());
return true; return true;
} }
@ -141,41 +141,36 @@ void VecFloatMul::UpdateOutput()
if (validationState() != QtNodes::NodeValidationState::Valid) if (validationState() != QtNodes::NodeValidationState::Valid)
{ {
m_output = std::make_shared<VecData>(4); m_output = std::make_shared<VecData>(4);
m_output->preview = QImage(1, 1, QImage::Format_RGBA8888); m_output->preview = PreviewValues(1, 1);
m_output->preview.fill(QColor::fromRgb(0, 0, 0, 0)); m_output->preview.Fill(Nz::Vector4f::Zero());
return; return;
} }
m_output = std::make_shared<VecData>(m_rhs->componentCount); m_output = std::make_shared<VecData>(m_rhs->componentCount);
const QImage& leftPreview = m_lhs->preview; const PreviewValues& leftPreview = m_lhs->preview;
const QImage& rightPreview = m_rhs->preview; const PreviewValues& rightPreview = m_rhs->preview;
int maxWidth = std::max(leftPreview.width(), rightPreview.width()); std::size_t maxWidth = std::max(leftPreview.GetWidth(), rightPreview.GetWidth());
int maxHeight = std::max(leftPreview.height(), rightPreview.height()); std::size_t maxHeight = std::max(leftPreview.GetHeight(), rightPreview.GetHeight());
// Exploit COW // FIXME: Prevent useless copy
QImage leftResized = leftPreview; PreviewValues leftResized = leftPreview;
if (leftResized.width() != maxWidth || leftResized.height() != maxHeight) if (leftResized.GetWidth() != maxWidth || leftResized.GetHeight() != maxHeight)
leftResized = leftResized.scaled(maxWidth, maxHeight); leftResized = leftResized.Resized(maxWidth, maxHeight);
QImage rightResized = rightPreview; PreviewValues rightResized = rightPreview;
if (rightResized.width() != maxWidth || rightResized.height() != maxHeight) if (rightResized.GetWidth() != maxWidth || rightResized.GetHeight() != maxHeight)
rightResized = rightResized.scaled(maxWidth, maxHeight); rightResized = rightResized.Resized(maxWidth, maxHeight);
m_output->preview = QImage(maxWidth, maxHeight, QImage::Format_RGBA8888); m_output->preview = PreviewValues(maxWidth, maxHeight);
const uchar* left = leftResized.constBits(); const Nz::Vector4f* left = leftResized.GetData();
const uchar* right = rightPreview.constBits(); const Nz::Vector4f* right = rightPreview.GetData();
uchar* output = m_output->preview.bits(); Nz::Vector4f* output = m_output->preview.GetData();
std::size_t pixelCount = maxWidth * maxHeight * 4; std::size_t pixelCount = maxWidth * maxHeight;
for (std::size_t i = 0; i < pixelCount; ++i) for (std::size_t i = 0; i < pixelCount; ++i)
{ output[i] = left[i] * right[i];
unsigned int lValue = left[i];
unsigned int rValue = right[i];
output[i] = static_cast<std::uint8_t>(lValue * rValue / 255);
}
Q_EMIT dataUpdated(0); Q_EMIT dataUpdated(0);

10
src/ShaderNode/DataModels/VecValue.inl
View File

@ -63,8 +63,14 @@ std::shared_ptr<QtNodes::NodeData> VecValue<ComponentCount>::outData(QtNodes::Po
assert(port == 0); assert(port == 0);
auto out = std::make_shared<VecData>(ComponentCount); auto out = std::make_shared<VecData>(ComponentCount);
out->preview = QImage(1, 1, QImage::Format_RGBA8888);
out->preview.fill(ToColor()); std::array<float, 4> values = { 0.f, 0.f, 0.f, 1.f };
for (std::size_t i = 0; i < ComponentCount; ++i)
values[i] = m_value[i];
out->preview = PreviewValues(1, 1);
out->preview(0, 0) = Nz::Vector4f(values[0], values[1], values[2], values[3]);
return out; return out;
} }

4
src/ShaderNode/DataTypes/FloatData.hpp
View File

@ -3,8 +3,8 @@
#ifndef NAZARA_SHADERNODES_FLOATDATA_HPP #ifndef NAZARA_SHADERNODES_FLOATDATA_HPP
#define NAZARA_SHADERNODES_FLOATDATA_HPP #define NAZARA_SHADERNODES_FLOATDATA_HPP
#include <ShaderNode/Previews/PreviewValues.hpp>
#include <nodes/NodeData> #include <nodes/NodeData>
#include <QtGui/QImage>
struct FloatData : public QtNodes::NodeData struct FloatData : public QtNodes::NodeData
{ {
@ -20,7 +20,7 @@ struct FloatData : public QtNodes::NodeData
return { "float", "Float" }; return { "float", "Float" };
} }
QImage preview; PreviewValues preview;
}; };
#include <ShaderNode/DataTypes/FloatData.inl> #include <ShaderNode/DataTypes/FloatData.inl>

4
src/ShaderNode/DataTypes/FloatData.inl
View File

@ -1,7 +1,7 @@
#include <ShaderNode/DataTypes/FloatData.hpp> #include <ShaderNode/DataTypes/FloatData.hpp>
inline FloatData::FloatData() : inline FloatData::FloatData() :
preview(1, 1, QImage::Format_RGBA8888) preview(1, 1)
{ {
preview.fill(QColor::fromRgb(255, 255, 255, 0)); preview(0, 0) = Nz::Vector4f(1.f, 1.f, 1.f, 0.f);
} }

4
src/ShaderNode/DataTypes/TextureData.hpp
View File

@ -3,15 +3,15 @@
#ifndef NAZARA_SHADERNODES_TEXTUREDATA_HPP #ifndef NAZARA_SHADERNODES_TEXTUREDATA_HPP
#define NAZARA_SHADERNODES_TEXTUREDATA_HPP #define NAZARA_SHADERNODES_TEXTUREDATA_HPP
#include <ShaderNode/Previews/PreviewValues.hpp>
#include <Nazara/Renderer/ShaderNodes.hpp> #include <Nazara/Renderer/ShaderNodes.hpp>
#include <nodes/NodeData> #include <nodes/NodeData>
#include <QtGui/QImage>
struct TextureData : public QtNodes::NodeData struct TextureData : public QtNodes::NodeData
{ {
inline TextureData(); inline TextureData();
QImage preview; PreviewValues preview;
}; };
struct Texture2Data : public TextureData struct Texture2Data : public TextureData

4
src/ShaderNode/DataTypes/TextureData.inl
View File

@ -1,7 +1,7 @@
#include <ShaderNode/DataTypes/TextureData.hpp> #include <ShaderNode/DataTypes/TextureData.hpp>
inline TextureData::TextureData() : inline TextureData::TextureData() :
preview(64, 64, QImage::Format_RGBA8888) preview(64, 64)
{ {
preview.fill(QColor::fromRgb(255, 255, 255, 0)); preview.Fill(Nz::Vector4f(1.f, 1.f, 1.f, 0.f));
} }

4
src/ShaderNode/DataTypes/VecData.hpp
View File

@ -4,8 +4,8 @@
#define NAZARA_SHADERNODES_VECDATA_HPP #define NAZARA_SHADERNODES_VECDATA_HPP
#include <Nazara/Renderer/ShaderNodes.hpp> #include <Nazara/Renderer/ShaderNodes.hpp>
#include <ShaderNode/Previews/PreviewValues.hpp>
#include <nodes/NodeData> #include <nodes/NodeData>
#include <QtGui/QImage>
struct VecData : public QtNodes::NodeData struct VecData : public QtNodes::NodeData
{ {
@ -18,7 +18,7 @@ struct VecData : public QtNodes::NodeData
static inline QtNodes::NodeDataType Type(); static inline QtNodes::NodeDataType Type();
std::size_t componentCount; std::size_t componentCount;
QImage preview; PreviewValues preview;
}; };
template<std::size_t N> template<std::size_t N>

4
src/ShaderNode/DataTypes/VecData.inl
View File

@ -2,9 +2,9 @@
inline VecData::VecData(std::size_t ComponentCount) : inline VecData::VecData(std::size_t ComponentCount) :
componentCount(ComponentCount), componentCount(ComponentCount),
preview(64, 64, QImage::Format_RGBA8888) preview(64, 64)
{ {
preview.fill(QColor::fromRgb(255, 255, 255, 0)); preview.Fill(Nz::Vector4f(1.f, 1.f, 1.f, 0.f));
} }
inline QtNodes::NodeDataType VecData::type() const inline QtNodes::NodeDataType VecData::type() const

4
src/ShaderNode/Previews/PreviewModel.hpp
View File

@ -5,7 +5,7 @@
#include <ShaderNode/Enums.hpp> #include <ShaderNode/Enums.hpp>
class QImage; class PreviewValues;
class PreviewModel class PreviewModel
{ {
@ -13,7 +13,7 @@ class PreviewModel
PreviewModel() = default; PreviewModel() = default;
virtual ~PreviewModel(); virtual ~PreviewModel();
virtual QImage GetImage(InputRole role, std::size_t roleIndex) const = 0; virtual PreviewValues GetPreview(InputRole role, std::size_t roleIndex) const = 0;
}; };
#include <ShaderNode/Previews/PreviewModel.inl> #include <ShaderNode/Previews/PreviewModel.inl>

95
src/ShaderNode/Previews/PreviewValues.cpp Normal file
View File

@ -0,0 +1,95 @@
#include <ShaderNode/Previews/PreviewValues.hpp>
#include <QtGui/QImage>
PreviewValues::PreviewValues() :
PreviewValues(0, 0)
{
}
PreviewValues::PreviewValues(std::size_t width, std::size_t height) :
m_height(height),
m_width(width)
{
m_values.resize(m_width * m_height); //< RGBA
}
void PreviewValues::Fill(const Nz::Vector4f& value)
{
std::fill(m_values.begin(), m_values.end(), value);
}
QImage PreviewValues::GenerateImage() const
{
QImage preview(int(m_width), int(m_height), QImage::Format_RGBA8888);
Nz::UInt8* ptr = preview.bits();
const Nz::Vector4f* src = m_values.data();
for (std::size_t i = 0; i < m_values.size(); ++i)
{
for (std::size_t y = 0; y < 4; ++y)
*ptr++ = static_cast<Nz::UInt8>(std::clamp((*src)[y] * 0xFF, 0.f, 255.f));
*src++;
}
return preview;
}
PreviewValues PreviewValues::Resized(std::size_t newWidth, std::size_t newHeight) const
{
PreviewValues resizedPreview(newWidth, newHeight);
float xStep = 1.f / newWidth;
float yStep = 1.f / newHeight;
for (std::size_t y = 0; y < newHeight; ++y)
{
for (std::size_t x = 0; x < newWidth; ++x)
resizedPreview(x, y) = Sample(x * xStep, y * yStep);
}
return resizedPreview;
}
Nz::Vector4f PreviewValues::Sample(float u, float v) const
{
// Bilinear filtering
float x = std::clamp(u * m_width, 0.f, m_width - 1.f);
float y = std::clamp(v * m_height, 0.f, m_height - 1.f);
std::size_t iX = static_cast<std::size_t>(x);
std::size_t iY = static_cast<std::size_t>(y);
float dX = x - iX;
float dY = y - iY;
auto ColorAt = [&](std::size_t x, std::size_t y) -> Nz::Vector4f
{
x = std::min(x, m_width - 1);
y = std::min(y, m_height - 1);
return m_values[y * m_width + x];
};
Nz::Vector4f d00 = ColorAt(iX, iY);
Nz::Vector4f d10 = ColorAt(iX + 1, iY);
Nz::Vector4f d01 = ColorAt(iX, iY + 1);
Nz::Vector4f d11 = ColorAt(iX + 1, iY + 1);
return Nz::Lerp(Nz::Lerp(d00, d10, dX), Nz::Lerp(d01, d11, dX), dY);
}
Nz::Vector4f& 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];
}
Nz::Vector4f PreviewValues::operator()(std::size_t x, std::size_t y) const
{
assert(x < m_width);
assert(y < m_height);
return m_values[y * m_width + x];
}

50
src/ShaderNode/Previews/PreviewValues.hpp Normal file
View File

@ -0,0 +1,50 @@
#pragma once
#ifndef NAZARA_SHADERNODES_PREVIEWVALUES_HPP
#define NAZARA_SHADERNODES_PREVIEWVALUES_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Math/Vector4.hpp>
#include <ShaderNode/Enums.hpp>
#include <array>
#include <vector>
class QImage;
class PreviewValues
{
public:
PreviewValues();
PreviewValues(std::size_t width, std::size_t height);
PreviewValues(const PreviewValues&) = default;
PreviewValues(PreviewValues&&) = default;
~PreviewValues() = default;
void Fill(const Nz::Vector4f& value);
QImage GenerateImage() const;
inline Nz::Vector4f* GetData();
inline const Nz::Vector4f* 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;
Nz::Vector4f Sample(float u, float v) const;
Nz::Vector4f& operator()(std::size_t x, std::size_t y);
Nz::Vector4f operator()(std::size_t x, std::size_t y) const;
PreviewValues& operator=(const PreviewValues&) = default;
PreviewValues& operator=(PreviewValues&&) = default;
private:
std::size_t m_height;
std::size_t m_width;
std::vector<Nz::Vector4f> m_values;
};
#include <ShaderNode/Previews/PreviewValues.inl>
#endif

21
src/ShaderNode/Previews/PreviewValues.inl Normal file
View File

@ -0,0 +1,21 @@
#include <ShaderNode/Previews/PreviewValues.hpp>
inline Nz::Vector4f* PreviewValues::GetData()
{
return m_values.data();
}
inline const Nz::Vector4f* PreviewValues::GetData() const
{
return m_values.data();
}
inline std::size_t PreviewValues::GetHeight() const
{
return m_width;
}
inline std::size_t PreviewValues::GetWidth() const
{
return m_height;
}

17
src/ShaderNode/Previews/QuadPreview.cpp
View File

@ -1,27 +1,22 @@
#include <ShaderNode/Previews/QuadPreview.hpp> #include <ShaderNode/Previews/QuadPreview.hpp>
#include <cassert> #include <cassert>
QImage QuadPreview::GetImage(InputRole role, std::size_t roleIndex) const PreviewValues QuadPreview::GetPreview(InputRole role, std::size_t roleIndex) const
{ {
if (role != InputRole::TexCoord) if (role != InputRole::TexCoord)
{ {
QImage dummy(1, 1, QImage::Format_RGBA8888); PreviewValues dummy(1, 1);
dummy.fill(QColor::fromRgb(0, 0, 0, 0)); dummy(0, 0) = Nz::Vector4f::Zero();
return dummy; return dummy;
} }
QImage uv(128, 128, QImage::Format_RGBA8888); PreviewValues uv(128, 128);
std::uint8_t* content = uv.bits();
for (std::size_t y = 0; y < 128; ++y) for (std::size_t y = 0; y < 128; ++y)
{ {
for (std::size_t x = 0; x < 128; ++x) for (std::size_t x = 0; x < 128; ++x)
{ uv(x, y) = Nz::Vector4f(x / 128.f, y / 128.f, 0.f, 1.f);
*content++ = (x * 255) / 128;
*content++ = (y * 255) / 128;
*content++ = 0;
*content++ = 255;
}
} }
return uv; return uv;

4
src/ShaderNode/Previews/QuadPreview.hpp
View File

@ -4,7 +4,7 @@
#define NAZARA_SHADERNODES_QUADPREVIEW_HPP #define NAZARA_SHADERNODES_QUADPREVIEW_HPP
#include <ShaderNode/Previews/PreviewModel.hpp> #include <ShaderNode/Previews/PreviewModel.hpp>
#include <QtGui/QImage> #include <ShaderNode/Previews/PreviewValues.hpp>
class QuadPreview : public PreviewModel class QuadPreview : public PreviewModel
{ {
@ -12,7 +12,7 @@ class QuadPreview : public PreviewModel
QuadPreview() = default; QuadPreview() = default;
~QuadPreview() = default; ~QuadPreview() = default;
QImage GetImage(InputRole role, std::size_t roleIndex) const override; PreviewValues GetPreview(InputRole role, std::size_t roleIndex) const override;
}; };
#include <ShaderNode/Previews/QuadPreview.inl> #include <ShaderNode/Previews/QuadPreview.inl>