Fix RenderState property updates

Some had old property names

Change-Id: Id82fcce9dac05d2566bafabebf66ff51300db16d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

1 files changed, 12 insertions, 11 deletions

diff --git a/src/render/renderstates/renderstates.cpp b/src/render/renderstates/renderstates.cpp
index 49ccf9ae7..7c59aa7f3 100644
--- a/src/render/renderstates/renderstates.cpp
+++ b/src/render/renderstates/renderstates.cpp
@@ -43,6 +43,7 @@
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DRender/qrenderstate.h>
 #include <Qt3DRender/qcullface.h>
+#include <Qt3DRender/qpointsize.h>
 
 #include <Qt3DRender/private/graphicscontext_p.h>
 
@@ -102,7 +103,7 @@ void BlendEquation::apply(GraphicsContext *gc) const
 
 void BlendEquation::updateProperty(const char *name, const QVariant &value)
 {
-    if (name == QByteArrayLiteral("mode")) std::get<0>(m_values) = value.toInt();
+    if (name == QByteArrayLiteral("blendFunction")) std::get<0>(m_values) = value.toInt();
 }
 
 void AlphaFunc::apply(GraphicsContext* gc) const
@@ -128,7 +129,7 @@ void DepthTest::apply(GraphicsContext *gc) const
 
 void DepthTest::updateProperty(const char *name, const QVariant &value)
 {
-    if (name == QByteArrayLiteral("func")) std::get<0>(m_values) = value.toInt();
+    if (name == QByteArrayLiteral("depthFunction")) std::get<0>(m_values) = value.toInt();
 }
 
 void CullFace::apply(GraphicsContext *gc) const
@@ -204,7 +205,7 @@ void PointSize::apply(GraphicsContext *gc) const
 
 void PointSize::updateProperty(const char *name, const QVariant &value)
 {
-    if (name == QByteArrayLiteral("specification")) std::get<0>(m_values) = value.toBool();
+    if (name == QByteArrayLiteral("sizeMode")) std::get<0>(m_values) = (value.toInt() == QPointSize::Programmable);
     else if (name == QByteArrayLiteral("value")) std::get<1>(m_values) = value.toFloat();
 }
 
@@ -216,8 +217,8 @@ void PolygonOffset::apply(GraphicsContext *gc) const
 
 void PolygonOffset::updateProperty(const char *name, const QVariant &value)
 {
-    if (name == QByteArrayLiteral("factor")) std::get<0>(m_values) = value.toFloat();
-    else if (name == QByteArrayLiteral("units")) std::get<1>(m_values) = value.toFloat();
+    if (name == QByteArrayLiteral("scaleFactor")) std::get<0>(m_values) = value.toFloat();
+    else if (name == QByteArrayLiteral("depthSteps")) std::get<1>(m_values) = value.toFloat();
 }
 
 void ColorMask::apply(GraphicsContext *gc) const
@@ -227,10 +228,10 @@ void ColorMask::apply(GraphicsContext *gc) const
 
 void ColorMask::updateProperty(const char *name, const QVariant &value)
 {
-    if (name == QByteArrayLiteral("red")) std::get<0>(m_values) = value.toBool();
-    else if (name == QByteArrayLiteral("green")) std::get<1>(m_values) = value.toBool();
-    else if (name == QByteArrayLiteral("blue")) std::get<2>(m_values) = value.toBool();
-    else if (name == QByteArrayLiteral("alpha")) std::get<3>(m_values) = value.toBool();
+    if (name == QByteArrayLiteral("redMasked")) std::get<0>(m_values) = value.toBool();
+    else if (name == QByteArrayLiteral("greenMasked")) std::get<1>(m_values) = value.toBool();
+    else if (name == QByteArrayLiteral("blueMasked")) std::get<2>(m_values) = value.toBool();
+    else if (name == QByteArrayLiteral("alphaMasked")) std::get<3>(m_values) = value.toBool();
 }
 
 void ClipPlane::apply(GraphicsContext *gc) const
@@ -265,8 +266,8 @@ void StencilMask::apply(GraphicsContext *gc) const
 
 void StencilMask::updateProperty(const char *name, const QVariant &value)
 {
-    if (name == QByteArrayLiteral("frontMask")) std::get<0>(m_values) = value.toInt();
-    else if (name == QByteArrayLiteral("backMask")) std::get<1>(m_values) = value.toInt();
+    if (name == QByteArrayLiteral("frontOutputMask")) std::get<0>(m_values) = value.toInt();
+    else if (name == QByteArrayLiteral("backOutputMask")) std::get<1>(m_values) = value.toInt();
 }
 
 } // namespace Render