diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-07-05 16:21:41 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-09-14 12:38:09 +0000 |
commit | 0cd9e1961d655443d36c563a701bc18c45e9b374 (patch) | |
tree | 6d6dd85cc701831181e770e522b7ad6d1f8f7c78 | |
parent | 99bc5335a06cf0a567b76bf9ac36bf747f4ce8e8 (diff) |
Parameter: only store a UniformValue
Change-Id: I6614c05fabb4fde72973a0e4738eb86efad7cc14
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/render/materialsystem/parameter.cpp | 7 | ||||
-rw-r--r-- | src/render/materialsystem/parameter_p.h | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp index 22724552b..2cd026422 100644 --- a/src/render/materialsystem/parameter.cpp +++ b/src/render/materialsystem/parameter.cpp @@ -68,7 +68,6 @@ void Parameter::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &ch const auto &data = typedChange->data; m_name = data.name; m_nameId = StringToInt::lookupId(m_name); - m_value = data.backendValue; m_uniformValue = UniformValue::fromVariant(data.backendValue); } @@ -81,7 +80,6 @@ void Parameter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) m_name = propertyChange->value().toString(); m_nameId = StringToInt::lookupId(m_name); } else if (propertyChange->propertyName() == QByteArrayLiteral("value")) { - m_value = propertyChange->value(); m_uniformValue = UniformValue::fromVariant(propertyChange->value()); } markDirty(AbstractRenderer::AllDirty); @@ -95,11 +93,6 @@ QString Parameter::name() const return m_name; } -QVariant Parameter::value() const -{ - return m_value; -} - int Parameter::nameId() const Q_DECL_NOTHROW { return m_nameId; diff --git a/src/render/materialsystem/parameter_p.h b/src/render/materialsystem/parameter_p.h index 6e9833e1a..c6861ca36 100644 --- a/src/render/materialsystem/parameter_p.h +++ b/src/render/materialsystem/parameter_p.h @@ -73,7 +73,6 @@ public: void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; QString name() const; - QVariant value() const; int nameId() const Q_DECL_NOTHROW; UniformValue uniformValue() const; @@ -81,7 +80,6 @@ private: void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL; QString m_name; - QVariant m_value; UniformValue m_uniformValue; int m_nameId; }; |