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

ShaderNode: Add code output window

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-01-14 22:02:34 +01:00
parent a037eef4c9
commit c8f4e53244
7 changed files with 245 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@
#include <Nazara/Shader/ShaderAstSerializer.hpp>
#include <ShaderNode/ShaderGraph.hpp>
#include <ShaderNode/Widgets/BufferEditor.hpp>
#include <ShaderNode/Widgets/CodeOutputWidget.hpp>
#include <ShaderNode/Widgets/ConditionEditor.hpp>
#include <ShaderNode/Widgets/InputEditor.hpp>
#include <ShaderNode/Widgets/OutputEditor.hpp>
@@ -14,6 +15,7 @@
#include <nodes/FlowView>
#include <QtCore/QFile>
#include <QtCore/QJsonDocument>
#include <QtCore/QTimer>
#include <QtWidgets/QDockWidget>
#include <QtWidgets/QFileDialog>
#include <QtWidgets/QMenuBar>
@@ -35,7 +37,6 @@ m_shaderGraph(graph)
InputEditor* inputEditor = new InputEditor(m_shaderGraph);
QDockWidget* inputDock = new QDockWidget(tr("Inputs"));
inputDock->setFeatures(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
inputDock->setWidget(inputEditor);
addDockWidget(Qt::LeftDockWidgetArea, inputDock);
@@ -44,7 +45,6 @@ m_shaderGraph(graph)
OutputEditor* outputEditor = new OutputEditor(m_shaderGraph);
QDockWidget* outputDock = new QDockWidget(tr("Outputs"));
outputDock->setFeatures(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
outputDock->setWidget(outputEditor);
addDockWidget(Qt::LeftDockWidgetArea, outputDock);
@@ -53,7 +53,6 @@ m_shaderGraph(graph)
TextureEditor* textureEditor = new TextureEditor(m_shaderGraph);
QDockWidget* textureDock = new QDockWidget(tr("Textures"));
textureDock->setFeatures(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
textureDock->setWidget(textureEditor);
addDockWidget(Qt::LeftDockWidgetArea, textureDock);
@@ -62,7 +61,6 @@ m_shaderGraph(graph)
m_nodeEditor = new NodeEditor;
QDockWidget* nodeEditorDock = new QDockWidget(tr("Node editor"));
nodeEditorDock->setFeatures(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
nodeEditorDock->setWidget(m_nodeEditor);
addDockWidget(Qt::RightDockWidgetArea, nodeEditorDock);
@@ -71,7 +69,6 @@ m_shaderGraph(graph)
BufferEditor* bufferEditor = new BufferEditor(m_shaderGraph);
QDockWidget* bufferDock = new QDockWidget(tr("Buffers"));
bufferDock->setFeatures(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
bufferDock->setWidget(bufferEditor);
addDockWidget(Qt::RightDockWidgetArea, bufferDock);
@@ -80,7 +77,6 @@ m_shaderGraph(graph)
StructEditor* structEditor = new StructEditor(m_shaderGraph);
QDockWidget* structDock = new QDockWidget(tr("Structs"));
structDock->setFeatures(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
structDock->setWidget(structEditor);
addDockWidget(Qt::RightDockWidgetArea, structDock);
@@ -89,11 +85,18 @@ m_shaderGraph(graph)
ConditionEditor* conditionEditor = new ConditionEditor(m_shaderGraph);
QDockWidget* conditionDock = new QDockWidget(tr("Conditions"));
conditionDock->setFeatures(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
conditionDock->setWidget(conditionEditor);
addDockWidget(Qt::RightDockWidgetArea, conditionDock);
// Code output
CodeOutputWidget* codeOutput = new CodeOutputWidget(m_shaderGraph);
QDockWidget* codeOutputDock = new QDockWidget(tr("Code output"));
codeOutputDock->setWidget(codeOutput);
addDockWidget(Qt::BottomDockWidgetArea, codeOutputDock);
m_onSelectedNodeUpdate.Connect(m_shaderGraph.OnSelectedNodeUpdate, [&](ShaderGraph*, ShaderNode* node)
{
if (node)
@@ -109,21 +112,46 @@ m_shaderGraph(graph)
BuildMenu();
m_codeOutput = new QTextEdit;
m_codeOutput->setReadOnly(true);
m_codeOutput->setWindowTitle("GLSL Output");
m_onConditionUpdate.Connect(m_shaderGraph.OnConditionUpdate, [&](ShaderGraph*, std::size_t conditionIndex)
{
if (m_codeOutput->isVisible())
OnGenerateGLSL();
QMenu* view = menuBar()->addMenu("View");
view->addAction(inputDock->toggleViewAction());
view->addAction(outputDock->toggleViewAction());
view->addAction(textureDock->toggleViewAction());
view->addAction(nodeEditorDock->toggleViewAction());
view->addAction(bufferDock->toggleViewAction());
view->addAction(structDock->toggleViewAction());
view->addAction(conditionDock->toggleViewAction());
view->addAction(codeOutputDock->toggleViewAction());
}
connect(scene, &QtNodes::FlowScene::connectionCreated, [=](const QtNodes::Connection& /*connection*/)
{
QTimer::singleShot(0, [=]
{
if (codeOutput->isVisible())
codeOutput->Refresh();
});
});
connect(scene, &QtNodes::FlowScene::connectionDeleted, [=](const QtNodes::Connection& /*connection*/)
{
QTimer::singleShot(0, [=]
{
if (codeOutput->isVisible())
codeOutput->Refresh();
});
});
m_onConditionUpdate.Connect(m_shaderGraph.OnConditionUpdate, [=](ShaderGraph*, std::size_t /*conditionIndex*/)
{
if (codeOutput->isVisible())
codeOutput->Refresh();
});
}
MainWindow::~MainWindow()
{
delete m_codeOutput;
m_shaderGraph.Clear();
}
void MainWindow::BuildMenu()
@@ -147,19 +175,13 @@ void MainWindow::BuildMenu()
QAction* compileShader = shader->addAction(tr("Compile..."));
QObject::connect(compileShader, &QAction::triggered, this, &MainWindow::OnCompile);
}
QMenu* generateMenu = menu->addMenu(tr("&Generate"));
{
QAction* generateGlsl = generateMenu->addAction(tr("GLSL"));
connect(generateGlsl, &QAction::triggered, [&](bool) { OnGenerateGLSL(); });
}
}
void MainWindow::OnCompile()
{
try
{
auto shader = ToShader();
auto shader = m_shaderGraph.ToShader();
QString fileName = QFileDialog::getSaveFileName(nullptr, tr("Save shader"), QString(), tr("Shader Files (*.shader)"));
if (fileName.isEmpty())
@@ -177,32 +199,6 @@ void MainWindow::OnCompile()
}
}
void MainWindow::OnGenerateGLSL()
{
try
{
Nz::GlslWriter writer;
Nz::GlslWriter::States states;
for (std::size_t i = 0; i < m_shaderGraph.GetConditionCount(); ++i)
{
if (m_shaderGraph.IsConditionEnabled(i))
states.enabledConditions = Nz::SetBit<Nz::UInt64>(states.enabledConditions, i);
}
std::string glsl = writer.Generate(ToShader(), states);
std::cout << glsl << std::endl;
m_codeOutput->setText(QString::fromStdString(glsl));
m_codeOutput->show();
}
catch (const std::exception& e)
{
QMessageBox::critical(this, tr("Generation failed"), QString("Generation failed: ") + e.what());
}
}
void MainWindow::OnLoad()
{
QString fileName = QFileDialog::getOpenFileName(this, tr("Open shader flow"), QString(), tr("Shader Flow Files (*.shaderflow)"));
@@ -263,54 +259,3 @@ void MainWindow::OnUpdateInfo()
dialog->open();
}
Nz::ShaderAst MainWindow::ToShader()
{
Nz::ShaderNodes::StatementPtr shaderAst = m_shaderGraph.ToAst();
Nz::ShaderAst shader(ShaderGraph::ToShaderStageType(m_shaderGraph.GetType())); //< FIXME
for (const auto& condition : m_shaderGraph.GetConditions())
shader.AddCondition(condition.name);
for (const auto& input : m_shaderGraph.GetInputs())
shader.AddInput(input.name, m_shaderGraph.ToShaderExpressionType(input.type), input.locationIndex);
for (const auto& output : m_shaderGraph.GetOutputs())
shader.AddOutput(output.name, m_shaderGraph.ToShaderExpressionType(output.type), output.locationIndex);
for (const auto& buffer : m_shaderGraph.GetBuffers())
{
const auto& structInfo = m_shaderGraph.GetStruct(buffer.structIndex);
shader.AddUniform(buffer.name, structInfo.name, buffer.bindingIndex, Nz::ShaderNodes::MemoryLayout::Std140);
}
for (const auto& uniform : m_shaderGraph.GetTextures())
shader.AddUniform(uniform.name, m_shaderGraph.ToShaderExpressionType(uniform.type), uniform.bindingIndex, {});
for (const auto& s : m_shaderGraph.GetStructs())
{
std::vector<Nz::ShaderAst::StructMember> members;
for (const auto& sMember : s.members)
{
auto& member = members.emplace_back();
member.name = sMember.name;
std::visit([&](auto&& arg)
{
using T = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<T, PrimitiveType>)
member.type = m_shaderGraph.ToShaderExpressionType(arg);
else if constexpr (std::is_same_v<T, std::size_t>)
member.type = m_shaderGraph.GetStruct(arg).name;
else
static_assert(AlwaysFalse<T>::value, "non-exhaustive visitor");
}, sMember.type);
}
shader.AddStruct(s.name, std::move(members));
}
shader.AddFunction("main", shaderAst);
return shader;
}