ShaderNode: Make #include explicit

build/scripts/tools/shadernodes.lua

@@ -12,7 +12,7 @@ TOOL.Defines = {
 TOOL.Includes = {
 	"../include",
 	"../extlibs/include",
-	"../src/ShaderNode",
+	"../src",
 	[[E:\Qt\5.14.1\msvc2017_64\include]],
 	[[E:\Qt\5.14.1\msvc2017_64\include\QtCore]],
 	[[E:\Qt\5.14.1\msvc2017_64\include\QtGui]],

src/ShaderNode/DataModels/Cast.hpp

@@ -6,9 +6,9 @@
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QLabel>
-#include <ShaderGraph.hpp>
-#include <DataModels/ShaderNode.hpp>
-#include <DataModels/VecValue.hpp>
+#include <ShaderNode/ShaderGraph.hpp>
+#include <ShaderNode/DataModels/ShaderNode.hpp>
+#include <ShaderNode/DataModels/VecValue.hpp>
 #include <array>
 
 template<typename From, typename To>
@@ -54,6 +54,6 @@ using CastVec3ToVec4 = CastVec<Vec3Data, Vec4Data>;
 using CastVec4ToVec2 = CastVec<Vec4Data, Vec2Data>;
 using CastVec4ToVec3 = CastVec<Vec4Data, Vec3Data>;
 
-#include <DataModels/Cast.inl>
+#include <ShaderNode/DataModels/Cast.inl>
 
 #endif

src/ShaderNode/DataModels/Cast.inl

@@ -1,4 +1,4 @@
-#include <DataModels/Cast.hpp>
+#include <ShaderNode/DataModels/Cast.hpp>
 #include <Nazara/Renderer/ShaderBuilder.hpp>
 #include <stdexcept>
 

src/ShaderNode/DataModels/FragmentOutput.cpp

@@ -1,6 +1,6 @@
-#include <DataModels/FragmentOutput.hpp>
+#include <ShaderNode/DataModels/FragmentOutput.hpp>
 #include <Nazara/Renderer/ShaderBuilder.hpp>
-#include <DataModels/VecValue.hpp>
+#include <ShaderNode/DataModels/VecValue.hpp>
 
 Nz::ShaderAst::ExpressionPtr FragmentOutput::GetExpression(Nz::ShaderAst::ExpressionPtr* expressions, std::size_t count) const
 {

src/ShaderNode/DataModels/FragmentOutput.hpp

@@ -3,7 +3,7 @@
 #ifndef NAZARA_SHADERNODES_FRAGMENTOUTPUT_HPP
 #define NAZARA_SHADERNODES_FRAGMENTOUTPUT_HPP
 
-#include <DataModels/ShaderNode.hpp>
+#include <ShaderNode/DataModels/ShaderNode.hpp>
 #include <QtWidgets/QDoubleSpinBox>
 #include <QtWidgets/QFormLayout>
 
@@ -28,6 +28,6 @@ class FragmentOutput : public ShaderNode
 
 };
 
-#include <DataModels/FragmentOutput.inl>
+#include <ShaderNode/DataModels/FragmentOutput.inl>
 
 #endif

src/ShaderNode/DataModels/FragmentOutput.inl

@@ -1,4 +1,4 @@
-#include <DataModels/FragmentOutput.hpp>
+#include <ShaderNode/DataModels/FragmentOutput.hpp>
 
 inline FragmentOutput::FragmentOutput(ShaderGraph& graph) :
 ShaderNode(graph)

src/ShaderNode/DataModels/InputValue.cpp

@@ -1,6 +1,6 @@
-#include <ShaderGraph.hpp>
-#include <DataModels/InputValue.hpp>
-#include <DataModels/VecValue.hpp>
+#include <ShaderNode/ShaderGraph.hpp>
+#include <ShaderNode/DataModels/InputValue.hpp>
+#include <ShaderNode/DataModels/VecValue.hpp>
 #include <Nazara/Renderer/ShaderBuilder.hpp>
 
 InputValue::InputValue(ShaderGraph& graph) :

src/ShaderNode/DataModels/InputValue.hpp

@@ -6,8 +6,8 @@
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QLabel>
-#include <ShaderGraph.hpp>
-#include <DataModels/ShaderNode.hpp>
+#include <ShaderNode/ShaderGraph.hpp>
+#include <ShaderNode/DataModels/ShaderNode.hpp>
 #include <array>
 
 class InputValue : public ShaderNode
@@ -42,6 +42,6 @@ class InputValue : public ShaderNode
 		QVBoxLayout* m_layout;
 };
 
-#include <DataModels/InputValue.inl>
+#include <ShaderNode/DataModels/InputValue.inl>
 
 #endif

src/ShaderNode/DataModels/InputValue.inl

@@ -1,2 +1,2 @@
-#include <DataModels/InputValue.hpp>
+#include <ShaderNode/DataModels/InputValue.hpp>
 #include <array>

src/ShaderNode/DataModels/SampleTexture.cpp

@@ -1,6 +1,6 @@
-#include <ShaderGraph.hpp>
-#include <DataModels/SampleTexture.hpp>
-#include <DataModels/VecValue.hpp>
+#include <ShaderNode/ShaderGraph.hpp>
+#include <ShaderNode/DataModels/SampleTexture.hpp>
+#include <ShaderNode/DataModels/VecValue.hpp>
 #include <Nazara/Renderer/ShaderBuilder.hpp>
 
 SampleTexture::SampleTexture(ShaderGraph& graph) :

src/ShaderNode/DataModels/SampleTexture.hpp

@@ -6,9 +6,9 @@
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QLabel>
-#include <ShaderGraph.hpp>
-#include <DataModels/ShaderNode.hpp>
-#include <DataModels/VecValue.hpp>
+#include <ShaderNode/ShaderGraph.hpp>
+#include <ShaderNode/DataModels/ShaderNode.hpp>
+#include <ShaderNode/DataModels/VecValue.hpp>
 #include <array>
 
 class SampleTexture : public ShaderNode
@@ -53,6 +53,6 @@ class SampleTexture : public ShaderNode
 		QVBoxLayout* m_layout;
 };
 
