Split shader generation to a new module

2020-08-11 00:00:36 +02:00
parent 0313f2d0a6
commit 837a6585a1
86 changed files with 564 additions and 312 deletions
--- a/src/ShaderNode/DataModels/BufferField.cpp
+++ b/src/ShaderNode/DataModels/BufferField.cpp
@@ -5,7 +5,7 @@
 #include <ShaderNode/DataTypes/FloatData.hpp>
 #include <ShaderNode/DataTypes/Matrix4Data.hpp>
 #include <ShaderNode/DataTypes/VecData.hpp>
-#include <Nazara/Renderer/ShaderBuilder.hpp>
+#include <Nazara/Shader/ShaderBuilder.hpp>
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QFormLayout>
 #include <iostream>
--- a/src/ShaderNode/DataModels/Cast.inl
+++ b/src/ShaderNode/DataModels/Cast.inl
@@ -1,5 +1,5 @@
 #include <ShaderNode/DataModels/Cast.hpp>
-#include <Nazara/Renderer/ShaderBuilder.hpp>
+#include <Nazara/Shader/ShaderBuilder.hpp>
 #include <QtWidgets/QDoubleSpinBox>
 #include <QtWidgets/QFormLayout>
 #include <stdexcept>
--- a/src/ShaderNode/DataModels/FloatValue.cpp
+++ b/src/ShaderNode/DataModels/FloatValue.cpp
@@ -1,6 +1,6 @@
 #include <ShaderNode/DataModels/FloatValue.hpp>
 #include <ShaderNode/DataTypes/FloatData.hpp>
-#include <Nazara/Renderer/ShaderBuilder.hpp>
+#include <Nazara/Shader/ShaderBuilder.hpp>
 #include <cassert>

 FloatValue::FloatValue(ShaderGraph& graph) :
--- a/src/ShaderNode/DataModels/InputValue.cpp
+++ b/src/ShaderNode/DataModels/InputValue.cpp
@@ -4,7 +4,7 @@
 #include <ShaderNode/DataTypes/FloatData.hpp>
 #include <ShaderNode/DataTypes/Matrix4Data.hpp>
 #include <ShaderNode/DataTypes/VecData.hpp>
-#include <Nazara/Renderer/ShaderBuilder.hpp>
+#include <Nazara/Shader/ShaderBuilder.hpp>
 #include <QtWidgets/QFormLayout>

 InputValue::InputValue(ShaderGraph& graph) :
--- a/src/ShaderNode/DataModels/Mat4BinOp.inl
+++ b/src/ShaderNode/DataModels/Mat4BinOp.inl
@@ -1,5 +1,5 @@
 #include <ShaderNode/DataModels/Mat4BinOp.hpp>
-#include <Nazara/Renderer/ShaderBuilder.hpp>
+#include <Nazara/Shader/ShaderBuilder.hpp>

 template<Nz::ShaderNodes::BinaryType BinOp>
 Mat4BinOp<BinOp>::Mat4BinOp(ShaderGraph& graph) :
--- a/src/ShaderNode/DataModels/Mat4VecMul.cpp
+++ b/src/ShaderNode/DataModels/Mat4VecMul.cpp
@@ -1,5 +1,5 @@
 #include <ShaderNode/DataModels/Mat4VecMul.hpp>
-#include <Nazara/Renderer/ShaderNodes.hpp>
+#include <Nazara/Shader/ShaderNodes.hpp>

 Mat4VecMul::Mat4VecMul(ShaderGraph& graph) :
 ShaderNode(graph)
--- a/src/ShaderNode/DataModels/OutputValue.cpp
+++ b/src/ShaderNode/DataModels/OutputValue.cpp
@@ -1,5 +1,5 @@
 #include <ShaderNode/DataModels/OutputValue.hpp>
