summaryrefslogtreecommitdiffstats
path: root/src/extras/3dtext
diff options
context:
space:
mode:
Diffstat (limited to 'src/extras/3dtext')
-rw-r--r--src/extras/3dtext/qextrudedtextgeometry.cpp38
-rw-r--r--src/extras/3dtext/qextrudedtextgeometry.h20
-rw-r--r--src/extras/3dtext/qextrudedtextgeometry_p.h19
3 files changed, 39 insertions, 38 deletions
diff --git a/src/extras/3dtext/qextrudedtextgeometry.cpp b/src/extras/3dtext/qextrudedtextgeometry.cpp
index 3c4580c65..67f3b21ce 100644
--- a/src/extras/3dtext/qextrudedtextgeometry.cpp
+++ b/src/extras/3dtext/qextrudedtextgeometry.cpp
@@ -50,8 +50,8 @@
#include "qextrudedtextgeometry.h"
#include "qextrudedtextgeometry_p.h"
-#include <Qt3DRender/qbuffer.h>
-#include <Qt3DRender/qattribute.h>
+#include <Qt3DCore/qbuffer.h>
+#include <Qt3DCore/qattribute.h>
#include <private/qtriangulator_p.h>
#include <qmath.h>
#include <QVector3D>
@@ -162,35 +162,35 @@ QExtrudedTextGeometryPrivate::QExtrudedTextGeometryPrivate()
void QExtrudedTextGeometryPrivate::init()
{
Q_Q(QExtrudedTextGeometry);
- m_positionAttribute = new Qt3DRender::QAttribute(q);
- m_normalAttribute = new Qt3DRender::QAttribute(q);
- m_indexAttribute = new Qt3DRender::QAttribute(q);
- m_vertexBuffer = new Qt3DRender::QBuffer(q);
- m_indexBuffer = new Qt3DRender::QBuffer(q);
+ m_positionAttribute = new Qt3DCore::QAttribute(q);
+ m_normalAttribute = new Qt3DCore::QAttribute(q);
+ m_indexAttribute = new Qt3DCore::QAttribute(q);
+ m_vertexBuffer = new Qt3DCore::QBuffer(q);
+ m_indexBuffer = new Qt3DCore::QBuffer(q);
const quint32 elementSize = 3 + 3;
const quint32 stride = elementSize * sizeof(float);
- m_positionAttribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName());
- m_positionAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float);
+ m_positionAttribute->setName(Qt3DCore::QAttribute::defaultPositionAttributeName());
+ m_positionAttribute->setVertexBaseType(Qt3DCore::QAttribute::Float);
m_positionAttribute->setVertexSize(3);
- m_positionAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
+ m_positionAttribute->setAttributeType(Qt3DCore::QAttribute::VertexAttribute);
m_positionAttribute->setBuffer(m_vertexBuffer);
m_positionAttribute->setByteStride(stride);
m_positionAttribute->setByteOffset(0);
m_positionAttribute->setCount(0);
- m_normalAttribute->setName(Qt3DRender::QAttribute::defaultNormalAttributeName());
- m_normalAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float);
+ m_normalAttribute->setName(Qt3DCore::QAttribute::defaultNormalAttributeName());
+ m_normalAttribute->setVertexBaseType(Qt3DCore::QAttribute::Float);
m_normalAttribute->setVertexSize(3);
- m_normalAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
+ m_normalAttribute->setAttributeType(Qt3DCore::QAttribute::VertexAttribute);
m_normalAttribute->setBuffer(m_vertexBuffer);
m_normalAttribute->setByteStride(stride);
m_normalAttribute->setByteOffset(3 * sizeof(float));
m_normalAttribute->setCount(0);
- m_indexAttribute->setAttributeType(Qt3DRender::QAttribute::IndexAttribute);
- m_indexAttribute->setVertexBaseType(Qt3DRender::QAttribute::UnsignedInt);
+ m_indexAttribute->setAttributeType(Qt3DCore::QAttribute::IndexAttribute);
+ m_indexAttribute->setVertexBaseType(Qt3DCore::QAttribute::UnsignedInt);
m_indexAttribute->setBuffer(m_indexBuffer);
m_indexAttribute->setCount(0);
@@ -255,7 +255,7 @@ void QExtrudedTextGeometryPrivate::init()
* in 3D space.
* \since 5.9
* \ingroup geometries
- * \inherits Qt3DRender::QGeometry
+ * \inherits Qt3DCore::QGeometry
*
* The QExtrudedTextGeometry class is most commonly used internally by the QText3DMesh
* but can also be used in custom Qt3DRender::QGeometryRenderer subclasses.
@@ -469,7 +469,7 @@ float QExtrudedTextGeometry::extrusionLength() const
*
* Holds the geometry position attribute.
*/
-Qt3DRender::QAttribute *QExtrudedTextGeometry::positionAttribute() const
+Qt3DCore::QAttribute *QExtrudedTextGeometry::positionAttribute() const
{
Q_D(const QExtrudedTextGeometry);
return d->m_positionAttribute;
@@ -480,7 +480,7 @@ Qt3DRender::QAttribute *QExtrudedTextGeometry::positionAttribute() const
*
* Holds the geometry normal attribute.
*/
-Qt3DRender::QAttribute *QExtrudedTextGeometry::normalAttribute() const
+Qt3DCore::QAttribute *QExtrudedTextGeometry::normalAttribute() const
{
Q_D(const QExtrudedTextGeometry);
return d->m_normalAttribute;
@@ -491,7 +491,7 @@ Qt3DRender::QAttribute *QExtrudedTextGeometry::normalAttribute() const
*
* Holds the geometry index attribute.
*/
-Qt3DRender::QAttribute *QExtrudedTextGeometry::indexAttribute() const
+Qt3DCore::QAttribute *QExtrudedTextGeometry::indexAttribute() const
{
Q_D(const QExtrudedTextGeometry);
return d->m_indexAttribute;
diff --git a/src/extras/3dtext/qextrudedtextgeometry.h b/src/extras/3dtext/qextrudedtextgeometry.h
index d40797c6f..0a92932af 100644
--- a/src/extras/3dtext/qextrudedtextgeometry.h
+++ b/src/extras/3dtext/qextrudedtextgeometry.h
@@ -52,39 +52,39 @@
#define QT3DEXTRAS_QEXTRUDEDTEXTGEOMETRY_H
#include <Qt3DExtras/qt3dextras_global.h>
-#include <Qt3DRender/qgeometry.h>
+#include <Qt3DCore/qgeometry.h>
#include <QtCore/QString>
#include <QtGui/QFont>
QT_BEGIN_NAMESPACE
-namespace Qt3DRender {
+namespace Qt3DCore {
class QAttribute;
-} // namespace Qt3DRender
+} // namespace Qt3DCore
namespace Qt3DExtras {
class QExtrudedTextGeometryPrivate;
-class Q_3DEXTRASSHARED_EXPORT QExtrudedTextGeometry : public Qt3DRender::QGeometry
+class Q_3DEXTRASSHARED_EXPORT QExtrudedTextGeometry : public Qt3DCore::QGeometry
{
Q_OBJECT
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
Q_PROPERTY(float extrusionLength READ extrusionLength WRITE setDepth NOTIFY depthChanged)
- Q_PROPERTY(Qt3DRender::QAttribute *positionAttribute READ positionAttribute CONSTANT)
- Q_PROPERTY(Qt3DRender::QAttribute *normalAttribute READ normalAttribute CONSTANT)
- Q_PROPERTY(Qt3DRender::QAttribute *indexAttribute READ indexAttribute CONSTANT)
+ Q_PROPERTY(Qt3DCore::QAttribute *positionAttribute READ positionAttribute CONSTANT)
+ Q_PROPERTY(Qt3DCore::QAttribute *normalAttribute READ normalAttribute CONSTANT)
+ Q_PROPERTY(Qt3DCore::QAttribute *indexAttribute READ indexAttribute CONSTANT)
public:
explicit QExtrudedTextGeometry(Qt3DCore::QNode *parent = nullptr);
~QExtrudedTextGeometry();
- Qt3DRender::QAttribute *positionAttribute() const;
- Qt3DRender::QAttribute *normalAttribute() const;
- Qt3DRender::QAttribute *indexAttribute() const;
+ Qt3DCore::QAttribute *positionAttribute() const;
+ Qt3DCore::QAttribute *normalAttribute() const;
+ Qt3DCore::QAttribute *indexAttribute() const;
QString text() const;
QFont font() const;
float extrusionLength() const;
diff --git a/src/extras/3dtext/qextrudedtextgeometry_p.h b/src/extras/3dtext/qextrudedtextgeometry_p.h
index 0bfa45e17..22b9e39ea 100644
--- a/src/extras/3dtext/qextrudedtextgeometry_p.h
+++ b/src/extras/3dtext/qextrudedtextgeometry_p.h
@@ -62,23 +62,24 @@
// We mean it.
//
-#include <Qt3DRender/private/qgeometry_p.h>
+#include <Qt3DCore/private/qgeometry_p.h>
+#include <Qt3DExtras/qextrudedtextgeometry.h>
#include <QFont>
QT_BEGIN_NAMESPACE
-namespace Qt3DRender {
+namespace Qt3DCore {
class QAttribute;
class QBuffer;
-} // namespace Qt3DRender
+} // namespace Qt3DCore
namespace Qt3DExtras {
class QExtrudedTextGeometry;
-class QExtrudedTextGeometryPrivate : public Qt3DRender::QGeometryPrivate
+class QExtrudedTextGeometryPrivate : public Qt3DCore::QGeometryPrivate
{
public:
QExtrudedTextGeometryPrivate();
@@ -90,11 +91,11 @@ public:
float m_depth;
float m_edgeSplitAngle;
- Qt3DRender::QAttribute *m_positionAttribute;
- Qt3DRender::QAttribute *m_normalAttribute;
- Qt3DRender::QAttribute *m_indexAttribute;
- Qt3DRender::QBuffer *m_vertexBuffer;
- Qt3DRender::QBuffer *m_indexBuffer;
+ Qt3DCore::QAttribute *m_positionAttribute;
+ Qt3DCore::QAttribute *m_normalAttribute;
+ Qt3DCore::QAttribute *m_indexAttribute;
+ Qt3DCore::QBuffer *m_vertexBuffer;
+ Qt3DCore::QBuffer *m_indexBuffer;
Q_DECLARE_PUBLIC(QExtrudedTextGeometry)
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 02:56:28 +0000