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

ShaderNodes/InputValue: Fix output type when using Float1

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-07-19 21:08:25 +02:00
parent 5258f0b61a
commit e342c88e64
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
#include <ShaderNode/ShaderGraph.hpp>
#include <ShaderNode/DataModels/InputValue.hpp> #include <ShaderNode/DataModels/InputValue.hpp>
#include <ShaderNode/ShaderGraph.hpp>
#include <ShaderNode/DataTypes/FloatData.hpp> #include <ShaderNode/DataTypes/FloatData.hpp>
#include <ShaderNode/DataTypes/VecData.hpp> #include <ShaderNode/DataTypes/VecData.hpp>
#include <Nazara/Renderer/ShaderBuilder.hpp> #include <Nazara/Renderer/ShaderBuilder.hpp>
@@ -170,10 +170,20 @@ std::shared_ptr<QtNodes::NodeData> InputValue::outData(QtNodes::PortIndex port)
const auto& inputEntry = graph.GetInput(*m_currentInputIndex); const auto& inputEntry = graph.GetInput(*m_currentInputIndex);
const auto& preview = graph.GetPreviewModel(); const auto& preview = graph.GetPreviewModel();
auto vecData = std::make_shared<VecData>(GetComponentCount(inputEntry.type)); if (inputEntry.type == PrimitiveType::Float1)
vecData->preview = preview.GetPreview(inputEntry.role, inputEntry.roleIndex); {
auto fData = std::make_shared<FloatData>();
fData->preview = preview.GetPreview(inputEntry.role, inputEntry.roleIndex);
return vecData; return fData;
}
else
{
auto vecData = std::make_shared<VecData>(GetComponentCount(inputEntry.type));
vecData->preview = preview.GetPreview(inputEntry.role, inputEntry.roleIndex);
return vecData;
}
} }
QtNodes::NodeValidationState InputValue::validationState() const QtNodes::NodeValidationState InputValue::validationState() const

1
src/ShaderNode/DataModels/InputValue.inl
View File

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