ShaderNode: Make #include explicit

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>