-#include <DataModels/SampleTexture.inl>
+#include <ShaderNode/DataModels/SampleTexture.inl>
 
 #endif

src/ShaderNode/DataModels/SampleTexture.inl

@@ -1,2 +1,2 @@
-#include <DataModels/SampleTexture.hpp>
+#include <ShaderNode/DataModels/SampleTexture.hpp>
 #include <array>

src/ShaderNode/DataModels/ShaderNode.cpp

@@ -1,4 +1,4 @@
-#include <DataModels/ShaderNode.hpp>
+#include <ShaderNode/DataModels/ShaderNode.hpp>
 
 void ShaderNode::setInData(std::shared_ptr<QtNodes::NodeData>, int)
 {

src/ShaderNode/DataModels/ShaderNode.hpp

@@ -23,6 +23,6 @@ class ShaderNode : public QtNodes::NodeDataModel
 		ShaderGraph& m_graph;
 };
 
-#include <DataModels/ShaderNode.inl>
+#include <ShaderNode/DataModels/ShaderNode.inl>
 
 #endif

src/ShaderNode/DataModels/ShaderNode.inl

@@ -1,4 +1,4 @@
-#include <DataModels/ShaderNode.hpp>
+#include <ShaderNode/DataModels/ShaderNode.hpp>
 
 inline ShaderNode::ShaderNode(ShaderGraph& graph) :
 m_graph(graph)

src/ShaderNode/DataModels/VecBinOp.cpp

@@ -1 +1 @@
-#include <DataModels/VecBinOp.hpp>
+#include <ShaderNode/DataModels/VecBinOp.hpp>

src/ShaderNode/DataModels/VecBinOp.hpp

@@ -3,8 +3,8 @@
 #ifndef NAZARA_SHADERNODES_VECBINOP_HPP
 #define NAZARA_SHADERNODES_VECBINOP_HPP
 
-#include <DataModels/ShaderNode.hpp>
-#include <DataModels/VecValue.hpp>
+#include <ShaderNode/DataModels/ShaderNode.hpp>
+#include <ShaderNode/DataModels/VecValue.hpp>
 
 template<typename Data, Nz::ShaderAst::BinaryType BinOp>
 class VecBinOp : public ShaderNode
@@ -83,6 +83,6 @@ using Vec2Sub = VecSub<Vec2Data>;
 using Vec3Sub = VecSub<Vec3Data>;
 using Vec4Sub = VecSub<Vec4Data>;
 
-#include <DataModels/VecBinOp.inl>
+#include <ShaderNode/DataModels/VecBinOp.inl>
 
 #endif

src/ShaderNode/DataModels/VecBinOp.inl

@@ -1,4 +1,4 @@
-#include <DataModels/VecBinOp.hpp>
+#include <ShaderNode/DataModels/VecBinOp.hpp>
 #include <Nazara/Renderer/ShaderBuilder.hpp>
 
 template<typename Data, Nz::ShaderAst::BinaryType BinOp>

