oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

node: fixed bug that failed to load some default values from shader xml

Browse Source
This commit is contained in:
itsmattkc
2020-04-22 18:13:53 +10:00
parent db117e0780
commit 258f83d5d3
7 changed files with 104 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/input.cpp
+50 -27
View File
@@ -37,38 +37,27 @@
OLIVE_NAMESPACE_ENTER
NodeInput::NodeInput(const QString& id, const DataType &type, const QVariant &default_value) :
NodeParam(id),
data_type_(type),
keyframable_(true),
keyframing_(false)
NodeInput::NodeInput(const QString& id, const DataType &type, const QVector<QVariant> &default_value) :
NodeParam(id)
{
int track_size;
Init(type);
switch (data_type_) {
case kVec2:
track_size = 2;
break;
case kVec3:
track_size = 3;
break;
case kVec4:
case kColor:
track_size = 4;
break;
default:
track_size = 1;
if (!default_value.isEmpty()) {
SetDefaultValue(default_value);
}
}
keyframe_tracks_.resize(track_size);
NodeInput::NodeInput(const QString &id, const NodeParam::DataType &type, const QVariant &default_value) :
NodeParam(id)
{
Init(type);
SetDefaultValue(split_normal_value_into_track_values(default_value));
}
if (!default_value.isNull()) {
standard_value_ = split_normal_value_into_track_values(default_value);
Q_ASSERT(standard_value_.size() == track_size);
} else {
standard_value_.resize(track_size);
}
NodeInput::NodeInput(const QString &id, const NodeParam::DataType &type) :
NodeParam(id)
{
Init(type);
}
bool NodeInput::IsArray()
@@ -299,6 +288,40 @@ void NodeInput::SaveInternal(QXmlStreamWriter*) const
{
}
void NodeInput::Init(DataType type)
{
keyframable_ = true;
keyframing_ = false;
data_type_ = type;
int track_size;
switch (data_type_) {
case kVec2:
track_size = 2;
break;
case kVec3:
track_size = 3;
break;
case kVec4:
case kColor:
track_size = 4;
break;
default:
track_size = 1;
}
keyframe_tracks_.resize(track_size);
standard_value_.resize(track_size);
}
void NodeInput::SetDefaultValue(const QVector<QVariant> &default_value)
{
for (int i=0;i<standard_value_.size();i++) {
standard_value_.replace(i, default_value.at(i));
}
}
QString NodeInput::ValueToString(const QVariant &value) const
{
return ValueToString(data_type_, value);