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

ShaderNode/NodeEditor: Replace QVBoxLayout by QFormLayout

This commit is contained in:
Lynix 2020-05-28 00:11:16 +02:00
parent 3fc4de26e3
commit 0ec927b82e
14 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ShaderNode/DataModels/Cast.hpp
View File

@ -18,7 +18,7 @@ class CastVec : public ShaderNode
CastVec(ShaderGraph& graph);
~CastVec() = default;
void BuildNodeEdition(QVBoxLayout* layout) override;
void BuildNodeEdition(QFormLayout* layout) override;
Nz::ShaderAst::ExpressionPtr GetExpression(Nz::ShaderAst::ExpressionPtr* expressions, std::size_t count) const override;

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

@ -10,14 +10,12 @@ ShaderNode(graph)
}
template<typename From, typename To>
void CastVec<From, To>::BuildNodeEdition(QVBoxLayout* layout)
void CastVec<From, To>::BuildNodeEdition(QFormLayout* layout)
{
ShaderNode::BuildNodeEdition(layout);
if constexpr (ComponentDiff > 0)
{
QFormLayout* formLayout = new QFormLayout;
for (std::size_t i = 0; i < ComponentDiff; ++i)
{
QDoubleSpinBox* spinbox = new QDoubleSpinBox;
@ -30,10 +28,8 @@ void CastVec<From, To>::BuildNodeEdition(QVBoxLayout* layout)
UpdateOutput();
});
formLayout->addRow(QString::fromUtf8(&s_vectorComponents[FromComponents + i], 1), spinbox);
layout->addRow(QString::fromUtf8(&s_vectorComponents[FromComponents + i], 1), spinbox);
}
layout->addLayout(formLayout);
}
}

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

@ -64,7 +64,7 @@ void InputValue::OnInputListUpdate()
}
}
void InputValue::BuildNodeEdition(QVBoxLayout* layout)
void InputValue::BuildNodeEdition(QFormLayout* layout)
{
ShaderNode::BuildNodeEdition(layout);
@ -83,7 +83,7 @@ void InputValue::BuildNodeEdition(QVBoxLayout* layout)
for (const auto& inputEntry : GetGraph().GetInputs())
inputSelection->addItem(QString::fromStdString(inputEntry.name));
layout->addWidget(inputSelection);
layout->addRow(tr("Input"), inputSelection);
}
Nz::ShaderAst::ExpressionPtr InputValue::GetExpression(Nz::ShaderAst::ExpressionPtr* /*expressions*/, std::size_t count) const

2
src/ShaderNode/DataModels/InputValue.hpp
View File

@ -17,7 +17,7 @@ class InputValue : public ShaderNode
InputValue(ShaderGraph& graph);
~InputValue() = default;
void BuildNodeEdition(QVBoxLayout* layout) override;
void BuildNodeEdition(QFormLayout* layout) override;
Nz::ShaderAst::ExpressionPtr GetExpression(Nz::ShaderAst::ExpressionPtr* /*expressions*/, std::size_t count) const override;

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

@ -112,7 +112,7 @@ bool SampleTexture::ComputePreview(QPixmap& pixmap)
return true;
}
void SampleTexture::BuildNodeEdition(QVBoxLayout* layout)
void SampleTexture::BuildNodeEdition(QFormLayout* layout)
{
ShaderNode::BuildNodeEdition(layout);
@ -130,7 +130,7 @@ void SampleTexture::BuildNodeEdition(QVBoxLayout* layout)
for (const auto& textureEntry : GetGraph().GetTextures())
textureSelection->addItem(QString::fromStdString(textureEntry.name));
layout->addWidget(textureSelection);
layout->addRow(tr("Texture"), textureSelection);
}
Nz::ShaderAst::ExpressionPtr SampleTexture::GetExpression(Nz::ShaderAst::ExpressionPtr* expressions, std::size_t count) const

2
src/ShaderNode/DataModels/SampleTexture.hpp
View File

@ -17,7 +17,7 @@ class SampleTexture : public ShaderNode
SampleTexture(ShaderGraph& graph);
~SampleTexture() = default;
void BuildNodeEdition(QVBoxLayout* layout) override;
void BuildNodeEdition(QFormLayout* layout) override;
Nz::ShaderAst::ExpressionPtr GetExpression(Nz::ShaderAst::ExpressionPtr* /*expressions*/, std::size_t count) const override;

10
src/ShaderNode/DataModels/ShaderNode.cpp
View File

@ -1,21 +1,23 @@
#include <ShaderNode/DataModels/ShaderNode.hpp>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QFormLayout>
#include <QtWidgets/QLabel>
#include <QtWidgets/QVBoxLayout>
ShaderNode::ShaderNode(ShaderGraph& graph) :
m_previewSize(64, 64),
m_pixmapLabel(nullptr),
m_graph(graph),
m_forceVariable(false),
m_isPreviewEnabled(false)
{
m_pixmapLabel = new QLabel;
m_pixmapLabel->setStyleSheet("background-color: rgba(0,0,0,0)");
}
void ShaderNode::BuildNodeEdition(QVBoxLayout* layout)
void ShaderNode::BuildNodeEdition(QFormLayout* layout)
{
QCheckBox* checkbox = new QCheckBox(tr("Enable preview"));
QCheckBox* checkbox = new QCheckBox;
checkbox->setCheckState((m_isPreviewEnabled) ? Qt::Checked : Qt::Unchecked);
connect(checkbox, &QCheckBox::stateChanged, [&](int state)
@ -23,7 +25,7 @@ void ShaderNode::BuildNodeEdition(QVBoxLayout* layout)
EnablePreview(state == Qt::Checked);
});
layout->addWidget(checkbox);
layout->addRow(tr("Enable preview"), checkbox);
}
void ShaderNode::EnablePreview(bool enable)