src/ShaderNode/DataModels/VecData.cpp

@@ -1 +1 @@
-#include <DataModels/VecData.hpp>
+#include <ShaderNode/DataModels/VecData.hpp>

src/ShaderNode/DataModels/VecData.hpp

@@ -62,6 +62,6 @@ struct Vec4Data : public VecData
 	}
 };
 
-#include <DataModels/VecData.inl>
+#include <ShaderNode/DataModels/VecData.inl>
 
 #endif

src/ShaderNode/DataModels/VecData.inl

@@ -1,4 +1,4 @@
-#include <DataModels/VecData.hpp>
+#include <ShaderNode/DataModels/VecData.hpp>
 
 inline VecData::VecData() :
 preview(64, 64, QImage::Format_RGBA8888)

src/ShaderNode/DataModels/VecValue.cpp

@@ -1 +1 @@
-#include <DataModels/VecValue.hpp>
+#include <ShaderNode/DataModels/VecValue.hpp>

src/ShaderNode/DataModels/VecValue.hpp

@@ -7,8 +7,8 @@
 #include <QtWidgets/QDoubleSpinBox>
 #include <QtWidgets/QFormLayout>
 #include <QtWidgets/QLabel>
-#include <DataModels/ShaderNode.hpp>
-#include <DataModels/VecData.hpp>
+#include <ShaderNode/DataModels/ShaderNode.hpp>
+#include <ShaderNode/DataModels/VecData.hpp>
 #include <array>
 
 template<std::size_t N>
@@ -71,6 +71,6 @@ using Vec2Value = VecValue<Vec2Data>;
 using Vec3Value = VecValue<Vec3Data>;
 using Vec4Value = VecValue<Vec4Data>;
 
-#include <DataModels/VecValue.inl>
+#include <ShaderNode/DataModels/VecValue.inl>
 
 #endif

src/ShaderNode/DataModels/VecValue.inl

@@ -1,6 +1,6 @@
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Renderer/ShaderBuilder.hpp>
-#include <DataModels/VecValue.hpp>
+#include <ShaderNode/DataModels/VecValue.hpp>
 #include <array>
 #include <tuple>
 

src/ShaderNode/Enums.cpp

@@ -1,4 +1,4 @@
-#include <Enums.hpp>
+#include <ShaderNode/Enums.hpp>
 #include <cassert>
 
 const char* EnumToString(InputRole role)

src/ShaderNode/Enums.hpp

@@ -43,6 +43,6 @@ const char* EnumToString(InputRole role);
 const char* EnumToString(InputType input);
 const char* EnumToString(TextureType textureType);
 
-#include <Enums.inl>
+#include <ShaderNode/Enums.inl>
 
 #endif

src/ShaderNode/Enums.inl

@@ -1 +1 @@
-#include <Enums.hpp>
+#include <ShaderNode/Enums.hpp>

src/ShaderNode/Previews/PreviewModel.cpp

@@ -1,3 +1,3 @@
-#include <Previews/PreviewModel.hpp>
+#include <ShaderNode/Previews/PreviewModel.hpp>
 
 PreviewModel::~PreviewModel() = default;

src/ShaderNode/Previews/PreviewModel.hpp

@@ -3,7 +3,7 @@
 #ifndef NAZARA_SHADERNODES_PREVIEWMODEL_HPP
 #define NAZARA_SHADERNODES_PREVIEWMODEL_HPP
 
-#include <Enums.hpp>
+#include <ShaderNode/Enums.hpp>
 
 class QImage;
 
@@ -16,6 +16,6 @@ class PreviewModel
 		virtual QImage GetImage(InputRole role, std::size_t roleIndex) const = 0;
 };
 
-#include <Previews/PreviewModel.inl>
+#include <ShaderNode/Previews/PreviewModel.inl>
 
 #endif

src/ShaderNode/Previews/PreviewModel.inl

@@ -1 +1 @@
-#include <Previews/PreviewModel.hpp>
+#include <ShaderNode/Previews/PreviewModel.hpp>

src/ShaderNode/Previews/QuadPreview.cpp

@@ -1,4 +1,4 @@
-#include <Previews/QuadPreview.hpp>
+#include <ShaderNode/Previews/QuadPreview.hpp>
 #include <cassert>
 
 QImage QuadPreview::GetImage(InputRole role, std::size_t roleIndex) const

src/ShaderNode/Previews/QuadPreview.hpp

@@ -3,7 +3,7 @@
 #ifndef NAZARA_SHADERNODES_QUADPREVIEW_HPP
 #define NAZARA_SHADERNODES_QUADPREVIEW_HPP
 
