QDirectionalLight renamed direction to worldDirection

As per API review

Change-Id: Ida081aa126ec285c090b244b3bf6abf579108feb
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

3 files changed, 14 insertions, 14 deletions

diff --git a/src/render/lights/qdirectionallight.cpp b/src/render/lights/qdirectionallight.cpp
index b85ff5ac4..3287a5ecf 100644
--- a/src/render/lights/qdirectionallight.cpp
+++ b/src/render/lights/qdirectionallight.cpp
@@ -54,7 +54,7 @@ namespace Qt3DRender {
  * struct DirectionalLight
  * {
  *  vec3 position;
- *  vec3 direction;
+ *  vec3 worldDirection;
  *  vec4 color;
  *  float intensity;
  * };
@@ -66,14 +66,14 @@ namespace Qt3DRender {
 
 QDirectionalLightPrivate::QDirectionalLightPrivate()
     : QLightPrivate(QLight::DirectionalLight)
-    , m_direction(0.0f, -1.0f, 0.0f)
+    , m_worldDirection(0.0f, -1.0f, 0.0f)
 {
 }
 
 void QDirectionalLight::copy(const QNode *ref)
 {
     const QDirectionalLight *light = static_cast<const QDirectionalLight*>(ref);
-    d_func()->m_direction = light->d_func()->m_direction;
+    d_func()->m_worldDirection = light->d_func()->m_worldDirection;
     // This needs to be last otherwise, properties value won't be copied
     // as we use shader introspection in QShaderData::copy
     QLight::copy(ref);
@@ -90,19 +90,19 @@ QDirectionalLight::QDirectionalLight(QDirectionalLightPrivate &dd, QNode *parent
 {
 }
 
-void QDirectionalLight::setDirection(const QVector3D &direction)
+void QDirectionalLight::setWorldDirection(const QVector3D &worldDirection)
 {
     Q_D(QDirectionalLight);
-    if (direction != d->m_direction) {
-        d->m_direction = direction;
-        emit directionChanged(direction);
+    if (worldDirection != d->m_worldDirection) {
+        d->m_worldDirection = worldDirection;
+        emit worldDirectionChanged(worldDirection);
     }
 }
 
-QVector3D QDirectionalLight::direction() const
+QVector3D QDirectionalLight::worldDirection() const
 {
     Q_D(const QDirectionalLight);
-    return d->m_direction;
+    return d->m_worldDirection;
 }
 
 } // namespace Qt3DRender
diff --git a/src/render/lights/qdirectionallight.h b/src/render/lights/qdirectionallight.h
index 9abb40c19..0b88bcd61 100644
--- a/src/render/lights/qdirectionallight.h
+++ b/src/render/lights/qdirectionallight.h
@@ -51,18 +51,18 @@ class QDirectionalLightPrivate;
 class QT3DRENDERSHARED_EXPORT QDirectionalLight : public QLight
 {
     Q_OBJECT
-    Q_PROPERTY(QVector3D direction READ direction WRITE setDirection NOTIFY directionChanged)
+    Q_PROPERTY(QVector3D worldDirection READ worldDirection WRITE setWorldDirection NOTIFY worldDirectionChanged)
 
 public:
     explicit QDirectionalLight(Qt3DCore::QNode *parent = 0);
 
-    QVector3D direction() const;
+    QVector3D worldDirection() const;
 
 public Q_SLOTS:
-    void setDirection(const QVector3D &direction);
+    void setWorldDirection(const QVector3D &worldDirection);
 
 Q_SIGNALS:
-    void directionChanged(const QVector3D &direction);
+    void worldDirectionChanged(const QVector3D &worldDirection);
 
 protected:
     QDirectionalLight(QDirectionalLightPrivate &dd, Qt3DCore::QNode *parent = 0);
diff --git a/src/render/lights/qdirectionallight_p.h b/src/render/lights/qdirectionallight_p.h
index d25fbad30..486458180 100644
--- a/src/render/lights/qdirectionallight_p.h
+++ b/src/render/lights/qdirectionallight_p.h
@@ -65,7 +65,7 @@ public:
     QDirectionalLightPrivate();
 
     Q_DECLARE_PUBLIC(QDirectionalLight)
-    QVector3D m_direction;
+    QVector3D m_worldDirection;
 };
 
 } // namespace Qt3DRender