-#include <Nazara/Renderer/ShaderBuilder.hpp>
+#include <Nazara/Shader/ShaderBuilder.hpp>
 #include <ShaderNode/ShaderGraph.hpp>
 #include <ShaderNode/DataTypes/BoolData.hpp>
 #include <ShaderNode/DataTypes/FloatData.hpp>
--- a/src/ShaderNode/DataModels/PositionOutputValue.cpp
+++ b/src/ShaderNode/DataModels/PositionOutputValue.cpp
@@ -1,5 +1,5 @@
 #include <ShaderNode/DataModels/PositionOutputValue.hpp>
-#include <Nazara/Renderer/ShaderBuilder.hpp>
+#include <Nazara/Shader/ShaderBuilder.hpp>
 #include <ShaderNode/ShaderGraph.hpp>
 #include <ShaderNode/DataTypes/BoolData.hpp>
 #include <ShaderNode/DataTypes/FloatData.hpp>
--- a/src/ShaderNode/DataModels/SampleTexture.cpp
+++ b/src/ShaderNode/DataModels/SampleTexture.cpp
@@ -1,6 +1,6 @@
 #include <ShaderNode/ShaderGraph.hpp>
 #include <ShaderNode/DataModels/SampleTexture.hpp>
-#include <Nazara/Renderer/ShaderBuilder.hpp>
+#include <Nazara/Shader/ShaderBuilder.hpp>

 SampleTexture::SampleTexture(ShaderGraph& graph) :
 ShaderNode(graph)
--- a/src/ShaderNode/DataModels/ShaderNode.hpp
+++ b/src/ShaderNode/DataModels/ShaderNode.hpp
@@ -4,7 +4,7 @@
 #define NAZARA_SHADERNODES_SHADERNODE_HPP

 #include <Nazara/Math/Vector2.hpp>
-#include <Nazara/Renderer/ShaderNodes.hpp>
+#include <Nazara/Shader/ShaderNodes.hpp>
 #include <nodes/NodeDataModel>
 #include <QtGui/QPixmap>
 #include <optional>
--- a/src/ShaderNode/DataModels/TextureValue.cpp
+++ b/src/ShaderNode/DataModels/TextureValue.cpp
@@ -2,7 +2,7 @@
 #include <ShaderNode/ShaderGraph.hpp>
 #include <ShaderNode/DataTypes/TextureData.hpp>
 #include <ShaderNode/DataTypes/VecData.hpp>
-#include <Nazara/Renderer/ShaderBuilder.hpp>
+#include <Nazara/Shader/ShaderBuilder.hpp>
 #include <QtWidgets/QFormLayout>

 TextureValue::TextureValue(ShaderGraph& graph) :
--- a/src/ShaderNode/DataModels/VecBinOp.inl
+++ b/src/ShaderNode/DataModels/VecBinOp.inl
@@ -1,5 +1,5 @@
 #include <ShaderNode/DataModels/VecBinOp.hpp>
-#include <Nazara/Renderer/ShaderBuilder.hpp>
+#include <Nazara/Shader/ShaderBuilder.hpp>

 template<Nz::ShaderNodes::BinaryType BinOp>
 VecBinOp<BinOp>::VecBinOp(ShaderGraph& graph) :
--- a/src/ShaderNode/DataModels/VecDot.cpp
+++ b/src/ShaderNode/DataModels/VecDot.cpp
@@ -1,5 +1,5 @@
 #include <ShaderNode/DataModels/VecDot.hpp>
-#include <Nazara/Renderer/ShaderNodes.hpp>
+#include <Nazara/Shader/ShaderNodes.hpp>

 VecDot::VecDot(ShaderGraph& graph) :
 ShaderNode(graph)
--- a/src/ShaderNode/DataModels/VecFloatMul.cpp
+++ b/src/ShaderNode/DataModels/VecFloatMul.cpp
@@ -1,5 +1,5 @@
 #include <ShaderNode/DataModels/VecFloatMul.hpp>
