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.h
+7 -1
View File
@@ -45,7 +45,9 @@ public:
* saving/loading data from this Node so that parameter order can be changed without issues loading data saved by an
* older version. This of course assumes that parameters don't change their ID.
*/
NodeInput(const QString &id, const DataType& type, const QVariant& default_value = QVariant());
NodeInput(const QString &id, const DataType& type, const QVector<QVariant>& default_value);
NodeInput(const QString &id, const DataType& type, const QVariant& default_value);
NodeInput(const QString &id, const DataType& type);
virtual bool IsArray();
@@ -285,6 +287,10 @@ protected:
virtual void SaveInternal(QXmlStreamWriter* writer) const;
private:
void Init(NodeParam::DataType type);
void SetDefaultValue(const QVector<QVariant> &default_value);
QString ValueToString(const QVariant& value) const;
QVariant StringToValue(const QString &string, QList<XMLNodeData::FootageConnection> &footage_connections);