summaryrefslogtreecommitdiffstats
path: root/src/quick3d
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick3d')
-rw-r--r--src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp12
-rw-r--r--src/quick3d/imports/render/qt3dquick3drenderplugin.cpp12
-rw-r--r--src/quick3d/quick3d/items/items.pri8
-rw-r--r--src/quick3d/quick3d/items/quick3dbuffer.cpp (renamed from src/quick3d/quick3drender/items/quick3dbuffer.cpp)20
-rw-r--r--src/quick3d/quick3d/items/quick3dbuffer_p.h (renamed from src/quick3d/quick3drender/items/quick3dbuffer_p.h)14
-rw-r--r--src/quick3d/quick3d/items/quick3dgeometry.cpp (renamed from src/quick3d/quick3drender/items/quick3dgeometry.cpp)30
-rw-r--r--src/quick3d/quick3d/items/quick3dgeometry_p.h (renamed from src/quick3d/quick3drender/items/quick3dgeometry_p.h)28
-rw-r--r--src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp16
-rw-r--r--src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h12
-rw-r--r--src/quick3d/quick3drender/items/items.pri4
-rw-r--r--src/quick3d/quick3dscene2d/items/scene2d.cpp2
11 files changed, 72 insertions, 86 deletions
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index 75fa7b2da..a15629b68 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -44,6 +44,9 @@
#include <Qt3DCore/qskeletonloader.h>
#include <Qt3DCore/qtransform.h>
#include <Qt3DCore/qjoint.h>
+#include <Qt3DCore/qattribute.h>
+#include <Qt3DCore/qbuffer.h>
+#include <Qt3DCore/qgeometry.h>
#include <QtCore/qvariantanimation.h>
#include <Qt3DQuick/private/quick3dnodev9_p.h>
@@ -53,6 +56,8 @@
#include <Qt3DQuick/private/quick3djoint_p.h>
#include <Qt3DQuick/private/qquaternionanimation_p.h>
#include <Qt3DQuick/private/qt3dquick_global_p.h>
+#include <Qt3DQuick/private/quick3dbuffer_p.h>
+#include <Qt3DQuick/private/quick3dgeometry_p.h>
#include <QtQml/qqml.h>
@@ -73,6 +78,13 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri)
qmlRegisterType<Qt3DCore::QArmature>(uri, 2, 10, "Armature");
qmlRegisterUncreatableType<Qt3DCore::QAbstractSkeleton>(uri, 2, 10, "AbstractSkeleton", QStringLiteral("AbstractSkeleton is an abstract base class"));
qmlRegisterType<Qt3DCore::QSkeletonLoader>(uri, 2, 10, "SkeletonLoader");
+ qmlRegisterType<Qt3DCore::QAttribute>(uri, 2, 0, "Attribute");
+ qmlRegisterType<Qt3DCore::QAttribute, 10>(uri, 2, 10, "Attribute");
+ qmlRegisterType<Qt3DCore::QAttribute, 11>(uri, 2, 11, "Attribute");
+ qmlRegisterUncreatableType<Qt3DCore::QBuffer>(uri, 2, 0, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML"));
+ qmlRegisterUncreatableType<Qt3DCore::QBuffer, 9>(uri, 2, 9, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML"));
+ qmlRegisterType<Qt3DCore::Quick::Quick3DBuffer>(uri, 2, 0, "Buffer");
+ Qt3DCore::Quick::registerExtendedType<Qt3DCore::QGeometry, Qt3DCore::Quick::Quick3DGeometry>("QGeometry", "Qt3D.Core/Geometry", uri, 2, 0, "Geometry");
qmlRegisterType<Qt3DCore::Quick::QQuaternionAnimation>(uri, 2, 0, "QuaternionAnimation");
qRegisterAnimationInterpolator<QQuaternion>(Qt3DCore::Quick::q_quaternionInterpolator);
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index e42be550d..9992ace97 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -42,10 +42,8 @@
#include <Qt3DRender/qabstractlight.h>
#include <Qt3DRender/qalphacoverage.h>
#include <Qt3DRender/qalphatest.h>
-#include <Qt3DRender/qattribute.h>
#include <Qt3DRender/qblendequation.h>
#include <Qt3DRender/qblendequationarguments.h>
-#include <Qt3DRender/qbuffer.h>
#include <Qt3DRender/qbuffercapture.h>
#include <Qt3DRender/qcamera.h>
#include <Qt3DRender/qcameralens.h>
@@ -65,7 +63,6 @@
#include <Qt3DRender/qfilterkey.h>
#include <Qt3DRender/qfrontface.h>
#include <Qt3DRender/qfrustumculling.h>
-#include <Qt3DRender/qgeometry.h>
#include <Qt3DRender/qgeometryrenderer.h>
#include <Qt3DRender/qgraphicsapifilter.h>
#include <Qt3DRender/qlayer.h>
@@ -125,9 +122,7 @@
#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
-#include <Qt3DQuickRender/private/quick3dbuffer_p.h>
#include <Qt3DQuickRender/private/quick3deffect_p.h>
-#include <Qt3DQuickRender/private/quick3dgeometry_p.h>
#include <Qt3DQuickRender/private/quick3dlayerfilter_p.h>
#include <Qt3DQuickRender/private/quick3dmaterial_p.h>
#include <Qt3DQuickRender/private/quick3dmemorybarrier_p.h>
@@ -223,13 +218,6 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
qmlRegisterType<Qt3DRender::QShaderImage>(uri, 2, 14, "ShaderImage");
// Geometry
- qmlRegisterType<Qt3DRender::QAttribute>(uri, 2, 0, "Attribute");
- qmlRegisterType<Qt3DRender::QAttribute, 10>(uri, 2, 10, "Attribute");
- qmlRegisterType<Qt3DRender::QAttribute, 11>(uri, 2, 11, "Attribute");
- qmlRegisterUncreatableType<Qt3DRender::QBuffer>(uri, 2, 0, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML"));
- qmlRegisterUncreatableType<Qt3DRender::QBuffer, 9>(uri, 2, 9, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML"));
- qmlRegisterType<Qt3DRender::Render::Quick::Quick3DBuffer>(uri, 2, 0, "Buffer");
- Qt3DRender::Quick::registerExtendedType<Qt3DRender::QGeometry, Qt3DRender::Render::Quick::Quick3DGeometry>("QGeometry", "Qt3D.Render/Geometry", uri, 2, 0, "Geometry");
qmlRegisterType<Qt3DRender::QGeometryRenderer>(uri, 2, 0, "GeometryRenderer");
qmlRegisterType<Qt3DRender::QLevelOfDetail>(uri, 2, 9, "LevelOfDetail");
qmlRegisterType<Qt3DRender::QLevelOfDetailSwitch>(uri, 2, 9, "LevelOfDetailSwitch");
diff --git a/src/quick3d/quick3d/items/items.pri b/src/quick3d/quick3d/items/items.pri
index 36e7ccedc..febe5c395 100644
--- a/src/quick3d/quick3d/items/items.pri
+++ b/src/quick3d/quick3d/items/items.pri
@@ -5,7 +5,9 @@ HEADERS += \
$$PWD/quick3dentityloader_p.h \
$$PWD/quick3dnode_p.h \
$$PWD/quick3dnodev9_p.h \
- $$PWD/quick3djoint_p.h
+ $$PWD/quick3djoint_p.h \
+ $$PWD/quick3dbuffer_p.h \
+ $$PWD/quick3dgeometry_p.h
SOURCES += \
$$PWD/quick3dnode.cpp \
@@ -13,6 +15,8 @@ SOURCES += \
$$PWD/quick3dentityloader.cpp \
$$PWD/quick3dnodeinstantiator.cpp \
$$PWD/quick3dnodev9.cpp \
- $$PWD/quick3djoint.cpp
+ $$PWD/quick3djoint.cpp \
+ $$PWD/quick3dbuffer.cpp \
+ $$PWD/quick3dgeometry.cpp
INCLUDEPATH += $$PWD
diff --git a/src/quick3d/quick3drender/items/quick3dbuffer.cpp b/src/quick3d/quick3d/items/quick3dbuffer.cpp
index 9ff349118..7beb1cc90 100644
--- a/src/quick3d/quick3drender/items/quick3dbuffer.cpp
+++ b/src/quick3d/quick3d/items/quick3dbuffer.cpp
@@ -40,20 +40,17 @@
#include <QtQml/QJSValue>
#include <QtQml/QQmlEngine>
-#include <Qt3DQuickRender/private/quick3dbuffer_p.h>
+#include <Qt3DQuick/private/quick3dbuffer_p.h>
#include <QtQml/private/qqmlengine_p.h>
#include <QtQml/private/qjsvalue_p.h>
#include <QtQml/private/qv4typedarray_p.h>
#include <QtQml/private/qv4arraybuffer_p.h>
-#include <Qt3DRender/private/qurlhelper_p.h>
+#include <Qt3DCore/private/qurlhelper_p.h>
#include <QtCore/qfile.h>
QT_BEGIN_NAMESPACE
-namespace Qt3DRender {
-
-namespace Render {
-
+namespace Qt3DCore {
namespace Quick {
namespace {
@@ -61,11 +58,11 @@ const int jsValueTypeId = qMetaTypeId<QJSValue>();
}
Quick3DBuffer::Quick3DBuffer(Qt3DCore::QNode *parent)
- : Qt3DRender::QBuffer(parent)
+ : Qt3DCore::QBuffer(parent)
, m_engine(nullptr)
, m_v4engine(nullptr)
{
- QObject::connect(this, &Qt3DRender::QBuffer::dataChanged, this, &Quick3DBuffer::bufferDataChanged);
+ QObject::connect(this, &Qt3DCore::QBuffer::dataChanged, this, &Quick3DBuffer::bufferDataChanged);
}
QByteArray Quick3DBuffer::convertToRawData(const QJSValue &jsValue)
@@ -120,7 +117,7 @@ void Quick3DBuffer::updateData(int offset, const QVariant &bufferData)
*/
QVariant Quick3DBuffer::readBinaryFile(const QUrl &fileUrl)
{
- QFile f(Qt3DRender::QUrlHelper::urlToLocalFileOrQrc(fileUrl));
+ QFile f(Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(fileUrl));
QByteArray data;
if (f.open(QIODevice::ReadOnly))
@@ -137,9 +134,6 @@ void Quick3DBuffer::initEngines()
}
} // Quick
-
-} // Render
-
-} // Qt3DRender
+} // Qt3DCore
QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drender/items/quick3dbuffer_p.h b/src/quick3d/quick3d/items/quick3dbuffer_p.h
index 233cc3faf..b75164e4c 100644
--- a/src/quick3d/quick3drender/items/quick3dbuffer_p.h
+++ b/src/quick3d/quick3d/items/quick3dbuffer_p.h
@@ -51,9 +51,9 @@
// We mean it.
//
-#include <Qt3DRender/QBuffer>
+#include <Qt3DCore/QBuffer>
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
+#include <Qt3DQuick/private/qt3dquick_global_p.h>
QT_BEGIN_NAMESPACE
@@ -64,13 +64,11 @@ namespace QV4 {
struct ExecutionEngine;
}
-namespace Qt3DRender {
-
-namespace Render {
+namespace Qt3DCore {
namespace Quick {
-class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DBuffer : public Qt3DRender::QBuffer
+class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DBuffer : public Qt3DCore::QBuffer
{
Q_OBJECT
Q_PROPERTY(QVariant data READ bufferData WRITE setBufferData NOTIFY bufferDataChanged)
@@ -97,9 +95,7 @@ private:
} // Quick
-} // Render
-
-} // Qt3DRender
+} // Qt3DCore
QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drender/items/quick3dgeometry.cpp b/src/quick3d/quick3d/items/quick3dgeometry.cpp
index 3f70ea572..8e9e56fab 100644
--- a/src/quick3d/quick3drender/items/quick3dgeometry.cpp
+++ b/src/quick3d/quick3d/items/quick3dgeometry.cpp
@@ -37,12 +37,11 @@
**
****************************************************************************/
-#include <Qt3DQuickRender/private/quick3dgeometry_p.h>
+#include <Qt3DQuick/private/quick3dgeometry_p.h>
QT_BEGIN_NAMESPACE
-namespace Qt3DRender {
-namespace Render {
+namespace Qt3DCore {
namespace Quick {
Quick3DGeometry::Quick3DGeometry(QObject *parent)
@@ -50,44 +49,43 @@ Quick3DGeometry::Quick3DGeometry(QObject *parent)
{
}
-QQmlListProperty<Qt3DRender::QAttribute> Quick3DGeometry::attributeList()
+QQmlListProperty<Qt3DCore::QAttribute> Quick3DGeometry::attributeList()
{
- return QQmlListProperty<Qt3DRender::QAttribute>(this, 0,
- &Quick3DGeometry::appendAttribute,
- &Quick3DGeometry::attributesCount,
- &Quick3DGeometry::attributeAt,
- &Quick3DGeometry::clearAttributes);
+ return QQmlListProperty<Qt3DCore::QAttribute>(this, nullptr,
+ &Quick3DGeometry::appendAttribute,
+ &Quick3DGeometry::attributesCount,
+ &Quick3DGeometry::attributeAt,
+ &Quick3DGeometry::clearAttributes);
}
-void Quick3DGeometry::appendAttribute(QQmlListProperty<Qt3DRender::QAttribute> *list, Qt3DRender::QAttribute *attribute)
+void Quick3DGeometry::appendAttribute(QQmlListProperty<Qt3DCore::QAttribute> *list, Qt3DCore::QAttribute *attribute)
{
Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
geometry->m_managedAttributes.append(attribute);
geometry->parentGeometry()->addAttribute(attribute);
}
-Qt3DRender::QAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<Qt3DRender::QAttribute> *list, int index)
+Qt3DCore::QAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<Qt3DCore::QAttribute> *list, int index)
{
Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
return geometry->parentGeometry()->attributes().at(index);
}
-int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3DRender::QAttribute> *list)
+int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3DCore::QAttribute> *list)
{
Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
return geometry->parentGeometry()->attributes().count();
}
-void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3DRender::QAttribute> *list)
+void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3DCore::QAttribute> *list)
{
Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
- for (Qt3DRender::QAttribute *attribute : qAsConst(geometry->m_managedAttributes))
+ for (Qt3DCore::QAttribute *attribute : qAsConst(geometry->m_managedAttributes))
geometry->parentGeometry()->removeAttribute(attribute);
geometry->m_managedAttributes.clear();
}
} // namespace Quick
-} // namespace Render
-} // namespace Qt3DRender
+} // namespace Qt3DCore
QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drender/items/quick3dgeometry_p.h b/src/quick3d/quick3d/items/quick3dgeometry_p.h
index 19a308076..39bafbea7 100644
--- a/src/quick3d/quick3drender/items/quick3dgeometry_p.h
+++ b/src/quick3d/quick3d/items/quick3dgeometry_p.h
@@ -51,41 +51,39 @@
// We mean it.
//
-#include <Qt3DRender/QGeometry>
+#include <Qt3DCore/QGeometry>
#include <QtQml/QQmlListProperty>
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
+#include <Qt3DQuick/private/qt3dquick_global_p.h>
QT_BEGIN_NAMESPACE
-namespace Qt3DRender {
-namespace Render {
+namespace Qt3DCore {
namespace Quick {
-class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DGeometry : public QObject
+class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DGeometry : public QObject
{
Q_OBJECT
- Q_PROPERTY(QQmlListProperty<Qt3DRender::QAttribute> attributes READ attributeList)
+ Q_PROPERTY(QQmlListProperty<Qt3DCore::QAttribute> attributes READ attributeList)
Q_CLASSINFO("DefaultProperty", "attributes")
public:
- explicit Quick3DGeometry(QObject *parent = 0);
+ explicit Quick3DGeometry(QObject *parent = nullptr);
inline QGeometry *parentGeometry() const { return qobject_cast<QGeometry *>(parent()); }
- QQmlListProperty<Qt3DRender::QAttribute> attributeList();
+ QQmlListProperty<Qt3DCore::QAttribute> attributeList();
private:
- static void appendAttribute(QQmlListProperty<Qt3DRender::QAttribute> *list, Qt3DRender::QAttribute *provider);
- static Qt3DRender::QAttribute *attributeAt(QQmlListProperty<Qt3DRender::QAttribute> *list, int index);
- static int attributesCount(QQmlListProperty<Qt3DRender::QAttribute> *list);
- static void clearAttributes(QQmlListProperty<Qt3DRender::QAttribute> *list);
+ static void appendAttribute(QQmlListProperty<Qt3DCore::QAttribute> *list, Qt3DCore::QAttribute *provider);
+ static Qt3DCore::QAttribute *attributeAt(QQmlListProperty<Qt3DCore::QAttribute> *list, int index);
+ static int attributesCount(QQmlListProperty<Qt3DCore::QAttribute> *list);
+ static void clearAttributes(QQmlListProperty<Qt3DCore::QAttribute> *list);
- QVector<Qt3DRender::QAttribute *> m_managedAttributes;
+ QVector<Qt3DCore::QAttribute *> m_managedAttributes;
};
} // namespace Quick
-} // namespace Render
-} // namespace Qt3DRender
+} // namespace Qt3DCore
QT_END_NAMESPACE
diff --git a/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp
index 81144e186..030d5abe5 100644
--- a/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp
+++ b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp
@@ -46,23 +46,23 @@ QQuick3DMorphTarget::QQuick3DMorphTarget(QObject *parent)
{
}
-QQmlListProperty<Qt3DRender::QAttribute> QQuick3DMorphTarget::attributes()
+QQmlListProperty<Qt3DCore::QAttribute> QQuick3DMorphTarget::attributes()
{
- return QQmlListProperty<Qt3DRender::QAttribute>(this, 0,
+ return QQmlListProperty<Qt3DCore::QAttribute>(this, 0,
&QQuick3DMorphTarget::appendAttribute,
&QQuick3DMorphTarget::attributeCount,
&QQuick3DMorphTarget::attributeAt,
&QQuick3DMorphTarget::clearAttributes);
}
-void QQuick3DMorphTarget::appendAttribute(QQmlListProperty<Qt3DRender::QAttribute> *list, Qt3DRender::QAttribute *bar)
+void QQuick3DMorphTarget::appendAttribute(QQmlListProperty<Qt3DCore::QAttribute> *list, Qt3DCore::QAttribute *bar)
{
QQuick3DMorphTarget *target = qobject_cast<QQuick3DMorphTarget *>(list->object);
if (target)
target->parentMorphTarget()->addAttribute(bar);
}
-int QQuick3DMorphTarget::attributeCount(QQmlListProperty<Qt3DRender::QAttribute> *list)
+int QQuick3DMorphTarget::attributeCount(QQmlListProperty<Qt3DCore::QAttribute> *list)
{
QQuick3DMorphTarget *target = qobject_cast<QQuick3DMorphTarget *>(list->object);
if (target)
@@ -70,19 +70,19 @@ int QQuick3DMorphTarget::attributeCount(QQmlListProperty<Qt3DRender::QAttribute>
return 0;
}
-Qt3DRender::QAttribute *QQuick3DMorphTarget::attributeAt(QQmlListProperty<Qt3DRender::QAttribute> *list, int index)
+Qt3DCore::QAttribute *QQuick3DMorphTarget::attributeAt(QQmlListProperty<Qt3DCore::QAttribute> *list, int index)
{
QQuick3DMorphTarget *target = qobject_cast<QQuick3DMorphTarget *>(list->object);
if (target)
- return qobject_cast<Qt3DRender::QAttribute *>(target->parentMorphTarget()->attributeList().at(index));
+ return qobject_cast<Qt3DCore::QAttribute *>(target->parentMorphTarget()->attributeList().at(index));
return nullptr;
}
-void QQuick3DMorphTarget::clearAttributes(QQmlListProperty<Qt3DRender::QAttribute> *list)
+void QQuick3DMorphTarget::clearAttributes(QQmlListProperty<Qt3DCore::QAttribute> *list)
{
QQuick3DMorphTarget *target = qobject_cast<QQuick3DMorphTarget *>(list->object);
if (target) {
- QVector<Qt3DRender::QAttribute *> emptyList;
+ QVector<Qt3DCore::QAttribute *> emptyList;
target->parentMorphTarget()->setAttributes(emptyList);
}
}
diff --git a/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h b/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h
index 5ca783e6b..d68a795e9 100644
--- a/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h
+++ b/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h
@@ -60,21 +60,21 @@ namespace Quick {
class Q_3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DMorphTarget : public QObject
{
Q_OBJECT
- Q_PROPERTY(QQmlListProperty<Qt3DRender::QAttribute> attributes READ attributes)
+ Q_PROPERTY(QQmlListProperty<Qt3DCore::QAttribute> attributes READ attributes)
public:
QQuick3DMorphTarget(QObject *parent = nullptr);
inline QMorphTarget *parentMorphTarget() const { return qobject_cast<QMorphTarget *>(parent()); }
- QQmlListProperty<Qt3DRender::QAttribute> attributes();
+ QQmlListProperty<Qt3DCore::QAttribute> attributes();
private:
- static void appendAttribute(QQmlListProperty<Qt3DRender::QAttribute> *list, Qt3DRender::QAttribute *bar);
- static Qt3DRender::QAttribute *attributeAt(QQmlListProperty<Qt3DRender::QAttribute> *list, int index);
- static int attributeCount(QQmlListProperty<Qt3DRender::QAttribute> *list);
- static void clearAttributes(QQmlListProperty<Qt3DRender::QAttribute> *list);
+ static void appendAttribute(QQmlListProperty<Qt3DCore::QAttribute> *list, Qt3DCore::QAttribute *bar);
+ static Qt3DCore::QAttribute *attributeAt(QQmlListProperty<Qt3DCore::QAttribute> *list, int index);
+ static int attributeCount(QQmlListProperty<Qt3DCore::QAttribute> *list);
+ static void clearAttributes(QQmlListProperty<Qt3DCore::QAttribute> *list);
};
} // namespace Quick
diff --git a/src/quick3d/quick3drender/items/items.pri b/src/quick3d/quick3drender/items/items.pri
index e264624b3..4bfb1ae4a 100644
--- a/src/quick3d/quick3drender/items/items.pri
+++ b/src/quick3d/quick3drender/items/items.pri
@@ -1,8 +1,6 @@
HEADERS += \
$$PWD/quick3dtechniquefilter_p.h \
- $$PWD/quick3dbuffer_p.h \
$$PWD/quick3deffect_p.h \
- $$PWD/quick3dgeometry_p.h \
$$PWD/quick3dlayerfilter_p.h \
$$PWD/quick3dmaterial_p.h \
$$PWD/quick3drenderpass_p.h \
@@ -40,8 +38,6 @@ SOURCES += \
$$PWD/quick3dshaderdataarray.cpp \
$$PWD/quick3dstateset.cpp \
$$PWD/quick3drendertargetselector.cpp \
- $$PWD/quick3dgeometry.cpp \
- $$PWD/quick3dbuffer.cpp \
$$PWD/quick3drendertargetoutput.cpp \
$$PWD/quick3dmemorybarrier.cpp \
$$PWD/quick3draycaster.cpp \
diff --git a/src/quick3d/quick3dscene2d/items/scene2d.cpp b/src/quick3d/quick3dscene2d/items/scene2d.cpp
index dcc99ed8c..2b0a6580d 100644
--- a/src/quick3d/quick3dscene2d/items/scene2d.cpp
+++ b/src/quick3d/quick3dscene2d/items/scene2d.cpp
@@ -480,7 +480,7 @@ void Scene2D::handlePickEvent(int type, const Qt3DRender::QPickEvent *ev)
CoordinateReader reader(renderer()->nodeManagers());
if (reader.setGeometry(entity->renderComponent<GeometryRenderer>(),
- QAttribute::defaultTextureCoordinateAttributeName())) {
+ Qt3DCore::QAttribute::defaultTextureCoordinateAttributeName())) {
Vector4D c0 = reader.getCoordinate(pickTriangle->vertex1Index());
Vector4D c1 = reader.getCoordinate(pickTriangle->vertex2Index());
Vector4D c2 = reader.getCoordinate(pickTriangle->vertex3Index());
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 11:51:11 +0000