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

ShaderNodes: Use PreviewValues instead of QImage

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-07-03 22:53:00 +02:00
parent 4f671873c1
commit 33d94c05f3
24 changed files with 314 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ShaderNode/DataTypes/FloatData.hpp
View File

@@ -3,8 +3,8 @@
#ifndef NAZARA_SHADERNODES_FLOATDATA_HPP
#define NAZARA_SHADERNODES_FLOATDATA_HPP
#include <ShaderNode/Previews/PreviewValues.hpp>
#include <nodes/NodeData>
#include <QtGui/QImage>
struct FloatData : public QtNodes::NodeData
{
@@ -20,7 +20,7 @@ struct FloatData : public QtNodes::NodeData
return { "float", "Float" };
}
QImage preview;
PreviewValues preview;
};
#include <ShaderNode/DataTypes/FloatData.inl>

4
src/ShaderNode/DataTypes/FloatData.inl
View File

@@ -1,7 +1,7 @@
#include <ShaderNode/DataTypes/FloatData.hpp>
inline FloatData::FloatData() :
preview(1, 1, QImage::Format_RGBA8888)
preview(1, 1)
{
preview.fill(QColor::fromRgb(255, 255, 255, 0));
preview(0, 0) = Nz::Vector4f(1.f, 1.f, 1.f, 0.f);
}

4
src/ShaderNode/DataTypes/TextureData.hpp
View File

@@ -3,15 +3,15 @@
#ifndef NAZARA_SHADERNODES_TEXTUREDATA_HPP
#define NAZARA_SHADERNODES_TEXTUREDATA_HPP
#include <ShaderNode/Previews/PreviewValues.hpp>
#include <Nazara/Renderer/ShaderNodes.hpp>
#include <nodes/NodeData>
#include <QtGui/QImage>
struct TextureData : public QtNodes::NodeData
{
inline TextureData();
QImage preview;
PreviewValues preview;
};
struct Texture2Data : public TextureData

4
src/ShaderNode/DataTypes/TextureData.inl
View File

@@ -1,7 +1,7 @@
#include <ShaderNode/DataTypes/TextureData.hpp>
inline TextureData::TextureData() :
preview(64, 64, QImage::Format_RGBA8888)
preview(64, 64)
{
preview.fill(QColor::fromRgb(255, 255, 255, 0));
preview.Fill(Nz::Vector4f(1.f, 1.f, 1.f, 0.f));
}

4
src/ShaderNode/DataTypes/VecData.hpp
View File

@@ -4,8 +4,8 @@
#define NAZARA_SHADERNODES_VECDATA_HPP
#include <Nazara/Renderer/ShaderNodes.hpp>
#include <ShaderNode/Previews/PreviewValues.hpp>
#include <nodes/NodeData>
#include <QtGui/QImage>
struct VecData : public QtNodes::NodeData
{
@@ -18,7 +18,7 @@ struct VecData : public QtNodes::NodeData
static inline QtNodes::NodeDataType Type();
std::size_t componentCount;
QImage preview;
PreviewValues preview;
};
template<std::size_t N>

4
src/ShaderNode/DataTypes/VecData.inl
View File

@@ -2,9 +2,9 @@
inline VecData::VecData(std::size_t ComponentCount) :
componentCount(ComponentCount),
preview(64, 64, QImage::Format_RGBA8888)
preview(64, 64)
{
preview.fill(QColor::fromRgb(255, 255, 255, 0));
preview.Fill(Nz::Vector4f(1.f, 1.f, 1.f, 0.f));
}
inline QtNodes::NodeDataType VecData::type() const