7
src/ShaderNode/DataModels/ShaderNode.hpp
View File

@ -10,7 +10,7 @@
#include <optional>
class QLabel;
class QVBoxLayout;
class QFormLayout;
class ShaderGraph;
class ShaderNode : public QtNodes::NodeDataModel
@ -18,13 +18,14 @@ class ShaderNode : public QtNodes::NodeDataModel
public:
ShaderNode(ShaderGraph& graph);
virtual void BuildNodeEdition(QVBoxLayout* layout);
virtual void BuildNodeEdition(QFormLayout* layout);
void EnablePreview(bool enable);
virtual Nz::ShaderAst::ExpressionPtr GetExpression(Nz::ShaderAst::ExpressionPtr* expressions, std::size_t count) const = 0;
inline ShaderGraph& GetGraph();
inline const ShaderGraph& GetGraph() const;
inline const std::string& GetVariableName() const;
void SetPreviewSize(const Nz::Vector2i& size);
@ -41,7 +42,9 @@ class ShaderNode : public QtNodes::NodeDataModel
Nz::Vector2i m_previewSize;
QLabel* m_pixmapLabel;
std::optional<QPixmap> m_pixmap;
std::string m_variableName;
ShaderGraph& m_graph;
bool m_forceVariable;
bool m_isPreviewEnabled;
};

9
src/ShaderNode/DataModels/ShaderNode.inl
View File

@ -1,6 +1,5 @@
#include <ShaderNode/DataModels/ShaderNode.hpp>
inline ShaderGraph& ShaderNode::GetGraph()
{
return m_graph;
@ -11,9 +10,17 @@ inline const ShaderGraph& ShaderNode::GetGraph() const
return m_graph;
}
inline const std::string& ShaderNode::GetVariableName() const
{
return m_variableName;
}
inline void ShaderNode::SetPreviewSize(const Nz::Vector2i& size)
{
m_previewSize = size;
if (m_isPreviewEnabled)
{
UpdatePreview();
embeddedWidgetSizeUpdated();
}
}

2
src/ShaderNode/DataModels/VecValue.hpp
View File

@ -27,7 +27,7 @@ class VecValue : public ShaderNode
std::shared_ptr<QtNodes::NodeData> outData(QtNodes::PortIndex port) override;
void BuildNodeEdition(QVBoxLayout* layout) override;
void BuildNodeEdition(QFormLayout* layout) override;
Nz::ShaderAst::ExpressionPtr GetExpression(Nz::ShaderAst::ExpressionPtr* expressions, std::size_t count) const override;

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

@ -68,11 +68,10 @@ std::shared_ptr<QtNodes::NodeData> VecValue<Data>::outData(QtNodes::PortIndex po
}
template<typename Data>
void VecValue<Data>::BuildNodeEdition(QVBoxLayout* layout)
void VecValue<Data>::BuildNodeEdition(QFormLayout* layout)
{
ShaderNode::BuildNodeEdition(layout);
QFormLayout* formLayout = new QFormLayout;
for (std::size_t i = 0; i < ComponentCount; ++i)
{
QDoubleSpinBox* spinbox = new QDoubleSpinBox;
@ -87,10 +86,8 @@ void VecValue<Data>::BuildNodeEdition(QVBoxLayout* layout)
UpdatePreview();
});
formLayout->addRow(QString::fromUtf8(&s_vectorComponents[i], 1), spinbox);
layout->addRow(QString::fromUtf8(&s_vectorComponents[i], 1), spinbox);
}
layout->addLayout(formLayout);
}
template<typename Data>

2
src/ShaderNode/Widgets/MainWindow.cpp
View File

@ -48,7 +48,7 @@ m_shaderGraph(graph)
{
if (node)
{
m_nodeEditor->UpdateContent(node->caption(), [node](QVBoxLayout* layout)
m_nodeEditor->UpdateContent(node->caption(), [node](QFormLayout* layout)
{
node->BuildNodeEdition(layout);
});

4
src/ShaderNode/Widgets/NodeEditor.hpp
View File

@ -4,7 +4,7 @@
#define NAZARA_SHADERNODES_NODEEDITOR_HPP
#include <ShaderNode/ShaderGraph.hpp>
#include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QFormLayout>
#include <QtWidgets/QWidget>
#include <optional>
@ -19,7 +19,7 @@ class NodeEditor : public QWidget
template<typename F> void UpdateContent(QString nodeName, F&& callback);
private:
QVBoxLayout* m_layout;
QFormLayout* m_layout;
};
#include <ShaderNode/Widgets/NodeEditor.inl>

2
src/ShaderNode/Widgets/NodeEditor.inl
View File

@ -6,7 +6,7 @@ void NodeEditor::UpdateContent(QString nodeName, F&& callback)
{
Clear();
m_layout = new QVBoxLayout;
m_layout = new QFormLayout;
setLayout(m_layout);
QLabel* label = new QLabel(nodeName);