-#include <Previews/PreviewModel.hpp>
+#include <ShaderNode/Previews/PreviewModel.hpp>
 #include <QtGui/QImage>
 
 class QuadPreview : public PreviewModel
@@ -15,6 +15,6 @@ class QuadPreview : public PreviewModel
 		QImage GetImage(InputRole role, std::size_t roleIndex) const override;
 };
 
-#include <Previews/QuadPreview.inl>
+#include <ShaderNode/Previews/QuadPreview.inl>
 
 #endif

src/ShaderNode/Previews/QuadPreview.inl

@@ -1 +1 @@
-#include <Previews/QuadPreview.hpp>
+#include <ShaderNode/Previews/QuadPreview.hpp>

src/ShaderNode/ShaderGraph.cpp

@@ -1,13 +1,13 @@
-#include <ShaderGraph.hpp>
+#include <ShaderNode/ShaderGraph.hpp>
 #include <Nazara/Core/StackArray.hpp>
-#include <DataModels/Cast.hpp>
-#include <DataModels/FragmentOutput.hpp>
-#include <DataModels/InputValue.hpp>
-#include <DataModels/SampleTexture.hpp>
-#include <DataModels/ShaderNode.hpp>
-#include <DataModels/VecBinOp.hpp>
-#include <DataModels/VecValue.hpp>
-#include <Previews/QuadPreview.hpp>
+#include <ShaderNode/DataModels/Cast.hpp>
+#include <ShaderNode/DataModels/FragmentOutput.hpp>
+#include <ShaderNode/DataModels/InputValue.hpp>
+#include <ShaderNode/DataModels/SampleTexture.hpp>
+#include <ShaderNode/DataModels/ShaderNode.hpp>
+#include <ShaderNode/DataModels/VecBinOp.hpp>
+#include <ShaderNode/DataModels/VecValue.hpp>
+#include <ShaderNode/Previews/QuadPreview.hpp>
 #include <QtCore/QDebug>
 #include <nodes/Node>
 #include <nodes/NodeData>

src/ShaderNode/ShaderGraph.hpp

@@ -6,8 +6,8 @@
 #include <Nazara/Core/Signal.hpp>
 #include <Nazara/Renderer/ShaderAst.hpp>
 #include <nodes/FlowScene>
-#include <Enums.hpp>
-#include <Previews/PreviewModel.hpp>
+#include <ShaderNode/Enums.hpp>
+#include <ShaderNode/Previews/PreviewModel.hpp>
 #include <string>
 #include <vector>
 
@@ -64,6 +64,6 @@ class ShaderGraph
 		std::unique_ptr<PreviewModel> m_previewModel;
 };
 
-#include <ShaderGraph.inl>
+#include <ShaderNode/ShaderGraph.inl>
 
 #endif

src/ShaderNode/ShaderGraph.inl

@@ -1,4 +1,4 @@
-#include <ShaderGraph.hpp>
+#include <ShaderNode/ShaderGraph.hpp>
 
 inline auto ShaderGraph::GetInput(std::size_t inputIndex) const -> const InputEntry&
 {

src/ShaderNode/Widgets/InputEditDialog.cpp

@@ -1,4 +1,4 @@
-#include <Widgets/InputEditDialog.hpp>
+#include <ShaderNode/Widgets/InputEditDialog.hpp>
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QDialogButtonBox>
 #include <QtWidgets/QFormLayout>

src/ShaderNode/Widgets/InputEditDialog.hpp

@@ -3,7 +3,7 @@
 #ifndef NAZARA_SHADERNODES_INPUTEDITDIALOG_HPP
 #define NAZARA_SHADERNODES_INPUTEDITDIALOG_HPP
 
-#include <Enums.hpp>
+#include <ShaderNode/Enums.hpp>
 #include <QtWidgets/QDialog>
 
 class QComboBox;
@@ -36,6 +36,6 @@ class InputEditDialog : public QDialog
 		QSpinBox* m_roleIndex;
 };
 
-#include <Widgets/InputEditor.inl>
+#include <ShaderNode/Widgets/InputEditor.inl>
 
 #endif

src/ShaderNode/Widgets/InputEditDialog.inl

@@ -1 +1 @@
-#include <Widgets/InputEditor.hpp>
+#include <ShaderNode/Widgets/InputEditor.hpp>

src/ShaderNode/Widgets/InputEditor.cpp

