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

ShaderNode: Move VecData to DataTypes folder

This commit is contained in:
Lynix 2020-05-28 10:47:49 +02:00
parent bc7ffb6ff3
commit 6ff670f13f
14 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ShaderNode/DataModels/Cast.hpp
View File

@ -8,8 +8,7 @@
#include <QtWidgets/QLabel> #include <QtWidgets/QLabel>
#include <ShaderNode/ShaderGraph.hpp> #include <ShaderNode/ShaderGraph.hpp>
#include <ShaderNode/DataModels/ShaderNode.hpp> #include <ShaderNode/DataModels/ShaderNode.hpp>
#include <ShaderNode/DataModels/VecValue.hpp> #include <ShaderNode/DataTypes/VecData.hpp>
#include <array>
template<typename From, typename To> template<typename From, typename To>
class CastVec : public ShaderNode class CastVec : public ShaderNode

2
src/ShaderNode/DataModels/Cast.inl
View File

@ -1,5 +1,7 @@
#include <ShaderNode/DataModels/Cast.hpp> #include <ShaderNode/DataModels/Cast.hpp>
#include <Nazara/Renderer/ShaderBuilder.hpp> #include <Nazara/Renderer/ShaderBuilder.hpp>
#include <QtWidgets/QDoubleSpinBox>
#include <QtWidgets/QFormLayout>
#include <stdexcept> #include <stdexcept>
template<typename From, typename To> template<typename From, typename To>

2
src/ShaderNode/DataModels/FragmentOutput.cpp
View File

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

2
src/ShaderNode/DataModels/FragmentOutput.hpp
View File

@ -4,7 +4,7 @@
#define NAZARA_SHADERNODES_FRAGMENTOUTPUT_HPP #define NAZARA_SHADERNODES_FRAGMENTOUTPUT_HPP
#include <ShaderNode/DataModels/ShaderNode.hpp> #include <ShaderNode/DataModels/ShaderNode.hpp>
#include <ShaderNode/DataModels/VecValue.hpp> #include <ShaderNode/DataTypes/VecData.hpp>
#include <QtWidgets/QDoubleSpinBox> #include <QtWidgets/QDoubleSpinBox>
#include <QtWidgets/QFormLayout> #include <QtWidgets/QFormLayout>

3
src/ShaderNode/DataModels/InputValue.cpp
View File

@ -1,7 +1,8 @@
#include <ShaderNode/ShaderGraph.hpp> #include <ShaderNode/ShaderGraph.hpp>
#include <ShaderNode/DataModels/InputValue.hpp> #include <ShaderNode/DataModels/InputValue.hpp>
#include <ShaderNode/DataModels/VecValue.hpp> #include <ShaderNode/DataTypes/VecData.hpp>
#include <Nazara/Renderer/ShaderBuilder.hpp> #include <Nazara/Renderer/ShaderBuilder.hpp>
#include <QtWidgets/QFormLayout>
InputValue::InputValue(ShaderGraph& graph) : InputValue::InputValue(ShaderGraph& graph) :
ShaderNode(graph) ShaderNode(graph)

1
src/ShaderNode/DataModels/SampleTexture.cpp
View File

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

3
src/ShaderNode/DataModels/SampleTexture.hpp
View File

@ -8,8 +8,7 @@
#include <QtWidgets/QLabel> #include <QtWidgets/QLabel>
#include <ShaderNode/ShaderGraph.hpp> #include <ShaderNode/ShaderGraph.hpp>
#include <ShaderNode/DataModels/ShaderNode.hpp> #include <ShaderNode/DataModels/ShaderNode.hpp>
#include <ShaderNode/DataModels/VecValue.hpp> #include <ShaderNode/DataTypes/VecData.hpp>
#include <array>
class SampleTexture : public ShaderNode class SampleTexture : public ShaderNode
{ {

2
src/ShaderNode/DataModels/VecBinOp.hpp
View File

@ -4,7 +4,7 @@
#define NAZARA_SHADERNODES_VECBINOP_HPP #define NAZARA_SHADERNODES_VECBINOP_HPP
#include <ShaderNode/DataModels/ShaderNode.hpp> #include <ShaderNode/DataModels/ShaderNode.hpp>
#include <ShaderNode/DataModels/VecValue.hpp> #include <ShaderNode/DataTypes/VecData.hpp>
template<typename Data, Nz::ShaderAst::BinaryType BinOp> template<typename Data, Nz::ShaderAst::BinaryType BinOp>
class VecBinOp : public ShaderNode class VecBinOp : public ShaderNode

1
src/ShaderNode/DataModels/VecData.cpp
View File

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

2
src/ShaderNode/DataModels/VecValue.hpp
View File

@ -8,7 +8,7 @@
#include <QtWidgets/QFormLayout> #include <QtWidgets/QFormLayout>
#include <QtWidgets/QLabel> #include <QtWidgets/QLabel>
#include <ShaderNode/DataModels/ShaderNode.hpp> #include <ShaderNode/DataModels/ShaderNode.hpp>
#include <ShaderNode/DataModels/VecData.hpp> #include <ShaderNode/DataTypes/VecData.hpp>
#include <array> #include <array>
template<typename Data> template<typename Data>

3
src/ShaderNode/DataModels/VecValue.inl
View File

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

1
src/ShaderNode/DataTypes/VecData.cpp Normal file
View File

@ -0,0 +1 @@
#include <ShaderNode/DataTypes/VecData.hpp>

2
src/ShaderNode/DataModels/VecData.hpp → src/ShaderNode/DataTypes/VecData.hpp
View File

@ -101,6 +101,6 @@ template<std::size_t N> using VecType = typename VecTypeHelper<N>::template Type
constexpr std::array<char, 4> s_vectorComponents = { 'X', 'Y', 'Z', 'W' }; constexpr std::array<char, 4> s_vectorComponents = { 'X', 'Y', 'Z', 'W' };
#include <ShaderNode/DataModels/VecData.inl> #include <ShaderNode/DataTypes/VecData.inl>
#endif #endif

2
src/ShaderNode/DataModels/VecData.inl → src/ShaderNode/DataTypes/VecData.inl
View File

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