-#include <Nazara/Renderer/ShaderNodes.hpp>
+#include <Nazara/Shader/ShaderNodes.hpp>

 VecFloatMul::VecFloatMul(ShaderGraph& graph) :
 ShaderNode(graph)
--- a/src/ShaderNode/DataModels/VecValue.inl
+++ b/src/ShaderNode/DataModels/VecValue.inl
@@ -1,6 +1,6 @@
 #include <ShaderNode/DataModels/VecValue.hpp>
 #include <Nazara/Core/Algorithm.hpp>
-#include <Nazara/Renderer/ShaderBuilder.hpp>
+#include <Nazara/Shader/ShaderBuilder.hpp>
 #include <ShaderNode/DataTypes/VecData.hpp>
 #include <QtCore/QJsonArray>
 #include <array>
--- a/src/ShaderNode/DataTypes/Matrix4Data.hpp
+++ b/src/ShaderNode/DataTypes/Matrix4Data.hpp
@@ -3,7 +3,7 @@
 #ifndef NAZARA_SHADERNODES_MATRIXDATA_HPP
 #define NAZARA_SHADERNODES_MATRIXDATA_HPP

-#include <Nazara/Renderer/ShaderNodes.hpp>
+#include <Nazara/Shader/ShaderNodes.hpp>
 #include <ShaderNode/Previews/PreviewValues.hpp>
 #include <nodes/NodeData>

--- a/src/ShaderNode/DataTypes/TextureData.hpp
+++ b/src/ShaderNode/DataTypes/TextureData.hpp
@@ -4,7 +4,7 @@
 #define NAZARA_SHADERNODES_TEXTUREDATA_HPP

 #include <ShaderNode/Previews/PreviewValues.hpp>
-#include <Nazara/Renderer/ShaderNodes.hpp>
+#include <Nazara/Shader/ShaderNodes.hpp>
 #include <nodes/NodeData>

 struct TextureData : public QtNodes::NodeData
--- a/src/ShaderNode/DataTypes/VecData.hpp
+++ b/src/ShaderNode/DataTypes/VecData.hpp
@@ -3,7 +3,7 @@
 #ifndef NAZARA_SHADERNODES_VECDATA_HPP
 #define NAZARA_SHADERNODES_VECDATA_HPP

-#include <Nazara/Renderer/ShaderNodes.hpp>
+#include <Nazara/Shader/ShaderNodes.hpp>
 #include <ShaderNode/Previews/PreviewValues.hpp>
 #include <nodes/NodeData>

--- a/src/ShaderNode/ShaderGraph.hpp
+++ b/src/ShaderNode/ShaderGraph.hpp
@@ -4,8 +4,8 @@
 #define NAZARA_SHADERNODES_SHADERGRAPH_HPP

 #include <Nazara/Core/Signal.hpp>
-#include <Nazara/Renderer/Enums.hpp>
-#include <Nazara/Renderer/ShaderNodes.hpp>
+#include <Nazara/Utility/Enums.hpp>
+#include <Nazara/Shader/ShaderNodes.hpp>
 #include <nodes/FlowScene>
 #include <ShaderNode/Enums.hpp>
 #include <ShaderNode/Previews/PreviewModel.hpp>
--- a/src/ShaderNode/Widgets/MainWindow.cpp
+++ b/src/ShaderNode/Widgets/MainWindow.cpp
@@ -1,7 +1,7 @@
 #include <ShaderNode/Widgets/MainWindow.hpp>
 #include <Nazara/Core/File.hpp>
-#include <Nazara/Renderer/GlslWriter.hpp>
-#include <Nazara/Renderer/ShaderAstSerializer.hpp>
+#include <Nazara/Shader/GlslWriter.hpp>
+#include <Nazara/Shader/ShaderAstSerializer.hpp>
 #include <ShaderNode/ShaderGraph.hpp>
 #include <ShaderNode/Widgets/BufferEditor.hpp>
 #include <ShaderNode/Widgets/InputEditor.hpp>