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

ShaderEditor/VecBinOp: Add component check

This commit is contained in:
Lynix 2020-06-16 17:45:21 +02:00
parent 9b911ac4bc
commit d3db22ce22
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,9 @@ class VecBinOp : public ShaderNode
void setInData(std::shared_ptr<QtNodes::NodeData> value, int index) override; void setInData(std::shared_ptr<QtNodes::NodeData> value, int index) override;
QtNodes::NodeValidationState validationState() 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 std::uint8_t* left, const std::uint8_t* right, std::uint8_t* output, std::size_t pixelCount) = 0;

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

@ -65,6 +65,30 @@ void VecBinOp<BinOp>::setInData(std::shared_ptr<QtNodes::NodeData> value, int in
UpdateOutput(); UpdateOutput();
} }
template<Nz::ShaderAst::BinaryType BinOp>
QtNodes::NodeValidationState VecBinOp<BinOp>::validationState() const
{
if (!m_lhs || !m_rhs)
return QtNodes::NodeValidationState::Error;
if (m_lhs->componentCount != m_rhs->componentCount)
return QtNodes::NodeValidationState::Error;
return QtNodes::NodeValidationState::Valid;
}
template<Nz::ShaderAst::BinaryType BinOp>
QString VecBinOp<BinOp>::validationMessage() const
{
if (!m_lhs || !m_rhs)
return "Missing operands";
if (m_lhs->componentCount != m_rhs->componentCount)
return "Incompatible components count (left has " + QString::number(m_lhs->componentCount) + ", right has " + QString::number(m_rhs->componentCount) + ")";
return QString();
}
template<Nz::ShaderAst::BinaryType BinOp> template<Nz::ShaderAst::BinaryType BinOp>
bool VecBinOp<BinOp>::ComputePreview(QPixmap& pixmap) bool VecBinOp<BinOp>::ComputePreview(QPixmap& pixmap)
{ {
@ -78,7 +102,7 @@ bool VecBinOp<BinOp>::ComputePreview(QPixmap& pixmap)
template<Nz::ShaderAst::BinaryType BinOp> template<Nz::ShaderAst::BinaryType BinOp>
void VecBinOp<BinOp>::UpdateOutput() void VecBinOp<BinOp>::UpdateOutput()
{ {
if (!m_lhs || !m_rhs || m_lhs->componentCount != m_rhs->componentCount) 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 = QImage(1, 1, QImage::Format_RGBA8888);