diff --git a/build/scripts/tools/shadernodes.lua b/build/scripts/tools/shadernodes.lua index 33f9628e9..415b71c75 100644 --- a/build/scripts/tools/shadernodes.lua +++ b/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]], diff --git a/src/ShaderNode/DataModels/Cast.hpp b/src/ShaderNode/DataModels/Cast.hpp index f17cff625..a6709bd2d 100644 --- a/src/ShaderNode/DataModels/Cast.hpp +++ b/src/ShaderNode/DataModels/Cast.hpp @@ -6,9 +6,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include template @@ -54,6 +54,6 @@ using CastVec3ToVec4 = CastVec; using CastVec4ToVec2 = CastVec; using CastVec4ToVec3 = CastVec; -#include +#include #endif diff --git a/src/ShaderNode/DataModels/Cast.inl b/src/ShaderNode/DataModels/Cast.inl index 9e70e9f8b..0133d6cc7 100644 --- a/src/ShaderNode/DataModels/Cast.inl +++ b/src/ShaderNode/DataModels/Cast.inl @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/ShaderNode/DataModels/FragmentOutput.cpp b/src/ShaderNode/DataModels/FragmentOutput.cpp index 15244e0d8..86731a0f4 100644 --- a/src/ShaderNode/DataModels/FragmentOutput.cpp +++ b/src/ShaderNode/DataModels/FragmentOutput.cpp @@ -1,6 +1,6 @@ -#include +#include #include -#include +#include Nz::ShaderAst::ExpressionPtr FragmentOutput::GetExpression(Nz::ShaderAst::ExpressionPtr* expressions, std::size_t count) const { diff --git a/src/ShaderNode/DataModels/FragmentOutput.hpp b/src/ShaderNode/DataModels/FragmentOutput.hpp index a682d40a4..ab89ae419 100644 --- a/src/ShaderNode/DataModels/FragmentOutput.hpp +++ b/src/ShaderNode/DataModels/FragmentOutput.hpp @@ -3,7 +3,7 @@ #ifndef NAZARA_SHADERNODES_FRAGMENTOUTPUT_HPP #define NAZARA_SHADERNODES_FRAGMENTOUTPUT_HPP -#include +#include #include #include @@ -28,6 +28,6 @@ class FragmentOutput : public ShaderNode }; -#include +#include #endif diff --git a/src/ShaderNode/DataModels/FragmentOutput.inl b/src/ShaderNode/DataModels/FragmentOutput.inl index 539b8091f..c809a587d 100644 --- a/src/ShaderNode/DataModels/FragmentOutput.inl +++ b/src/ShaderNode/DataModels/FragmentOutput.inl @@ -1,4 +1,4 @@ -#include +#include inline FragmentOutput::FragmentOutput(ShaderGraph& graph) : ShaderNode(graph) diff --git a/src/ShaderNode/DataModels/InputValue.cpp b/src/ShaderNode/DataModels/InputValue.cpp index 1a1bdfb5a..f2ae0eaa8 100644 --- a/src/ShaderNode/DataModels/InputValue.cpp +++ b/src/ShaderNode/DataModels/InputValue.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include InputValue::InputValue(ShaderGraph& graph) : diff --git a/src/ShaderNode/DataModels/InputValue.hpp b/src/ShaderNode/DataModels/InputValue.hpp index 63e896adf..273155cc4 100644 --- a/src/ShaderNode/DataModels/InputValue.hpp +++ b/src/ShaderNode/DataModels/InputValue.hpp @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include #include class InputValue : public ShaderNode @@ -42,6 +42,6 @@ class InputValue : public ShaderNode QVBoxLayout* m_layout; }; -#include +#include #endif diff --git a/src/ShaderNode/DataModels/InputValue.inl b/src/ShaderNode/DataModels/InputValue.inl index ff350c7c4..344e3db41 100644 --- a/src/ShaderNode/DataModels/InputValue.inl +++ b/src/ShaderNode/DataModels/InputValue.inl @@ -1,2 +1,2 @@ -#include +#include #include diff --git a/src/ShaderNode/DataModels/SampleTexture.cpp b/src/ShaderNode/DataModels/SampleTexture.cpp index d7ae63713..81982c83a 100644 --- a/src/ShaderNode/DataModels/SampleTexture.cpp +++ b/src/ShaderNode/DataModels/SampleTexture.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include SampleTexture::SampleTexture(ShaderGraph& graph) : diff --git a/src/ShaderNode/DataModels/SampleTexture.hpp b/src/ShaderNode/DataModels/SampleTexture.hpp index 3621d0c14..7697d296f 100644 --- a/src/ShaderNode/DataModels/SampleTexture.hpp +++ b/src/ShaderNode/DataModels/SampleTexture.hpp @@ -6,9 +6,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include class SampleTexture : public ShaderNode @@ -53,6 +53,6 @@ class SampleTexture : public ShaderNode QVBoxLayout* m_layout; }; -#include +#include #endif diff --git a/src/ShaderNode/DataModels/SampleTexture.inl b/src/ShaderNode/DataModels/SampleTexture.inl index 78d12b21d..292805b16 100644 --- a/src/ShaderNode/DataModels/SampleTexture.inl +++ b/src/ShaderNode/DataModels/SampleTexture.inl @@ -1,2 +1,2 @@ -#include +#include #include diff --git a/src/ShaderNode/DataModels/ShaderNode.cpp b/src/ShaderNode/DataModels/ShaderNode.cpp index 1f45d3ca5..aeb143452 100644 --- a/src/ShaderNode/DataModels/ShaderNode.cpp +++ b/src/ShaderNode/DataModels/ShaderNode.cpp @@ -1,4 +1,4 @@ -#include +#include void ShaderNode::setInData(std::shared_ptr, int) { diff --git a/src/ShaderNode/DataModels/ShaderNode.hpp b/src/ShaderNode/DataModels/ShaderNode.hpp index d33fc632d..3d73d7330 100644 --- a/src/ShaderNode/DataModels/ShaderNode.hpp +++ b/src/ShaderNode/DataModels/ShaderNode.hpp @@ -23,6 +23,6 @@ class ShaderNode : public QtNodes::NodeDataModel ShaderGraph& m_graph; }; -#include +#include #endif diff --git a/src/ShaderNode/DataModels/ShaderNode.inl b/src/ShaderNode/DataModels/ShaderNode.inl index a244d78b5..defa5aea1 100644 --- a/src/ShaderNode/DataModels/ShaderNode.inl +++ b/src/ShaderNode/DataModels/ShaderNode.inl @@ -1,4 +1,4 @@ -#include +#include inline ShaderNode::ShaderNode(ShaderGraph& graph) : m_graph(graph) diff --git a/src/ShaderNode/DataModels/VecBinOp.cpp b/src/ShaderNode/DataModels/VecBinOp.cpp index dd13b5b56..fd2e0d5c1 100644 --- a/src/ShaderNode/DataModels/VecBinOp.cpp +++ b/src/ShaderNode/DataModels/VecBinOp.cpp @@ -1 +1 @@ -#include +#include diff --git a/src/ShaderNode/DataModels/VecBinOp.hpp b/src/ShaderNode/DataModels/VecBinOp.hpp index 31ae4732e..ef3ee4bca 100644 --- a/src/ShaderNode/DataModels/VecBinOp.hpp +++ b/src/ShaderNode/DataModels/VecBinOp.hpp @@ -3,8 +3,8 @@ #ifndef NAZARA_SHADERNODES_VECBINOP_HPP #define NAZARA_SHADERNODES_VECBINOP_HPP -#include -#include +#include +#include template class VecBinOp : public ShaderNode @@ -83,6 +83,6 @@ using Vec2Sub = VecSub; using Vec3Sub = VecSub; using Vec4Sub = VecSub; -#include +#include #endif diff --git a/src/ShaderNode/DataModels/VecBinOp.inl b/src/ShaderNode/DataModels/VecBinOp.inl index 5d5cfc251..4159193fb 100644 --- a/src/ShaderNode/DataModels/VecBinOp.inl +++ b/src/ShaderNode/DataModels/VecBinOp.inl @@ -1,4 +1,4 @@ -#include +#include #include template diff --git a/src/ShaderNode/DataModels/VecData.cpp b/src/ShaderNode/DataModels/VecData.cpp index 2cf74c1e6..376c8ea5c 100644 --- a/src/ShaderNode/DataModels/VecData.cpp +++ b/src/ShaderNode/DataModels/VecData.cpp @@ -1 +1 @@ -#include +#include diff --git a/src/ShaderNode/DataModels/VecData.hpp b/src/ShaderNode/DataModels/VecData.hpp index ad44d68b1..8a1b152f5 100644 --- a/src/ShaderNode/DataModels/VecData.hpp +++ b/src/ShaderNode/DataModels/VecData.hpp @@ -62,6 +62,6 @@ struct Vec4Data : public VecData } }; -#include +#include #endif diff --git a/src/ShaderNode/DataModels/VecData.inl b/src/ShaderNode/DataModels/VecData.inl index 92765c835..6c2d0379e 100644 --- a/src/ShaderNode/DataModels/VecData.inl +++ b/src/ShaderNode/DataModels/VecData.inl @@ -1,4 +1,4 @@ -#include +#include inline VecData::VecData() : preview(64, 64, QImage::Format_RGBA8888) diff --git a/src/ShaderNode/DataModels/VecValue.cpp b/src/ShaderNode/DataModels/VecValue.cpp index 807df2955..ede5bdfac 100644 --- a/src/ShaderNode/DataModels/VecValue.cpp +++ b/src/ShaderNode/DataModels/VecValue.cpp @@ -1 +1 @@ -#include +#include diff --git a/src/ShaderNode/DataModels/VecValue.hpp b/src/ShaderNode/DataModels/VecValue.hpp index 77656f373..7e8db4d88 100644 --- a/src/ShaderNode/DataModels/VecValue.hpp +++ b/src/ShaderNode/DataModels/VecValue.hpp @@ -7,8 +7,8 @@ #include #include #include -#include -#include +#include +#include #include template @@ -71,6 +71,6 @@ using Vec2Value = VecValue; using Vec3Value = VecValue; using Vec4Value = VecValue; -#include +#include #endif diff --git a/src/ShaderNode/DataModels/VecValue.inl b/src/ShaderNode/DataModels/VecValue.inl index 3ab11cd37..45138b83f 100644 --- a/src/ShaderNode/DataModels/VecValue.inl +++ b/src/ShaderNode/DataModels/VecValue.inl @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include diff --git a/src/ShaderNode/Enums.cpp b/src/ShaderNode/Enums.cpp index f280ce793..22f21c972 100644 --- a/src/ShaderNode/Enums.cpp +++ b/src/ShaderNode/Enums.cpp @@ -1,4 +1,4 @@ -#include +#include #include const char* EnumToString(InputRole role) diff --git a/src/ShaderNode/Enums.hpp b/src/ShaderNode/Enums.hpp index 6a7a34336..b8e944c5c 100644 --- a/src/ShaderNode/Enums.hpp +++ b/src/ShaderNode/Enums.hpp @@ -43,6 +43,6 @@ const char* EnumToString(InputRole role); const char* EnumToString(InputType input); const char* EnumToString(TextureType textureType); -#include +#include #endif diff --git a/src/ShaderNode/Enums.inl b/src/ShaderNode/Enums.inl index a23a54efb..243d12205 100644 --- a/src/ShaderNode/Enums.inl +++ b/src/ShaderNode/Enums.inl @@ -1 +1 @@ -#include +#include diff --git a/src/ShaderNode/Previews/PreviewModel.cpp b/src/ShaderNode/Previews/PreviewModel.cpp index 845c19fe2..d4ab52386 100644 --- a/src/ShaderNode/Previews/PreviewModel.cpp +++ b/src/ShaderNode/Previews/PreviewModel.cpp @@ -1,3 +1,3 @@ -#include +#include PreviewModel::~PreviewModel() = default; diff --git a/src/ShaderNode/Previews/PreviewModel.hpp b/src/ShaderNode/Previews/PreviewModel.hpp index 138374ea4..6ed8ec3ef 100644 --- a/src/ShaderNode/Previews/PreviewModel.hpp +++ b/src/ShaderNode/Previews/PreviewModel.hpp @@ -3,7 +3,7 @@ #ifndef NAZARA_SHADERNODES_PREVIEWMODEL_HPP #define NAZARA_SHADERNODES_PREVIEWMODEL_HPP -#include +#include class QImage; @@ -16,6 +16,6 @@ class PreviewModel virtual QImage GetImage(InputRole role, std::size_t roleIndex) const = 0; }; -#include +#include #endif diff --git a/src/ShaderNode/Previews/PreviewModel.inl b/src/ShaderNode/Previews/PreviewModel.inl index d5f2e699b..f4dccb3fa 100644 --- a/src/ShaderNode/Previews/PreviewModel.inl +++ b/src/ShaderNode/Previews/PreviewModel.inl @@ -1 +1 @@ -#include +#include diff --git a/src/ShaderNode/Previews/QuadPreview.cpp b/src/ShaderNode/Previews/QuadPreview.cpp index a518287fd..55ae86a52 100644 --- a/src/ShaderNode/Previews/QuadPreview.cpp +++ b/src/ShaderNode/Previews/QuadPreview.cpp @@ -1,4 +1,4 @@ -#include +#include #include QImage QuadPreview::GetImage(InputRole role, std::size_t roleIndex) const diff --git a/src/ShaderNode/Previews/QuadPreview.hpp b/src/ShaderNode/Previews/QuadPreview.hpp index f193e99d0..6c980ae34 100644 --- a/src/ShaderNode/Previews/QuadPreview.hpp +++ b/src/ShaderNode/Previews/QuadPreview.hpp @@ -3,7 +3,7 @@ #ifndef NAZARA_SHADERNODES_QUADPREVIEW_HPP #define NAZARA_SHADERNODES_QUADPREVIEW_HPP -#include +#include #include class QuadPreview : public PreviewModel @@ -15,6 +15,6 @@ class QuadPreview : public PreviewModel QImage GetImage(InputRole role, std::size_t roleIndex) const override; }; -#include +#include #endif diff --git a/src/ShaderNode/Previews/QuadPreview.inl b/src/ShaderNode/Previews/QuadPreview.inl index 01178d2d2..b3e26a0ab 100644 --- a/src/ShaderNode/Previews/QuadPreview.inl +++ b/src/ShaderNode/Previews/QuadPreview.inl @@ -1 +1 @@ -#include +#include diff --git a/src/ShaderNode/ShaderGraph.cpp b/src/ShaderNode/ShaderGraph.cpp index be77909de..e29c0129f 100644 --- a/src/ShaderNode/ShaderGraph.cpp +++ b/src/ShaderNode/ShaderGraph.cpp @@ -1,13 +1,13 @@ -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ShaderNode/ShaderGraph.hpp b/src/ShaderNode/ShaderGraph.hpp index dda8dba20..aa2188f16 100644 --- a/src/ShaderNode/ShaderGraph.hpp +++ b/src/ShaderNode/ShaderGraph.hpp @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -64,6 +64,6 @@ class ShaderGraph std::unique_ptr m_previewModel; }; -#include +#include #endif diff --git a/src/ShaderNode/ShaderGraph.inl b/src/ShaderNode/ShaderGraph.inl index fb0a9e556..100cd822e 100644 --- a/src/ShaderNode/ShaderGraph.inl +++ b/src/ShaderNode/ShaderGraph.inl @@ -1,4 +1,4 @@ -#include +#include inline auto ShaderGraph::GetInput(std::size_t inputIndex) const -> const InputEntry& { diff --git a/src/ShaderNode/Widgets/InputEditDialog.cpp b/src/ShaderNode/Widgets/InputEditDialog.cpp index d9642966c..71e6b2298 100644 --- a/src/ShaderNode/Widgets/InputEditDialog.cpp +++ b/src/ShaderNode/Widgets/InputEditDialog.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/ShaderNode/Widgets/InputEditDialog.hpp b/src/ShaderNode/Widgets/InputEditDialog.hpp index 829697049..ef96d118c 100644 --- a/src/ShaderNode/Widgets/InputEditDialog.hpp +++ b/src/ShaderNode/Widgets/InputEditDialog.hpp @@ -3,7 +3,7 @@ #ifndef NAZARA_SHADERNODES_INPUTEDITDIALOG_HPP #define NAZARA_SHADERNODES_INPUTEDITDIALOG_HPP -#include +#include #include class QComboBox; @@ -36,6 +36,6 @@ class InputEditDialog : public QDialog QSpinBox* m_roleIndex; }; -#include +#include #endif diff --git a/src/ShaderNode/Widgets/InputEditDialog.inl b/src/ShaderNode/Widgets/InputEditDialog.inl index a480716aa..db2681e5c 100644 --- a/src/ShaderNode/Widgets/InputEditDialog.inl +++ b/src/ShaderNode/Widgets/InputEditDialog.inl @@ -1 +1 @@ -#include +#include diff --git a/src/ShaderNode/Widgets/InputEditor.cpp b/src/ShaderNode/Widgets/InputEditor.cpp index 86a28a2eb..a0dee923d 100644 --- a/src/ShaderNode/Widgets/InputEditor.cpp +++ b/src/ShaderNode/Widgets/InputEditor.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ShaderNode/Widgets/InputEditor.hpp b/src/ShaderNode/Widgets/InputEditor.hpp index 236f9069f..561a7b362 100644 --- a/src/ShaderNode/Widgets/InputEditor.hpp +++ b/src/ShaderNode/Widgets/InputEditor.hpp @@ -3,7 +3,7 @@ #ifndef NAZARA_SHADERNODES_INPUTEDITOR_HPP #define NAZARA_SHADERNODES_INPUTEDITOR_HPP -#include +#include #include #include @@ -34,6 +34,6 @@ class InputEditor : public QWidget QVBoxLayout* m_layout; }; -#include +#include #endif diff --git a/src/ShaderNode/Widgets/InputEditor.inl b/src/ShaderNode/Widgets/InputEditor.inl index a480716aa..db2681e5c 100644 --- a/src/ShaderNode/Widgets/InputEditor.inl +++ b/src/ShaderNode/Widgets/InputEditor.inl @@ -1 +1 @@ -#include +#include diff --git a/src/ShaderNode/Widgets/MainWindow.cpp b/src/ShaderNode/Widgets/MainWindow.cpp index 150770541..8aa48c353 100644 --- a/src/ShaderNode/Widgets/MainWindow.cpp +++ b/src/ShaderNode/Widgets/MainWindow.cpp @@ -1,8 +1,8 @@ -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/ShaderNode/Widgets/MainWindow.hpp b/src/ShaderNode/Widgets/MainWindow.hpp index fa8257bcf..3e68ec267 100644 --- a/src/ShaderNode/Widgets/MainWindow.hpp +++ b/src/ShaderNode/Widgets/MainWindow.hpp @@ -4,7 +4,7 @@ #define NAZARA_SHADERNODES_MAINWINDOW_HPP #include -#include +#include class ShaderGraph; @@ -21,6 +21,6 @@ class MainWindow : public QMainWindow ShaderGraph& m_shaderGraph; }; -#include +#include #endif diff --git a/src/ShaderNode/Widgets/MainWindow.inl b/src/ShaderNode/Widgets/MainWindow.inl index 48dbe409e..f10445799 100644 --- a/src/ShaderNode/Widgets/MainWindow.inl +++ b/src/ShaderNode/Widgets/MainWindow.inl @@ -1 +1 @@ -#include +#include diff --git a/src/ShaderNode/Widgets/TextureEditor.cpp b/src/ShaderNode/Widgets/TextureEditor.cpp index 44a68fec9..40cce4652 100644 --- a/src/ShaderNode/Widgets/TextureEditor.cpp +++ b/src/ShaderNode/Widgets/TextureEditor.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include #include diff --git a/src/ShaderNode/Widgets/TextureEditor.hpp b/src/ShaderNode/Widgets/TextureEditor.hpp index 456b9b1d5..a3497f288 100644 --- a/src/ShaderNode/Widgets/TextureEditor.hpp +++ b/src/ShaderNode/Widgets/TextureEditor.hpp @@ -3,7 +3,7 @@ #ifndef NAZARA_SHADERNODES_TEXTUREEDITOR_HPP #define NAZARA_SHADERNODES_TEXTUREEDITOR_HPP -#include +#include #include #include @@ -35,6 +35,6 @@ class TextureEditor : public QWidget QVBoxLayout* m_layout; }; -#include +#include #endif diff --git a/src/ShaderNode/Widgets/TextureEditor.inl b/src/ShaderNode/Widgets/TextureEditor.inl index d11298db1..318a1e9a3 100644 --- a/src/ShaderNode/Widgets/TextureEditor.inl +++ b/src/ShaderNode/Widgets/TextureEditor.inl @@ -1 +1 @@ -#include +#include diff --git a/src/ShaderNode/main.cpp b/src/ShaderNode/main.cpp index a9554c8bd..a939e708a 100644 --- a/src/ShaderNode/main.cpp +++ b/src/ShaderNode/main.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include int main(int argc, char* argv[])