summaryrefslogtreecommitdiffstats
path: root/src/render/lights
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/lights')
-rw-r--r--src/render/lights/qabstractlight.cpp12
-rw-r--r--src/render/lights/qabstractlight.h6
-rw-r--r--src/render/lights/qdirectionallight.cpp2
-rw-r--r--src/render/lights/qdirectionallight.h6
-rw-r--r--src/render/lights/qpointlight.h4
-rw-r--r--src/render/lights/qspotlight.cpp12
-rw-r--r--src/render/lights/qspotlight.h6
7 files changed, 24 insertions, 24 deletions
diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp
index 82e1826be..a4272bcba 100644
--- a/src/render/lights/qabstractlight.cpp
+++ b/src/render/lights/qabstractlight.cpp
@@ -51,7 +51,7 @@ namespace Qt3DRender
/*!
- \class Qt3D::QAbstractLightPrivate
+ \class Qt3DCore::QAbstractLightPrivate
\internal
*/
QAbstractLightPrivate::QAbstractLightPrivate()
@@ -71,14 +71,14 @@ void QAbstractLight::copy(const QNode *ref)
}
/*!
- \class Qt3D::QAbstractLight
+ \class Qt3DCore::QAbstractLight
\inmodule Qt3DRender
*/
/*!
* Constructs a new QAbstractLight with the given \a parent.
*/
-QAbstractLight::QAbstractLight(Qt3D::QNode *parent) :
+QAbstractLight::QAbstractLight(Qt3DCore::QNode *parent) :
QShaderData(*new QAbstractLightPrivate, parent)
{
}
@@ -91,7 +91,7 @@ QAbstractLight::QAbstractLight(QAbstractLightPrivate &dd, QNode *parent)
/*!
- * \property Qt3D::QAbstractLight::color
+ * \property Qt3DCore::QAbstractLight::color
*
* Holds the current QAbstractLight color.
*/
@@ -111,7 +111,7 @@ void QAbstractLight::setColor(const QColor &color)
}
/*!
- \property Qt3D::QAbstractLight::intensity
+ \property Qt3DCore::QAbstractLight::intensity
Holds the current QAbstractLight intensity.
*/
@@ -131,7 +131,7 @@ void QAbstractLight::setIntensity(float intensity)
}
/*!
- \property Qt3D::QAbstractLight::position
+ \property Qt3DCore::QAbstractLight::position
Holds the current QAbstractLight position.
*/
diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h
index 6f30fe955..15eac8b04 100644
--- a/src/render/lights/qabstractlight.h
+++ b/src/render/lights/qabstractlight.h
@@ -58,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QAbstractLight : public QShaderData
Q_PROPERTY(TransformType positionTransformed READ positionTransformed CONSTANT)
public :
- explicit QAbstractLight(Qt3D::QNode *parent = 0);
+ explicit QAbstractLight(Qt3DCore::QNode *parent = 0);
QColor color() const;
void setColor(const QColor &color);
@@ -72,8 +72,8 @@ public :
TransformType positionTransformed() const;
protected :
- QAbstractLight(QAbstractLightPrivate &dd, Qt3D::QNode *parent = 0);
- void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+ QAbstractLight(QAbstractLightPrivate &dd, Qt3DCore::QNode *parent = 0);
+ void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
Q_SIGNALS:
void colorChanged();
diff --git a/src/render/lights/qdirectionallight.cpp b/src/render/lights/qdirectionallight.cpp
index ebdc1e170..e6bbb7541 100644
--- a/src/render/lights/qdirectionallight.cpp
+++ b/src/render/lights/qdirectionallight.cpp
@@ -62,7 +62,7 @@ namespace Qt3DRender {
*/
/*!
- \class Qt3D::QDirectionalLightPrivate
+ \class Qt3DCore::QDirectionalLightPrivate
\internal
*/
QDirectionalLightPrivate::QDirectionalLightPrivate()
diff --git a/src/render/lights/qdirectionallight.h b/src/render/lights/qdirectionallight.h
index f626d4f6a..c0fe1dfe7 100644
--- a/src/render/lights/qdirectionallight.h
+++ b/src/render/lights/qdirectionallight.h
@@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QDirectionalLight : public QAbstractLight
Q_PROPERTY(QVector3D direction READ direction WRITE setDirection NOTIFY directionChanged)
public:
- explicit QDirectionalLight(Qt3D::QNode *parent = 0);
+ explicit QDirectionalLight(Qt3DCore::QNode *parent = 0);
void setDirection(const QVector3D &direction);
QVector3D direction() const;
@@ -60,8 +60,8 @@ Q_SIGNALS:
void directionChanged();
protected:
- QDirectionalLight(QDirectionalLightPrivate &dd, Qt3D::QNode *parent = 0);
- void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+ QDirectionalLight(QDirectionalLightPrivate &dd, Qt3DCore::QNode *parent = 0);
+ void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
private:
Q_DECLARE_PRIVATE(QDirectionalLight)
diff --git a/src/render/lights/qpointlight.h b/src/render/lights/qpointlight.h
index 076f8b3cd..881c85f3e 100644
--- a/src/render/lights/qpointlight.h
+++ b/src/render/lights/qpointlight.h
@@ -50,11 +50,11 @@ class QT3DRENDERERSHARED_EXPORT QPointLight : public QAbstractLight
Q_OBJECT
public:
- explicit QPointLight(Qt3D::QNode *parent = 0);
+ explicit QPointLight(Qt3DCore::QNode *parent = 0);
protected:
Q_DECLARE_PRIVATE(QPointLight)
- QPointLight(QPointLightPrivate &dd, Qt3D::QNode *parent);
+ QPointLight(QPointLightPrivate &dd, Qt3DCore::QNode *parent);
QT3D_CLONEABLE(QPointLight)
};
diff --git a/src/render/lights/qspotlight.cpp b/src/render/lights/qspotlight.cpp
index 191be0e62..1e9244c91 100644
--- a/src/render/lights/qspotlight.cpp
+++ b/src/render/lights/qspotlight.cpp
@@ -63,7 +63,7 @@ namespace Qt3DRender {
*/
/*!
- \class Qt3D::QSpotLightPrivate
+ \class Qt3DCore::QSpotLightPrivate
\internal
*/
QSpotLightPrivate::QSpotLightPrivate()
@@ -81,14 +81,14 @@ QSpotLightPrivate::QSpotLightPrivate()
/*!
\qmltype SpotLight
- \instantiates Qt3D::QSpotLight
+ \instantiates Qt3DCore::QSpotLight
\inherits AbstractLight
\inqmlmodule Qt3D.Renderer
\since 5.5
\brief For OpenGL ...
*/
-/*! \fn void Qt3D::QSpotLight::copy(const QNode *ref)
+/*! \fn void Qt3DCore::QSpotLight::copy(const QNode *ref)
Copies the \a ref instance into this one.
*/
@@ -104,7 +104,7 @@ void QSpotLight::copy(const QNode *ref)
/*!
- \fn Qt3D::QSpotLight::QSpotLight(QNode *parent)
+ \fn Qt3DCore::QSpotLight::QSpotLight(QNode *parent)
Constructs a new QSpotLight with the specified \a parent.
*/
QSpotLight::QSpotLight(QNode *parent)
@@ -124,7 +124,7 @@ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent)
*/
/*!
- \property Qt3D::QSpotLight::direction
+ \property Qt3DCore::QSpotLight::direction
*/
@@ -141,7 +141,7 @@ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent)
*/
/*!
- \property Qt3D::QSpotLight::cutOffAngle
+ \property Qt3DCore::QSpotLight::cutOffAngle
*/
float QSpotLight::cutOffAngle() const
diff --git a/src/render/lights/qspotlight.h b/src/render/lights/qspotlight.h
index c22ef62e5..d262b3d97 100644
--- a/src/render/lights/qspotlight.h
+++ b/src/render/lights/qspotlight.h
@@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QSpotLight : public QAbstractLight
Q_PROPERTY(float cutOffAngle READ cutOffAngle WRITE setCutOffAngle NOTIFY cutOffAngleChanged)
public:
- explicit QSpotLight(Qt3D::QNode *parent = 0);
+ explicit QSpotLight(Qt3DCore::QNode *parent = 0);
QVector3D direction() const;
float cutOffAngle() const;
@@ -65,8 +65,8 @@ Q_SIGNALS:
void cutOffAngleChanged();
protected:
- QSpotLight(QSpotLightPrivate &dd, Qt3D::QNode *parent = 0);
- void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+ QSpotLight(QSpotLightPrivate &dd, Qt3DCore::QNode *parent = 0);
+ void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
private:
Q_DECLARE_PRIVATE(QSpotLight)