summaryrefslogtreecommitdiffstats
path: root/src/quick3d
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick3d')
-rw-r--r--src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp5
-rw-r--r--src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml3
-rw-r--r--src/quick3d/quick3d/items/items.pri2
-rw-r--r--src/quick3d/quick3d/items/quick3dtransform.cpp105
-rw-r--r--src/quick3d/quick3d/items/quick3dtransform_p.h87
5 files changed, 4 insertions, 198 deletions
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index ef724b3eb..b2b4245e7 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -43,9 +43,9 @@
#include <Qt3DCore/qtranslatetransform.h>
#include <Qt3DCore/qrotatetransform.h>
#include <Qt3DCore/qabstractattribute.h>
+#include <Qt3DCore/qtransform.h>
#include <private/quick3dentity_p.h>
#include <private/quick3dentityloader_p.h>
-#include <private/quick3dtransform_p.h>
#include <private/quick3dconfiguration_p.h>
#include <private/quick3dnodeinstantiator_p.h>
#include <private/qt3dquick_global_p.h>
@@ -63,7 +63,8 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri)
Qt3DCore::Quick::registerExtendedType<Qt3DCore::QEntity, Qt3DCore::Quick::Quick3DEntity>("QEntity", "Qt3D.Core/Entity", uri, 2, 0, "Entity");
qmlRegisterType<Qt3DCore::Quick::Quick3DEntityLoader>(uri, 2, 0, "EntityLoader");
qmlRegisterType<Qt3DCore::Quick::Quick3DNodeInstantiator>(uri, 2, 0, "NodeInstantiator");
- Qt3DCore::Quick::registerExtendedType<Qt3DCore::QTransform, Qt3DCore::Quick::Quick3DTransform>("QTransform", "Qt3D.Core/Transform", uri, 2, 0, "Transform");
+ qmlRegisterType<Qt3DCore::QTransform>(uri, 2, 0, "Transform");
+
// Ideally we want to make Node an uncreatable type
// We would need qmlRegisterUncreatableExtendedType for that
qmlRegisterExtendedUncreatableType<Qt3DCore::QNode, Qt3DCore::Quick::Quick3DNode>(uri, 2, 0, "Node", QStringLiteral("Node is a base class"));
diff --git a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
index bc1afc237..fac8ae8a9 100644
--- a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
+++ b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
@@ -39,7 +39,7 @@ import Qt3D.Render 2.0
Entity {
- property alias cameraPosition: cameraTranslate.translation;
+ property alias cameraPosition: transform.translation;
property string baseName: "";
property string extension: ".png"
@@ -80,7 +80,6 @@ Entity {
Transform {
id: transform
- Translate { id: cameraTranslate }
}
Material {
diff --git a/src/quick3d/quick3d/items/items.pri b/src/quick3d/quick3d/items/items.pri
index 6891b1e6a..17668085e 100644
--- a/src/quick3d/quick3d/items/items.pri
+++ b/src/quick3d/quick3d/items/items.pri
@@ -1,6 +1,5 @@
HEADERS += \
$$PWD/quick3dnodeinstantiator_p.h \
- $$PWD/quick3dtransform_p.h \
$$PWD/quick3dconfiguration_p.h \
$$PWD/quick3dentity_p.h \
$$PWD/quick3dentityloader_p_p.h \
@@ -11,7 +10,6 @@ SOURCES += \
$$PWD/quick3dnode.cpp \
$$PWD/quick3dentity.cpp \
$$PWD/quick3dentityloader.cpp \
- $$PWD/quick3dtransform.cpp \
$$PWD/quick3dconfiguration.cpp \
$$PWD/quick3dnodeinstantiator.cpp
diff --git a/src/quick3d/quick3d/items/quick3dtransform.cpp b/src/quick3d/quick3d/items/quick3dtransform.cpp
deleted file mode 100644
index e708cb04f..000000000
--- a/src/quick3d/quick3d/items/quick3dtransform.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "quick3dtransform_p.h"
-#include <Qt3DCore/qabstracttransform.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-namespace Quick {
-
-/*!
- \qmltype Transform
- \inqmlmodule Qt3D.Core
- \since 5.5
-*/
-Quick3DTransform::Quick3DTransform(QObject *parent)
- : QObject(parent)
-{
- Q_ASSERT(qobject_cast<Qt3DCore::QTransform *>(parent) != Q_NULLPTR);
-}
-
-/*!
- \qmlproperty matrix4x4 Qt3DCore::Transform::matrix
- \readonly
-*/
-
-/*!
- \qmlproperty list<QAbstractTransform> Qt3DCore::Transform::transforms
- \default
-*/
-QQmlListProperty<QAbstractTransform> Quick3DTransform::transformList()
-{
- return QQmlListProperty<QAbstractTransform>(this, 0,
- Quick3DTransform::qmlAppendTransform,
- Quick3DTransform::transformCount,
- Quick3DTransform::transformAt,
- Quick3DTransform::qmlClearTransforms);
-}
-
-void Quick3DTransform::qmlAppendTransform(QQmlListProperty<QAbstractTransform> *list, QAbstractTransform *obj )
-{
- if ( !obj )
- return;
-
- Quick3DTransform *self = static_cast<Quick3DTransform *>(list->object);
- self->parentTransform()->addTransform(obj);
-}
-
-QAbstractTransform* Quick3DTransform::transformAt(QQmlListProperty<QAbstractTransform> *list, int index)
-{
- Quick3DTransform *self = static_cast<Quick3DTransform *>(list->object);
- return self->parentTransform()->transforms().at(index);
-}
-
-int Quick3DTransform::transformCount(QQmlListProperty<QAbstractTransform> *list)
-{
- Quick3DTransform *self = static_cast<Quick3DTransform *>(list->object);
- return self->parentTransform()->transforms().count();
-}
-
-void Quick3DTransform::qmlClearTransforms(QQmlListProperty<QAbstractTransform> *list)
-{
- Quick3DTransform *self = static_cast<Quick3DTransform *>(list->object);
- Q_FOREACH (QAbstractTransform *trans, self->parentTransform()->transforms())
- self->parentTransform()->removeTransform(trans);
-}
-
-} // namespace Quick
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
diff --git a/src/quick3d/quick3d/items/quick3dtransform_p.h b/src/quick3d/quick3d/items/quick3dtransform_p.h
deleted file mode 100644
index 8f1ffe282..000000000
--- a/src/quick3d/quick3d/items/quick3dtransform_p.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3D_QUICK_QUICK3DTRANSFORM_P_H
-#define QT3D_QUICK_QUICK3DTRANSFORM_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists for the convenience
-// of other Qt classes. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/QtGlobal>
-#include <QQmlListProperty>
-#include <Qt3DQuick/private/qt3dquick_global_p.h>
-#include <Qt3DCore/qtransform.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QTransform;
-
-namespace Quick {
-
-class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DTransform : public QObject
-{
- Q_OBJECT
- Q_PROPERTY(QQmlListProperty<Qt3DCore::QAbstractTransform> transforms READ transformList)
- Q_CLASSINFO("DefaultProperty", "transforms")
-public:
- explicit Quick3DTransform(QObject *parent = 0);
- QQmlListProperty<Qt3DCore::QAbstractTransform> transformList();
-
- inline QTransform *parentTransform() const { return qobject_cast<Qt3DCore::QTransform *>(parent()); }
-
-private:
- static void qmlAppendTransform(QQmlListProperty<Qt3DCore::QAbstractTransform> *list, Qt3DCore::QAbstractTransform *bar);
- static QAbstractTransform* transformAt(QQmlListProperty<Qt3DCore::QAbstractTransform> *list, int index);
- static int transformCount(QQmlListProperty<Qt3DCore::QAbstractTransform> *list);
- static void qmlClearTransforms(QQmlListProperty<Qt3DCore::QAbstractTransform> *list);
-};
-
-} // namespace Quick
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
-
-#endif // QT3D_QUICK_QUICK3DTRANSFORM_P_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 10:57:58 +0000