@@ -1,6 +1,6 @@
-#include <Widgets/InputEditor.hpp>
-#include <Widgets/InputEditDialog.hpp>
-#include <ShaderGraph.hpp>
+#include <ShaderNode/Widgets/InputEditor.hpp>
+#include <ShaderNode/Widgets/InputEditDialog.hpp>
+#include <ShaderNode/ShaderGraph.hpp>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QPushButton>

src/ShaderNode/Widgets/InputEditor.hpp

@@ -3,7 +3,7 @@
 #ifndef NAZARA_SHADERNODES_INPUTEDITOR_HPP
 #define NAZARA_SHADERNODES_INPUTEDITOR_HPP
 
-#include <ShaderGraph.hpp>
+#include <ShaderNode/ShaderGraph.hpp>
 #include <QtWidgets/QWidget>
 #include <optional>
 
@@ -34,6 +34,6 @@ class InputEditor : public QWidget
 		QVBoxLayout* m_layout;
 };
 
-#include <Widgets/InputEditor.inl>
+#include <ShaderNode/Widgets/InputEditor.inl>
 
 #endif

src/ShaderNode/Widgets/InputEditor.inl

@@ -1 +1 @@
-#include <Widgets/InputEditor.hpp>
+#include <ShaderNode/Widgets/InputEditor.hpp>

src/ShaderNode/Widgets/MainWindow.cpp

@@ -1,8 +1,8 @@
-#include <Widgets/MainWindow.hpp>
+#include <ShaderNode/Widgets/MainWindow.hpp>
 #include <Nazara/Renderer/GlslWriter.hpp>
-#include <ShaderGraph.hpp>
-#include <Widgets/InputEditor.hpp>
-#include <Widgets/TextureEditor.hpp>
+#include <ShaderNode/ShaderGraph.hpp>
+#include <ShaderNode/Widgets/InputEditor.hpp>
+#include <ShaderNode/Widgets/TextureEditor.hpp>
 #include <nodes/FlowView>
 #include <QtWidgets/QDockWidget>
 #include <QtWidgets/QMenuBar>

src/ShaderNode/Widgets/MainWindow.hpp

@@ -4,7 +4,7 @@
 #define NAZARA_SHADERNODES_MAINWINDOW_HPP
 
 #include <QtWidgets/QMainWindow>
-#include <DataModels/ShaderNode.hpp>
+#include <ShaderNode/DataModels/ShaderNode.hpp>
 
 class ShaderGraph;
 
@@ -21,6 +21,6 @@ class MainWindow : public QMainWindow
 		ShaderGraph& m_shaderGraph;
 };
 
-#include <Widgets/MainWindow.inl>
+#include <ShaderNode/Widgets/MainWindow.inl>
 
 #endif

src/ShaderNode/Widgets/MainWindow.inl

@@ -1 +1 @@
-#include <Widgets/MainWindow.hpp>
+#include <ShaderNode/Widgets/MainWindow.hpp>

src/ShaderNode/Widgets/TextureEditor.cpp

@@ -1,5 +1,5 @@
-#include <Widgets/TextureEditor.hpp>
-#include <ShaderGraph.hpp>
+#include <ShaderNode/Widgets/TextureEditor.hpp>
+#include <ShaderNode/ShaderGraph.hpp>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QPushButton>

src/ShaderNode/Widgets/TextureEditor.hpp

@@ -3,7 +3,7 @@
 #ifndef NAZARA_SHADERNODES_TEXTUREEDITOR_HPP
 #define NAZARA_SHADERNODES_TEXTUREEDITOR_HPP
 
-#include <ShaderGraph.hpp>
+#include <ShaderNode/ShaderGraph.hpp>
 #include <QtWidgets/QWidget>
 #include <optional>
 
@@ -35,6 +35,6 @@ class TextureEditor : public QWidget
 		QVBoxLayout* m_layout;
 };
 
-#include <Widgets/TextureEditor.inl>
+#include <ShaderNode/Widgets/TextureEditor.inl>
 
 #endif

src/ShaderNode/Widgets/TextureEditor.inl

@@ -1 +1 @@
-#include <Widgets/TextureEditor.hpp>
+#include <ShaderNode/Widgets/TextureEditor.hpp>

src/ShaderNode/main.cpp

@@ -1,6 +1,6 @@
 #include <QtWidgets/QApplication>
-#include <ShaderGraph.hpp>
-#include <Widgets/MainWindow.hpp>
+#include <ShaderNode/ShaderGraph.hpp>
+#include <ShaderNode/Widgets/MainWindow.hpp>
 #include <iostream>
 
 int main(int argc, char* argv[])