diff options
Diffstat (limited to 'src/quick3d')
84 files changed, 278 insertions, 1013 deletions
diff --git a/src/quick3d/imports/animation/importsanimation.pro b/src/quick3d/imports/animation/importsanimation.pro deleted file mode 100644 index 734c5186b..000000000 --- a/src/quick3d/imports/animation/importsanimation.pro +++ /dev/null @@ -1,16 +0,0 @@ -CXX_MODULE = qml -TARGET = quick3danimationplugin -TARGETPATH = Qt3D/Animation -IMPORT_VERSION = 2.$$QT_MINOR_VERSION - -QT += core-private qml qml-private 3dcore 3drender 3danimation 3dquick 3dquickrender 3dquickanimation 3dquick-private 3dquickanimation-private - -HEADERS += \ - qt3dquick3danimationplugin.h - -SOURCES += \ - qt3dquick3danimationplugin.cpp - -OTHER_FILES += qmldir - -load(qml_plugin) diff --git a/src/quick3d/imports/core/importscore.pro b/src/quick3d/imports/core/importscore.pro deleted file mode 100644 index 9ba6ac66d..000000000 --- a/src/quick3d/imports/core/importscore.pro +++ /dev/null @@ -1,16 +0,0 @@ -CXX_MODULE = qml -TARGET = quick3dcoreplugin -TARGETPATH = Qt3D/Core -IMPORT_VERSION = 2.$$QT_MINOR_VERSION - -QT += core-private qml qml-private quick quick-private 3dcore 3dcore-private 3dquick 3dquick-private - -HEADERS += \ - qt3dquick3dcoreplugin.h - -SOURCES += \ - qt3dquick3dcoreplugin.cpp - -OTHER_FILES += qmldir - -load(qml_plugin) diff --git a/src/quick3d/imports/extras/importsextras.pro b/src/quick3d/imports/extras/importsextras.pro deleted file mode 100644 index 1ac629422..000000000 --- a/src/quick3d/imports/extras/importsextras.pro +++ /dev/null @@ -1,16 +0,0 @@ -CXX_MODULE = qml -TARGET = quick3dextrasplugin -TARGETPATH = Qt3D/Extras -IMPORT_VERSION = 2.$$QT_MINOR_VERSION - -QT += core-private qml qml-private quick quick-private 3dcore 3dcore-private 3dquick 3dquick-private 3dextras 3dlogic 3dquickextras 3dquickextras-private - -HEADERS += \ - qt3dquick3dextrasplugin.h - -SOURCES += \ - qt3dquick3dextrasplugin.cpp - -OTHER_FILES += qmldir - -load(qml_plugin) diff --git a/src/quick3d/imports/input/CMakeLists.txt b/src/quick3d/imports/input/CMakeLists.txt index d0a57256b..52ce25c8f 100644 --- a/src/quick3d/imports/input/CMakeLists.txt +++ b/src/quick3d/imports/input/CMakeLists.txt @@ -11,15 +11,12 @@ qt_internal_add_qml_module(quick3dinputplugin URI "Qt3D.Input" VERSION "2.${PROJECT_VERSION_MINOR}" CLASS_NAME Qt3DQuick3DInputPlugin + NO_PLUGIN_OPTIONAL DEPENDENCIES QtQml/auto PLUGIN_TARGET quick3dinputplugin - NO_PLUGIN_OPTIONAL - NO_GENERATE_PLUGIN_SOURCE - NO_GENERATE_QMLTYPES - INSTALL_SOURCE_QMLTYPES "plugins.qmltypes" SOURCES - qt3dquick3dinputplugin.cpp qt3dquick3dinputplugin.h + qt3dquick3dinputforeign_p.h LIBRARIES Qt::3DCore Qt::3DInput @@ -30,6 +27,7 @@ qt_internal_add_qml_module(quick3dinputplugin Qt::Gui Qt::Qml ) +target_include_directories(quick3dinputplugin PRIVATE ../../quick3dinput/items) #### Keys ignored in scope 1:.:.:importsinput.pro:<TRUE>: # CXX_MODULE = "qml" diff --git a/src/quick3d/imports/input/importsinput.pro b/src/quick3d/imports/input/importsinput.pro deleted file mode 100644 index ec333f992..000000000 --- a/src/quick3d/imports/input/importsinput.pro +++ /dev/null @@ -1,18 +0,0 @@ -CXX_MODULE = qml -TARGET = quick3dinputplugin -TARGETPATH = Qt3D/Input -IMPORT_VERSION = 2.$$QT_MINOR_VERSION - -QT += core-private qml 3dcore 3dinput 3dinput-private 3dquickinput-private - -OTHER_FILES += qmldir - -HEADERS += \ - qt3dquick3dinputplugin.h - -SOURCES += \ - qt3dquick3dinputplugin.cpp - -qtHaveModule(gamepad): DEFINES += HAVE_QGAMEPAD - -load(qml_plugin) diff --git a/src/quick3d/imports/input/qt3dquick3dinputforeign_p.h b/src/quick3d/imports/input/qt3dquick3dinputforeign_p.h new file mode 100644 index 000000000..2079a258e --- /dev/null +++ b/src/quick3d/imports/input/qt3dquick3dinputforeign_p.h @@ -0,0 +1,238 @@ +// Copyright (C) 2023 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#ifndef QT3D_QUICK_INPUT_FOREIGN_P_H +#define QT3D_QUICK_INPUT_FOREIGN_P_H + +#include <QQmlEngine> + +#include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DInput/qaction.h> +#include <Qt3DInput/qactioninput.h> +#include <Qt3DInput/qanalogaxisinput.h> +#include <Qt3DInput/qaxis.h> +#include <Qt3DInput/qaxisaccumulator.h> +#include <Qt3DInput/qaxissetting.h> +#include <Qt3DInput/qbuttonaxisinput.h> +#include <Qt3DInput/qinputchord.h> +#include <Qt3DInput/qinputsequence.h> +#include <Qt3DInput/qinputsettings.h> +#include <Qt3DInput/qkeyboarddevice.h> +#include <Qt3DInput/qkeyboardhandler.h> +#include <Qt3DInput/qkeyevent.h> +#include <Qt3DInput/qlogicaldevice.h> +#include <Qt3DInput/qmousedevice.h> +#include <Qt3DInput/qmouseevent.h> +#include <Qt3DInput/qmousehandler.h> + +#include <Qt3DInput/private/qgenericinputdevice_p.h> +#include <Qt3DQuickInput/private/quick3daction_p.h> +#include <Qt3DQuickInput/private/quick3daxis_p.h> +#include <Qt3DQuickInput/private/quick3dinputchord_p.h> +#include <Qt3DQuickInput/private/quick3dinputsequence_p.h> +#include <Qt3DQuickInput/private/quick3dlogicaldevice_p.h> +#include <Qt3DQuickInput/private/quick3dphysicaldevice_p.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3D { +namespace Input { + +struct QKeyEventForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(KeyEvent) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QKeyEvent) + QML_UNCREATABLE("Events cannot be created") +}; + +struct QKeyboardDeviceForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(KeyboardDevice) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QKeyboardDevice) +}; + +struct QKeyboardHandlerForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(KeyboardHandler) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QKeyboardHandler) +}; + +struct QInputSettingsForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(InputSettings) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QInputSettings) +}; + +struct QQMouseEventForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(MouseEvent) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QMouseEvent) + QML_UNCREATABLE("Events cannot be created") +}; + +#if QT_CONFIG(wheelevent) +struct QWheelEventForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(WheelEvent) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QWheelEvent) + QML_UNCREATABLE("Events cannot be created") +}; +#endif + +struct QMouseHandlerForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(MouseHandler) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QMouseHandler) +}; + +struct QMouseDeviceForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(MouseDevice) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QMouseDevice) +}; + +struct QLogicalDeviceDeviceForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(LogicalDevice) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QLogicalDevice) + QML_EXTENDED(Qt3DInput::Input::Quick::Quick3DLogicalDevice) +}; + +struct QAbstractActionInputForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(AbstractActionInput) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QAbstractActionInput) + QML_UNCREATABLE("AbstractActionInput is abstract") +}; + +struct QActionInputForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(ActionInput) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QActionInput) +}; + +struct QAbstractAxisInputForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(AbstractAxisInput) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QAbstractAxisInput) + QML_UNCREATABLE("AbstractAxisInput is abstract") +}; + +struct QAxisSettingForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(AxisSetting) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QAxisSetting) +}; + +struct QAnalogAxisInputForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(AnalogAxisInput) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QAnalogAxisInput) +}; + +struct QButtonAxisInputForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(ButtonAxisInput) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QButtonAxisInput) +}; + +struct QAxisForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(Axis) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QAxis) + QML_EXTENDED(Qt3DInput::Input::Quick::Quick3DAxis) +}; + +struct QActionForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(Action) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QAction) + QML_EXTENDED(Qt3DInput::Input::Quick::Quick3DAction) +}; + +struct QInputSequenceForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(InputSequence) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QInputSequence) + QML_EXTENDED(Qt3DInput::Input::Quick::Quick3DInputSequence) +}; + +struct QInputChordForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(InputChord) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QInputChord) + QML_EXTENDED(Qt3DInput::Input::Quick::Quick3DInputChord) +}; + +struct QAbstractPhysicalDeviceForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(AbstractPhysicalDevice) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QAbstractPhysicalDevice) + QML_EXTENDED(Qt3DInput::Input::Quick::Quick3DPhysicalDevice) + QML_UNCREATABLE("QAbstractPhysicalDevice is abstract") +}; + +struct QAxisAccumulatorForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(AxisAccumulator) + QML_ADDED_IN_VERSION(2, 1) + QML_FOREIGN(Qt3DInput::QAxisAccumulator) +}; + +#ifdef HAVE_QGAMEPAD +struct QGamepadInputForeign +{ + Q_GADGET + QML_NAMED_ELEMENT(GamepadInput) + QML_ADDED_IN_VERSION(2, 0) + QML_FOREIGN(Qt3DInput::QGamepadInput) +}; +#endif + +} // namespace Input +} // namespace Qt3D + +QT_END_NAMESPACE + +#endif diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp deleted file mode 100644 index 6f7a945d7..000000000 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -#include "qt3dquick3dinputplugin.h" - -#include <Qt3DInput/qabstractphysicaldevice.h> -#include <Qt3DInput/qaction.h> -#include <Qt3DInput/qactioninput.h> -#include <Qt3DInput/qanalogaxisinput.h> -#include <Qt3DInput/qaxis.h> -#include <Qt3DInput/qaxisaccumulator.h> -#include <Qt3DInput/qaxissetting.h> -#include <Qt3DInput/qbuttonaxisinput.h> -#include <Qt3DInput/qinputchord.h> -#include <Qt3DInput/qinputsequence.h> -#include <Qt3DInput/qinputsettings.h> -#include <Qt3DInput/qkeyboarddevice.h> -#include <Qt3DInput/qkeyboardhandler.h> -#include <Qt3DInput/qkeyevent.h> -#include <Qt3DInput/qlogicaldevice.h> -#include <Qt3DInput/qmousedevice.h> -#include <Qt3DInput/qmouseevent.h> -#include <Qt3DInput/qmousehandler.h> -#include <QtQml> - -#include <Qt3DInput/private/qgenericinputdevice_p.h> -#include <Qt3DQuickInput/private/quick3daction_p.h> -#include <Qt3DQuickInput/private/quick3daxis_p.h> -#include <Qt3DQuickInput/private/quick3dinputchord_p.h> -#include <Qt3DQuickInput/private/quick3dinputsequence_p.h> -#include <Qt3DQuickInput/private/quick3dlogicaldevice_p.h> -#include <Qt3DQuickInput/private/quick3dphysicaldevice_p.h> - -#ifdef HAVE_QGAMEPAD -# include <Qt3DInput/private/qgamepadinput_p.h> -#endif - -QT_BEGIN_NAMESPACE - -void Qt3DQuick3DInputPlugin::registerTypes(const char *uri) -{ - qmlRegisterUncreatableType<Qt3DInput::QKeyEvent>(uri, 2, 0, "KeyEvent", QStringLiteral("Events cannot be created")); - qmlRegisterType<Qt3DInput::QKeyboardDevice>(uri, 2, 0, "KeyboardDevice"); - qmlRegisterType<Qt3DInput::QKeyboardHandler>(uri, 2, 0, "KeyboardHandler"); - qmlRegisterType<Qt3DInput::QInputSettings>(uri, 2, 0, "InputSettings"); - - qmlRegisterUncreatableType<Qt3DInput::QMouseEvent>(uri, 2, 0, "MouseEvent", QStringLiteral("Events cannot be created")); -#if QT_CONFIG(wheelevent) - qmlRegisterUncreatableType<Qt3DInput::QWheelEvent>(uri, 2, 0, "WheelEvent", QStringLiteral("Events cannot be created")); -#endif - qmlRegisterType<Qt3DInput::QMouseHandler>(uri, 2, 0, "MouseHandler"); - qmlRegisterType<Qt3DInput::QMouseDevice>(uri, 2, 0, "MouseDevice"); - qmlRegisterType<Qt3DInput::QMouseDevice, 15>(uri, 2, 15, "MouseDevice"); - - qmlRegisterExtendedType<Qt3DInput::QLogicalDevice, Qt3DInput::Input::Quick::Quick3DLogicalDevice>(uri, 2, 0, "LogicalDevice"); - qmlRegisterUncreatableType<Qt3DInput::QAbstractActionInput>(uri, 2, 0, "AbstractActionInput", QStringLiteral("AbstractActionInput is abstract")); - qmlRegisterType<Qt3DInput::QActionInput>(uri, 2, 0, "ActionInput"); - qmlRegisterUncreatableType<Qt3DInput::QAbstractAxisInput>(uri, 2, 0, "AbstractAxisInput", QStringLiteral("AbstractAxisInput is abstract")); - qmlRegisterType<Qt3DInput::QAxisSetting>(uri, 2, 0, "AxisSetting"); - qmlRegisterType<Qt3DInput::QAnalogAxisInput>(uri, 2, 0, "AnalogAxisInput"); - qmlRegisterType<Qt3DInput::QButtonAxisInput>(uri, 2, 0, "ButtonAxisInput"); - qmlRegisterExtendedType<Qt3DInput::QAxis, Qt3DInput::Input::Quick::Quick3DAxis>(uri, 2, 0, "Axis"); - qmlRegisterExtendedType<Qt3DInput::QAction, Qt3DInput::Input::Quick::Quick3DAction>(uri, 2, 0, "Action"); - qmlRegisterExtendedType<Qt3DInput::QInputSequence, Qt3DInput::Input::Quick::Quick3DInputSequence>(uri, 2, 0, "InputSequence"); - qmlRegisterExtendedType<Qt3DInput::QInputChord, Qt3DInput::Input::Quick::Quick3DInputChord>(uri, 2, 0, "InputChord"); - qmlRegisterExtendedUncreatableType<Qt3DInput::QAbstractPhysicalDevice, Qt3DInput::Input::Quick::Quick3DPhysicalDevice>(uri, 2, 0, "QAbstractPhysicalDevice", QStringLiteral("QAbstractPhysicalDevice is abstract")); - qmlRegisterType<Qt3DInput::QAxisAccumulator>(uri, 2, 1, "AxisAccumulator"); - -#ifdef HAVE_QGAMEPAD - qmlRegisterType<Qt3DInput::QGamepadInput>(uri, 2, 0, "GamepadInput"); -#endif - - // The minor version used to be the current Qt 5 minor. For compatibility it is the last - // Qt 5 release. - qmlRegisterModule(uri, 2, 15); -} - -QT_END_NAMESPACE - -#include "moc_qt3dquick3dinputplugin.cpp" diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.h b/src/quick3d/imports/input/qt3dquick3dinputplugin.h deleted file mode 100644 index 58b830f63..000000000 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -#ifndef QT3DQUICK3DINPUTPLUGIN_H -#define QT3DQUICK3DINPUTPLUGIN_H - -#include <QtQml/QQmlExtensionPlugin> - -QT_BEGIN_NAMESPACE - -class Qt3DQuick3DInputPlugin : public QQmlExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) -public: - Qt3DQuick3DInputPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { } - void registerTypes(const char *uri) override; -}; - -QT_END_NAMESPACE - -#endif // QT3DQUICK3DINPUTPLUGIN_H diff --git a/src/quick3d/imports/logic/importslogic.pro b/src/quick3d/imports/logic/importslogic.pro deleted file mode 100644 index 2fc2accc5..000000000 --- a/src/quick3d/imports/logic/importslogic.pro +++ /dev/null @@ -1,16 +0,0 @@ -CXX_MODULE = qml -TARGET = quick3dlogicplugin -TARGETPATH = Qt3D/Logic -IMPORT_VERSION = 2.$$QT_MINOR_VERSION - -QT += core-private qml 3dcore 3dlogic - -OTHER_FILES += qmldir - -HEADERS += \ - qt3dquick3dlogicplugin.h - -SOURCES += \ - qt3dquick3dlogicplugin.cpp - -load(qml_plugin) diff --git a/src/quick3d/imports/render/importsrender.pro b/src/quick3d/imports/render/importsrender.pro deleted file mode 100644 index 977668c40..000000000 --- a/src/quick3d/imports/render/importsrender.pro +++ /dev/null @@ -1,16 +0,0 @@ -CXX_MODULE = qml -TARGET = quick3drenderplugin -TARGETPATH = Qt3D/Render -IMPORT_VERSION = 2.$$QT_MINOR_VERSION - -QT += core-private qml qml-private 3dcore 3drender 3drender-private 3dquick 3dquick-private 3dquickrender-private - -HEADERS += \ - qt3dquick3drenderplugin.h - -SOURCES += \ - qt3dquick3drenderplugin.cpp - -OTHER_FILES += qmldir - -load(qml_plugin) diff --git a/src/quick3d/imports/scene2d/importsscene2d.pro b/src/quick3d/imports/scene2d/importsscene2d.pro deleted file mode 100644 index cb87f4ca9..000000000 --- a/src/quick3d/imports/scene2d/importsscene2d.pro +++ /dev/null @@ -1,16 +0,0 @@ -CXX_MODULE = qml -TARGET = qtquickscene2dplugin -TARGETPATH = QtQuick/Scene2D -IMPORT_VERSION = 2.$$QT_MINOR_VERSION - -QT += qml quick 3dcore 3drender 3drender-private 3dinput 3dlogic 3dquickscene2d 3dquickscene2d-private - -HEADERS += \ - qtquickscene2dplugin.h \ - -SOURCES += \ - qtquickscene2dplugin.cpp \ - -OTHER_FILES += qmldir - -load(qml_plugin) diff --git a/src/quick3d/imports/scene3d/importsscene3d.pro b/src/quick3d/imports/scene3d/importsscene3d.pro deleted file mode 100644 index f8f3320b9..000000000 --- a/src/quick3d/imports/scene3d/importsscene3d.pro +++ /dev/null @@ -1,35 +0,0 @@ -CXX_MODULE = qml -TARGET = qtquickscene3dplugin -TARGETPATH = QtQuick/Scene3D -IMPORT_VERSION = 2.$$QT_MINOR_VERSION - -QT += qml quick 3dcore 3drender 3drender-private quick-private - -qtConfig(qt3d-input): QT += 3dinput -qtConfig(qt3d-logic): QT += 3dlogic -qtConfig(qt3d-animation): QT += 3danimation - -HEADERS += \ - qtquickscene3dplugin.h \ - scene3dlogging_p.h \ - scene3ditem_p.h \ - scene3drenderer_p.h \ - scene3dsgnode_p.h \ - scene3dsgmaterialshader_p.h \ - scene3dsgmaterial_p.h - -SOURCES += \ - qtquickscene3dplugin.cpp \ - scene3ditem.cpp \ - scene3dlogging.cpp \ - scene3drenderer.cpp \ - scene3dsgnode.cpp \ - scene3dsgmaterialshader.cpp \ - scene3dsgmaterial.cpp - -OTHER_FILES += qmldir shaders/* - -load(qml_plugin) - -RESOURCES += \ - scene3d.qrc diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index a65fb8baa..ef0ae6409 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -548,8 +548,11 @@ void Scene3DItem::createDummySurface(QWindow *rw, Qt3DRender::QRenderSurfaceSele */ void Scene3DItem::setItemAreaAndDevicePixelRatio(QSize area, qreal devicePixelRatio) { - Qt3DRender::QRenderSurfaceSelector *surfaceSelector - = Qt3DRender::QRenderSurfaceSelectorPrivate::find(entity()); + Qt3DCore::QEntity *rootEntity = entity(); + if (!rootEntity) { + return; + } + Qt3DRender::QRenderSurfaceSelector *surfaceSelector = Qt3DRender::QRenderSurfaceSelectorPrivate::find(rootEntity); if (surfaceSelector) { surfaceSelector->setExternalRenderTargetSize(area); surfaceSelector->setSurfacePixelRatio(devicePixelRatio); @@ -766,6 +769,7 @@ QSGNode *Scene3DItem::updatePaintNode(QSGNode *node, QQuickItem::UpdatePaintNode // Needs to belong in the same thread as the item which is the same as // the original QAspectEngine m_aspectEngineDestroyer->moveToThread(thread()); + m_aspectEngine->moveToThread(thread()); // To destroy AspectEngine m_aspectEngineDestroyer->reset(2); diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp index 49f15d6ca..eefe81919 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -9,9 +9,7 @@ #include <qopenglcontext.h> #include <qopenglframebufferobject.h> #include <QtQuick/qquickwindow.h> -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -#include <private/qrhi_p.h> -#endif +#include <rhi/qrhi.h> #include <Qt3DRender/private/qrenderaspect_p.h> #include <Qt3DRender/private/abstractrenderer_p.h> @@ -127,12 +125,10 @@ void Scene3DRenderer::init(Qt3DCore::QAspectEngine *aspectEngine, Qt3DRender::QRenderAspectPrivate *aspectPriv = static_cast<QRenderAspectPrivate*>(QRenderAspectPrivate::get(m_renderAspect)); Qt3DRender::Render::AbstractRenderer *renderer = aspectPriv->m_renderer; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const bool isRHI = renderer->api() == API::RHI; if (isRHI) m_quickRenderer = new Scene3DRenderer::RHIRenderer; else -#endif m_quickRenderer = new Scene3DRenderer::GLRenderer; m_quickRenderer->initialize(this, renderer); } @@ -146,15 +142,10 @@ void Scene3DRenderer::setWindow(QQuickWindow *window) m_window = window; if (m_window) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QObject::connect(m_window, &QQuickWindow::beforeRendering, this, [this] () { m_quickRenderer->beforeRendering(this); }, Qt::DirectConnection); QObject::connect(m_window, &QQuickWindow::beforeRenderPassRecording, this, [this] () { m_quickRenderer->beforeRenderPassRecording(this); }, Qt::DirectConnection); -#else - QObject::connect(m_window, &QQuickWindow::beforeRendering, this, - [this] () { m_quickRenderer->beforeRenderPassRecording(this); }, Qt::DirectConnection); -#endif } else { shutdown(); } @@ -311,12 +302,7 @@ void Scene3DRenderer::GLRenderer::beforeSynchronize(Scene3DRenderer *scene3DRend if (generateNewTexture) { m_finalFBO.reset(createFramebufferObject(m_lastSize)); m_textureId = m_finalFBO->texture(); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) m_texture.reset(QNativeInterface::QSGOpenGLTexture::fromNative(m_textureId, window, m_finalFBO->size(), QQuickWindow::TextureHasAlphaChannel)); -#else - m_texture.reset(window->createTextureFromNativeObject(QQuickWindow::NativeObjectTexture, &m_textureId, - 0, m_finalFBO->size(), QQuickWindow::TextureHasAlphaChannel)); -#endif } // Set texture on node @@ -349,12 +335,6 @@ void Scene3DRenderer::GLRenderer::beforeRenderPassRecording(Scene3DRenderer *sce scene3DRenderer->m_shouldRender = false; ContextSaver saver; -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - // The OpenGL state may be dirty from the previous QtQuick nodes, so reset - // it here to give Qt3D the clean state it expects - scene3DRenderer->m_window->resetOpenGLState(); -#endif - // Create and bind FBO if using the FBO compositing mode const bool usesFBO = scene3DRenderer->m_compositingMode == Scene3DItem::FBO; if (usesFBO) { @@ -395,12 +375,6 @@ void Scene3DRenderer::GLRenderer::beforeRenderPassRecording(Scene3DRenderer *sce if (scene3DRenderer->m_node) scene3DRenderer->m_node->show(); } - -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - // Reset the state used by the QtQuick scenegraph to avoid any - // interference when rendering the rest of the UI - scene3DRenderer->m_window->resetOpenGLState(); -#endif } void Scene3DRenderer::GLRenderer::shutdown(Scene3DRenderer *sceneRenderer) @@ -414,8 +388,6 @@ void Scene3DRenderer::GLRenderer::shutdown(Scene3DRenderer *sceneRenderer) m_multisampledFBO.reset(); } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - void Scene3DRenderer::RHIRenderer::initialize(Scene3DRenderer *scene3DRenderer, Qt3DRender::Render::AbstractRenderer *renderer) { @@ -619,8 +591,6 @@ void Scene3DRenderer::RHIRenderer::releaseRHIResources() m_rhiRenderTargetPassDescriptor = nullptr; } -#endif - Scene3DRenderer::QuickRenderer::QuickRenderer() {} Scene3DRenderer::QuickRenderer::~QuickRenderer() {} diff --git a/src/quick3d/imports/scene3d/scene3drenderer_p.h b/src/quick3d/imports/scene3d/scene3drenderer_p.h index c6f5b7c31..f131c7525 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer_p.h +++ b/src/quick3d/imports/scene3d/scene3drenderer_p.h @@ -123,7 +123,6 @@ private: quint32 m_textureId = 0; }; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) class RHIRenderer : public QuickRenderer { public: @@ -146,7 +145,6 @@ private: QRhiRenderPassDescriptor *m_rhiRenderTargetPassDescriptor = nullptr; QRhi *m_rhi = nullptr; }; -#endif Qt3DCore::QAspectEngine *m_aspectEngine; // Will be released by the Scene3DItem QRenderAspect *m_renderAspect; // Will be released by the aspectEngine diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterial.cpp b/src/quick3d/imports/scene3d/scene3dsgmaterial.cpp index 02f306a99..0d1ea7384 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterial.cpp +++ b/src/quick3d/imports/scene3d/scene3dsgmaterial.cpp @@ -28,15 +28,9 @@ Scene3DSGMaterial::Scene3DSGMaterial() { } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QSGMaterialShader *Scene3DSGMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const -#else -QSGMaterialShader *Scene3DSGMaterial::createShader() const -#endif { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) Q_UNUSED(renderMode); -#endif return new Scene3DSGMaterialShader(); } diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h index 605bba9b3..b84f55f26 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h +++ b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h @@ -37,11 +37,7 @@ public: QSGTexture *texture() const noexcept { return m_texture; } QSGMaterialType *type() const final { return &Scene3DSGMaterialShader::type; } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QSGMaterialShader *createShader(QSGRendererInterface::RenderMode renderMode) const final; -#else - QSGMaterialShader *createShader() const final; -#endif void show() { m_visible = true; } bool visible() const { return m_visible; } diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp index 8d8ae04e7..16d5942dd 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp +++ b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp @@ -40,15 +40,12 @@ Scene3DSGMaterialShader::Scene3DSGMaterialShader() : QSGMaterialShader() { // Generated with qsb, we target all GL version Qt3D can handle - // qsb -b --glsl "460,450,440,430,420,410,400,330,150,120,320 es,300 es,100 es" --hlsl 50 --msl 12 -o scene3dmaterial.vert.qsb scene3dmaterial.vert - // qsb --glsl "460,450,440,430,420,410,400,330,150,120,320 es,300 es,100 es" --hlsl 50 --msl 12 -o scene3dmaterial.frag.qsb scene3dmaterial.frag -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + // qsb -b --glsl "460,450,440,430,420,410,400,330,150,130,120,320 es,300 es,100 es" --hlsl 50 --msl 12 -o scene3dmaterial.vert.qsb scene3dmaterial.vert + // qsb --glsl "460,450,440,430,420,410,400,330,150,130,120,320 es,300 es,100 es" --hlsl 50 --msl 12 -o scene3dmaterial.frag.qsb scene3dmaterial.frag setShaderFileName(VertexStage, QLatin1String(":/shaders/scene3dmaterial.vert.qsb")); setShaderFileName(FragmentStage, QLatin1String(":/shaders/scene3dmaterial.frag.qsb")); -#endif } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool Scene3DSGMaterialShader::updateUniformData(QSGMaterialShader::RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) @@ -118,100 +115,6 @@ void Scene3DSGMaterialShader::updateSampledImage(QSGMaterialShader::RenderState } } -#else - -const char * const *Qt3DRender::Scene3DSGMaterialShader::attributeNames() const -{ - static char const *const attr[] = { "qt_VertexPosition", "qt_VertexTexCoord", nullptr }; - return attr; -} - -const char *Scene3DSGMaterialShader::vertexShader() const -{ - QOpenGLContext *ctx = QOpenGLContext::currentContext(); - if (ctx->format().version() >= qMakePair(3, 2) && ctx->format().profile() == QSurfaceFormat::CoreProfile) { - return "" - "#version 150 core \n" - "uniform mat4 qt_Matrix; \n" - "in vec4 qt_VertexPosition; \n" - "in vec2 qt_VertexTexCoord; \n" - "out vec2 qt_TexCoord; \n" - "void main() { \n" - " qt_TexCoord = qt_VertexTexCoord; \n" - " gl_Position = qt_Matrix * qt_VertexPosition; \n" - "}"; - } else { - return "" - "uniform highp mat4 qt_Matrix; \n" - "attribute highp vec4 qt_VertexPosition; \n" - "attribute highp vec2 qt_VertexTexCoord; \n" - "varying highp vec2 qt_TexCoord; \n" - "void main() { \n" - " qt_TexCoord = qt_VertexTexCoord; \n" - " gl_Position = qt_Matrix * qt_VertexPosition; \n" - "}"; - } -} -const char *Scene3DSGMaterialShader::fragmentShader() const -{ - QOpenGLContext *ctx = QOpenGLContext::currentContext(); - if (ctx->format().version() >= qMakePair(3, 2) && ctx->format().profile() == QSurfaceFormat::CoreProfile) { - return "" - "#version 150 core \n" - "uniform sampler2D source; \n" - "uniform float qt_Opacity; \n" - "in vec2 qt_TexCoord; \n" - "out vec4 fragColor; \n" - "void main() { \n" - " vec4 p = texture(source, qt_TexCoord); \n" - " float a = qt_Opacity * p.a; \n" - " fragColor = vec4(p.rgb * a, a); \n" - "}"; - } else { - return "" - "uniform highp sampler2D source; \n" - "uniform highp float qt_Opacity; \n" - "varying highp vec2 qt_TexCoord; \n" - "void main() { \n" - " highp vec4 p = texture2D(source, qt_TexCoord); \n" - " highp float a = qt_Opacity * p.a; \n" - " gl_FragColor = vec4(p.rgb * a, a); \n" - "}"; - } -} -void Scene3DSGMaterialShader::initialize() -{ - m_matrixId = program()->uniformLocation("qt_Matrix"); - m_opacityId = program()->uniformLocation("qt_Opacity"); -} -void Scene3DSGMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) -{ - Q_ASSERT(oldEffect == 0 || newEffect->type() == oldEffect->type()); - Scene3DSGMaterial *tx = static_cast<Scene3DSGMaterial *>(newEffect); - Scene3DSGMaterial *oldTx = static_cast<Scene3DSGMaterial *>(oldEffect); - QSGTexture *t = tx->texture(); - bool npotSupported = const_cast<QOpenGLContext *>(state.context()) - ->functions()->hasOpenGLFeature(QOpenGLFunctions::NPOTTextureRepeat); - if (!npotSupported) { - QSize size = t->textureSize(); - const bool isNpot = !isPowerOfTwo(size.width()) || !isPowerOfTwo(size.height()); - if (isNpot) { - t->setHorizontalWrapMode(QSGTexture::ClampToEdge); - t->setVerticalWrapMode(QSGTexture::ClampToEdge); - } - } - if (oldTx == 0 || oldTx->texture()->textureId() != t->textureId()) - t->bind(); - else - t->updateBindOptions(); - if (state.isMatrixDirty()) - program()->setUniformValue(m_matrixId, state.combinedMatrix()); - if (state.isOpacityDirty()) - program()->setUniformValue(m_opacityId, state.opacity()); -} - -#endif - } // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h b/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h index 64984f32b..ce02a8608 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h +++ b/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h @@ -29,23 +29,8 @@ public: protected: // QSGMaterialShader interface -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool updateUniformData(RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) final; void updateSampledImage(RenderState &state, int binding, QSGTexture **texture, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) final; -#else -public: - char const *const *attributeNames() const final; - void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) final; - -protected: - const char *vertexShader() const final; - const char *fragmentShader() const final; - void initialize() final; - -private: - int m_matrixId = -1; - int m_opacityId = -1; -#endif }; } // namespace Qt3DRender diff --git a/src/quick3d/imports/scene3d/shaders/scene3dmaterial.frag.qsb b/src/quick3d/imports/scene3d/shaders/scene3dmaterial.frag.qsb Binary files differindex b24ef4019..18a00e79b 100644 --- a/src/quick3d/imports/scene3d/shaders/scene3dmaterial.frag.qsb +++ b/src/quick3d/imports/scene3d/shaders/scene3dmaterial.frag.qsb diff --git a/src/quick3d/imports/scene3d/shaders/scene3dmaterial.vert.qsb b/src/quick3d/imports/scene3d/shaders/scene3dmaterial.vert.qsb Binary files differindex 6e17b49fb..ff27bb16d 100644 --- a/src/quick3d/imports/scene3d/shaders/scene3dmaterial.vert.qsb +++ b/src/quick3d/imports/scene3d/shaders/scene3dmaterial.vert.qsb diff --git a/src/quick3d/quick3d/items/items.pri b/src/quick3d/quick3d/items/items.pri deleted file mode 100644 index 28b56eaab..000000000 --- a/src/quick3d/quick3d/items/items.pri +++ /dev/null @@ -1,20 +0,0 @@ -HEADERS += \ - $$PWD/quick3dnodeinstantiator_p.h \ - $$PWD/quick3dentity_p.h \ - $$PWD/quick3dentityloader_p_p.h \ - $$PWD/quick3dentityloader_p.h \ - $$PWD/quick3dnode_p.h \ - $$PWD/quick3djoint_p.h \ - $$PWD/quick3dbuffer_p.h \ - $$PWD/quick3dgeometry_p.h - -SOURCES += \ - $$PWD/quick3dnode.cpp \ - $$PWD/quick3dentity.cpp \ - $$PWD/quick3dentityloader.cpp \ - $$PWD/quick3dnodeinstantiator.cpp \ - $$PWD/quick3djoint.cpp \ - $$PWD/quick3dbuffer.cpp \ - $$PWD/quick3dgeometry.cpp - -INCLUDEPATH += $$PWD diff --git a/src/quick3d/quick3d/items/quick3dbuffer.cpp b/src/quick3d/quick3d/items/quick3dbuffer.cpp index bc2c6d6df..0fa8ada23 100644 --- a/src/quick3d/quick3d/items/quick3dbuffer.cpp +++ b/src/quick3d/quick3d/items/quick3dbuffer.cpp @@ -35,13 +35,8 @@ QByteArray Quick3DBuffer::convertToRawData(const QJSValue &jsValue) Q_ASSERT(m_v4engine); QV4::Scope scope(m_v4engine); QV4::Scoped<QV4::TypedArray> typedArray(scope, -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QJSValuePrivate::convertToReturnedValue(m_v4engine, jsValue)); char *dataPtr = reinterpret_cast<char *>(typedArray->arrayData()); -#else - QJSValuePrivate::convertedToValue(m_v4engine, jsValue)); - char *dataPtr = reinterpret_cast<char *>(typedArray->arrayData()->data()); -#endif if (!typedArray) return QByteArray(); diff --git a/src/quick3d/quick3d/items/quick3dentity.cpp b/src/quick3d/quick3d/items/quick3dentity.cpp index d7487b716..b1cdfb4ab 100644 --- a/src/quick3d/quick3d/items/quick3dentity.cpp +++ b/src/quick3d/quick3d/items/quick3dentity.cpp @@ -45,12 +45,7 @@ Quick3DEntity::Quick3DEntity(QObject *parent) QQmlListProperty<QComponent> Quick3DEntity::componentList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DCore::QComponent; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *comp) { if (comp == nullptr) diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp index 86e307065..ca25df63c 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader.cpp +++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp @@ -134,7 +134,7 @@ QObject *Quick3DEntityLoader::entity() const } /*! - \qmlproperty url Qt3DCore::EntityLoader::source + \qmlproperty url Qt3D.Core::EntityLoader::source Holds the source url. */ QUrl Quick3DEntityLoader::source() const @@ -175,7 +175,7 @@ void Quick3DEntityLoader::setSourceComponent(QQmlComponent *component) } /*! - \qmlproperty Status Qt3DCore::EntityLoader::status + \qmlproperty Status Qt3D.Core::EntityLoader::status Holds the status of the entity loader. \list diff --git a/src/quick3d/quick3d/items/quick3dgeometry.cpp b/src/quick3d/quick3d/items/quick3dgeometry.cpp index 0a4912df1..5a71de7a4 100644 --- a/src/quick3d/quick3d/items/quick3dgeometry.cpp +++ b/src/quick3d/quick3d/items/quick3dgeometry.cpp @@ -15,12 +15,7 @@ Quick3DGeometry::Quick3DGeometry(QObject *parent) QQmlListProperty<Qt3DCore::QAttribute> Quick3DGeometry::attributeList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DCore::QAttribute; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *attribute) { Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object); diff --git a/src/quick3d/quick3d/items/quick3djoint.cpp b/src/quick3d/quick3d/items/quick3djoint.cpp index baa79dd56..cfe77b0a7 100644 --- a/src/quick3d/quick3d/items/quick3djoint.cpp +++ b/src/quick3d/quick3d/items/quick3djoint.cpp @@ -15,17 +15,12 @@ Quick3DJoint::Quick3DJoint(QObject *parent) } /*! - \qmlproperty list<Joint> Qt3DCore::Joint::childJoints + \qmlproperty list<Joint> Qt3D.Core::Joint::childJoints \readonly */ QQmlListProperty<QJoint> Quick3DJoint::childJoints() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QJoint; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *joint) { Quick3DJoint *jointExtension = qobject_cast<Quick3DJoint *>(list->object); diff --git a/src/quick3d/quick3d/items/quick3dnode.cpp b/src/quick3d/quick3d/items/quick3dnode.cpp index 969874136..09abcf2ae 100644 --- a/src/quick3d/quick3d/items/quick3dnode.cpp +++ b/src/quick3d/quick3d/items/quick3dnode.cpp @@ -25,18 +25,13 @@ Quick3DNode::Quick3DNode(QObject *parent) } /*! - \qmlproperty list<QtQml::QtObject> Qt3DCore::Node::data + \qmlproperty list<QtQml::QtObject> Qt3D.Core::Node::data \qmldefault */ QQmlListProperty<QObject> Quick3DNode::data() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QObject; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *obj) { if (!obj) @@ -63,18 +58,13 @@ QQmlListProperty<QObject> Quick3DNode::data() } /*! - \qmlproperty list<Node> Qt3DCore::Node::childNodes + \qmlproperty list<Node> Qt3D.Core::Node::childNodes \readonly */ QQmlListProperty<QNode> Quick3DNode::childNodes() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QNode; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *obj) { if (!obj) diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp index 1f9e5d068..b7fb10f77 100644 --- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp +++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp @@ -17,6 +17,8 @@ #endif #include <private/qqmlobjectmodel_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE namespace Qt3DCore { diff --git a/src/quick3d/quick3d/qt3dquick_global_p.h b/src/quick3d/quick3d/qt3dquick_global_p.h index b266c320d..324bf02ea 100644 --- a/src/quick3d/quick3d/qt3dquick_global_p.h +++ b/src/quick3d/quick3d/qt3dquick_global_p.h @@ -25,10 +25,6 @@ #define Q_3DQUICKSHARED_PRIVATE_EXPORT Q_3DQUICKSHARED_EXPORT -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -#define QML_ADDED_IN_VERSION(major, minor) QML_ADDED_IN_MINOR_VERSION(minor) -#endif - QT_BEGIN_NAMESPACE namespace Qt3DCore { diff --git a/src/quick3d/quick3d/qt3dquicknodefactory.cpp b/src/quick3d/quick3d/qt3dquicknodefactory.cpp index 3dce09fc6..12a3f67ae 100644 --- a/src/quick3d/quick3d/qt3dquicknodefactory.cpp +++ b/src/quick3d/quick3d/qt3dquicknodefactory.cpp @@ -28,11 +28,7 @@ QNode *QuickNodeFactory::createNode(const char *type) if (!typeInfo.resolved) { typeInfo.resolved = true; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), QTypeRevision::fromVersion(typeInfo.version.first, typeInfo.version.second)); -#else - typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second); -#endif } return typeInfo.t.isValid() ? qobject_cast<QNode *>(typeInfo.t.create()) : nullptr; diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp index 89f47c8ae..2902c6abd 100644 --- a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp +++ b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp @@ -61,7 +61,6 @@ QString QQuick3DColorValueType::toString() const return v.name(v.alpha() != 255 ? QColor::HexArgb : QColor::HexRgb); } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QVariant QQuick3DColorValueType::lighter(qreal factor) const { return QQml_colorProvider()->lighter(this->v, factor); @@ -81,7 +80,6 @@ QVariant QQuick3DColorValueType::tint(QVariant tintColor) const { return QQml_colorProvider()->tint(this->v, tintColor); } -#endif qreal QQuick3DColorValueType::r() const { @@ -160,66 +158,42 @@ void QQuick3DColorValueType::setA(qreal a) void QQuick3DColorValueType::setHsvHue(qreal hsvHue) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) float hue, saturation, value, alpha; -#else - qreal hue, saturation, value, alpha; -#endif v.getHsvF(&hue, &saturation, &value, &alpha); v.setHsvF(hsvHue, saturation, value, alpha); } void QQuick3DColorValueType::setHsvSaturation(qreal hsvSaturation) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) float hue, saturation, value, alpha; -#else - qreal hue, saturation, value, alpha; -#endif v.getHsvF(&hue, &saturation, &value, &alpha); v.setHsvF(hue, hsvSaturation, value, alpha); } void QQuick3DColorValueType::setHsvValue(qreal hsvValue) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) float hue, saturation, value, alpha; -#else - qreal hue, saturation, value, alpha; -#endif v.getHsvF(&hue, &saturation, &value, &alpha); v.setHsvF(hue, saturation, hsvValue, alpha); } void QQuick3DColorValueType::setHslHue(qreal hslHue) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) float hue, saturation, lightness, alpha; -#else - qreal hue, saturation, lightness, alpha; -#endif v.getHslF(&hue, &saturation, &lightness, &alpha); v.setHslF(hslHue, saturation, lightness, alpha); } void QQuick3DColorValueType::setHslSaturation(qreal hslSaturation) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) float hue, saturation, lightness, alpha; -#else - qreal hue, saturation, lightness, alpha; -#endif v.getHslF(&hue, &saturation, &lightness, &alpha); v.setHslF(hue, hslSaturation, lightness, alpha); } void QQuick3DColorValueType::setHslLightness(qreal hslLightness) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) float hue, saturation, lightness, alpha; -#else - qreal hue, saturation, lightness, alpha; -#endif v.getHslF(&hue, &saturation, &lightness, &alpha); v.setHslF(hue, saturation, hslLightness, alpha); } diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h index 43292f26f..8bf3cd0b2 100644 --- a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h +++ b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h @@ -31,10 +31,6 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { namespace Quick { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -#define QML_VALUE_TYPE(v) -#endif - class Q_3DQUICKSHARED_PRIVATE_EXPORT QQuick3DColorValueType { QColor v; @@ -60,12 +56,10 @@ public: Q_INVOKABLE QString toString() const; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) Q_INVOKABLE QVariant alpha(qreal value) const; Q_INVOKABLE QVariant lighter(qreal factor = 1.5) const; Q_INVOKABLE QVariant darker(qreal factor = 2.0) const; Q_INVOKABLE QVariant tint(QVariant factor) const; -#endif qreal r() const; qreal g() const; @@ -319,10 +313,6 @@ public: void setZ(qreal); }; -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -#undef QML_VALUE_TYPE -#endif - } // namespace Quick } // namespace Qt3DCore diff --git a/src/quick3d/quick3d/quick3d.pro b/src/quick3d/quick3d/quick3d.pro deleted file mode 100644 index a177ee5b1..000000000 --- a/src/quick3d/quick3d/quick3d.pro +++ /dev/null @@ -1,33 +0,0 @@ -TARGET = Qt3DQuick -MODULE = 3dquick - -QT += core-private gui-private qml qml-private quick quick-private 3dcore 3dcore-private -CONFIG += c++17 qmltypes qmltypes_install - -gcov { - QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage - QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage -} - -HEADERS += \ - qt3dquick_global.h \ - qt3dquick_global_p.h \ - qt3dquickvaluetypes_p.h \ - qt3dquicknodefactory_p.h \ - qqmlaspectengine.h \ - qqmlaspectengine_p.h \ - qquaternionanimation_p.h - -SOURCES += \ - qt3dquick_global.cpp \ - qt3dquickvaluetypes.cpp \ - qt3dquicknodefactory.cpp \ - qqmlaspectengine.cpp \ - qquaternionanimation.cpp - -include(./items/items.pri) - -QML_IMPORT_NAME = Qt3DQuick -QML_IMPORT_MAJOR_VERSION = 1 - -load(qt_module) diff --git a/src/quick3d/quick3danimation/items/items.pri b/src/quick3d/quick3danimation/items/items.pri deleted file mode 100644 index 27adabbe4..000000000 --- a/src/quick3d/quick3danimation/items/items.pri +++ /dev/null @@ -1,19 +0,0 @@ -SOURCES += \ - $$PWD/quick3dchannelmapper.cpp \ - $$PWD/quick3danimationcontroller.cpp \ - $$PWD/quick3danimationgroup.cpp \ - $$PWD/quick3dkeyframeanimation.cpp \ - $$PWD/quick3dmorphinganimation.cpp \ - $$PWD/quick3dmorphtarget.cpp \ - $$PWD/quick3dvertexblendanimation.cpp - -HEADERS += \ - $$PWD/quick3dchannelmapper_p.h \ - $$PWD/quick3danimationcontroller_p.h \ - $$PWD/quick3danimationgroup_p.h \ - $$PWD/quick3dkeyframeanimation_p.h \ - $$PWD/quick3dmorphinganimation_p.h \ - $$PWD/quick3dmorphtarget_p.h \ - $$PWD/quick3dvertexblendanimation_p.h - -INCLUDEPATH += $$PWD diff --git a/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp index cae8c4971..77b25ae4a 100644 --- a/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp +++ b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp @@ -15,12 +15,7 @@ QQuick3DAnimationController::QQuick3DAnimationController(QObject *parent) QQmlListProperty<QAnimationGroup> QQuick3DAnimationController::animationGroups() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QAnimationGroup; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *bar) { QQuick3DAnimationController *controller = qobject_cast<QQuick3DAnimationController *>(list->object); diff --git a/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp b/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp index 383cdada4..d2bee0d7b 100644 --- a/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp +++ b/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp @@ -17,12 +17,7 @@ QQuick3DAnimationGroup::QQuick3DAnimationGroup(QObject *parent) QQmlListProperty<Qt3DAnimation::QAbstractAnimation> QQuick3DAnimationGroup::animations() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DAnimation::QAbstractAnimation; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *animation) { QQuick3DAnimationGroup *animationGroup = qobject_cast<QQuick3DAnimationGroup *>(list->object); diff --git a/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp b/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp index 49dcb73da..16ea417d9 100644 --- a/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp +++ b/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp @@ -16,12 +16,7 @@ Quick3DChannelMapper::Quick3DChannelMapper(QObject *parent) QQmlListProperty<QAbstractChannelMapping> Quick3DChannelMapper::qmlMappings() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QAbstractChannelMapping; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *mapping) { Quick3DChannelMapper *extension = qobject_cast<Quick3DChannelMapper *>(list->object); diff --git a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp index 2d3542eaf..8bdeac896 100644 --- a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp +++ b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp @@ -15,12 +15,7 @@ QQuick3DKeyframeAnimation::QQuick3DKeyframeAnimation(QObject *parent) QQmlListProperty<Qt3DCore::QTransform> QQuick3DKeyframeAnimation::keyframes() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DCore::QTransform; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *transform) { QQuick3DKeyframeAnimation *keyframeAnimation diff --git a/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp b/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp index 409e210d9..b35fef14a 100644 --- a/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp +++ b/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp @@ -15,12 +15,7 @@ QQuick3DMorphingAnimation::QQuick3DMorphingAnimation(QObject *parent) QQmlListProperty<Qt3DAnimation::QMorphTarget> QQuick3DMorphingAnimation::morphTargets() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DAnimation::QMorphTarget; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *morphTarget) { QQuick3DMorphingAnimation *animation = qobject_cast<QQuick3DMorphingAnimation *>(list->object); diff --git a/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp index 5abc874a5..c6c779077 100644 --- a/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp +++ b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp @@ -15,12 +15,7 @@ QQuick3DMorphTarget::QQuick3DMorphTarget(QObject *parent) QQmlListProperty<Qt3DCore::QAttribute> QQuick3DMorphTarget::attributes() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DCore::QAttribute; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *bar) { QQuick3DMorphTarget *target = qobject_cast<QQuick3DMorphTarget *>(list->object); diff --git a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp index c9f264ea0..9eef6740d 100644 --- a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp +++ b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp @@ -15,12 +15,7 @@ QQuick3DVertexBlendAnimation::QQuick3DVertexBlendAnimation(QObject *parent) QQmlListProperty<Qt3DAnimation::QMorphTarget> QQuick3DVertexBlendAnimation::morphTargets() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DAnimation::QMorphTarget; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *morphTarget) { QQuick3DVertexBlendAnimation *animation diff --git a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp index 706e55881..0c0d52ae1 100644 --- a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp +++ b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp @@ -28,11 +28,7 @@ Qt3DCore::QNode *QuickAnimationNodeFactory::createNode(const char *type) if (!typeInfo.resolved) { typeInfo.resolved = true; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), QTypeRevision::fromVersion(typeInfo.version.first, typeInfo.version.second)); -#else - typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second); -#endif } return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr; diff --git a/src/quick3d/quick3danimation/quick3danimation.pro b/src/quick3d/quick3danimation/quick3danimation.pro deleted file mode 100644 index 4b166327f..000000000 --- a/src/quick3d/quick3danimation/quick3danimation.pro +++ /dev/null @@ -1,24 +0,0 @@ -TARGET = Qt3DQuickAnimation -MODULE = 3dquickanimation - -QT += core core-private qml qml-private 3dcore 3drender 3danimation 3dquick 3dquick-private 3dcore-private 3drender-private -CONFIG -= precompile_header - -gcov { - CONFIG += static - QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage - QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage -} - -SOURCES += \ - qt3dquickanimation_global.cpp \ - qt3dquickanimationnodefactory.cpp - -HEADERS += \ - qt3dquickanimationnodefactory_p.h \ - qt3dquickanimation_global_p.h \ - qt3dquickanimation_global.h - -include(./items/items.pri) - -load(qt_module) diff --git a/src/quick3d/quick3dextras/items/items.pri b/src/quick3d/quick3dextras/items/items.pri deleted file mode 100644 index f2fe09dcb..000000000 --- a/src/quick3d/quick3dextras/items/items.pri +++ /dev/null @@ -1,10 +0,0 @@ -HEADERS += \ - $$PWD/quick3dlevelofdetailloader_p.h \ - $$PWD/quick3dlevelofdetailloader_p_p.h \ - $$PWD/quick3dspritesheet_p.h - -SOURCES += \ - $$PWD/quick3dlevelofdetailloader.cpp \ - $$PWD/quick3dspritesheet.cpp - -INCLUDEPATH += $$PWD diff --git a/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp b/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp index facdf9a01..1dd2a22b6 100644 --- a/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp +++ b/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp @@ -21,12 +21,7 @@ Quick3DSpriteSheet::~Quick3DSpriteSheet() QQmlListProperty<Qt3DExtras::QSpriteSheetItem> Quick3DSpriteSheet::sprites() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DExtras::QSpriteSheetItem; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *sprite) { Quick3DSpriteSheet *spritesheet = qobject_cast<Quick3DSpriteSheet *>(list->object); diff --git a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp index 33b6810ea..81e0f251c 100644 --- a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp +++ b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp @@ -28,11 +28,7 @@ Qt3DCore::QNode *QuickExtrasNodeFactory::createNode(const char *type) if (!typeInfo.resolved) { typeInfo.resolved = true; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), QTypeRevision::fromVersion(typeInfo.version.first, typeInfo.version.second)); -#else - typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second); -#endif } return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr; diff --git a/src/quick3d/quick3dextras/quick3dextras.pro b/src/quick3d/quick3dextras/quick3dextras.pro deleted file mode 100644 index c57e7af0c..000000000 --- a/src/quick3d/quick3dextras/quick3dextras.pro +++ /dev/null @@ -1,29 +0,0 @@ -TARGET = Qt3DQuickExtras -MODULE = 3dquickextras - -QT += core core-private qml qml-private 3dcore 3dinput 3dquick 3dquick-private 3drender 3drender-private 3dlogic 3dextras 3dextras-private - -CONFIG -= precompile_header - -gcov { - QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage - QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage -} - -SOURCES += \ - qt3dquickextras_global.cpp \ - qt3dquickextrasnodefactory.cpp \ - qt3dquickwindow.cpp \ - qt3dquickwindowlogging.cpp - -HEADERS += \ - qt3dquickextras_global.h \ - qt3dquickextras_global_p.h \ - qt3dquickextrasnodefactory_p.h \ - qt3dquickwindow.h \ - qt3dquickwindow_p.h \ - qt3dquickwindowlogging_p.h - -include(./items/items.pri) - -load(qt_module) diff --git a/src/quick3d/quick3dinput/items/items.pri b/src/quick3d/quick3dinput/items/items.pri deleted file mode 100644 index c0ee04665..000000000 --- a/src/quick3d/quick3dinput/items/items.pri +++ /dev/null @@ -1,17 +0,0 @@ -SOURCES += \ - $$PWD/quick3daxis.cpp \ - $$PWD/quick3daction.cpp \ - $$PWD/quick3dlogicaldevice.cpp \ - $$PWD/quick3dphysicaldevice.cpp \ - $$PWD/quick3dinputsequence.cpp \ - $$PWD/quick3dinputchord.cpp - -HEADERS += \ - $$PWD/quick3daxis_p.h \ - $$PWD/quick3daction_p.h \ - $$PWD/quick3dlogicaldevice_p.h \ - $$PWD/quick3dphysicaldevice_p.h \ - $$PWD/quick3dinputsequence_p.h \ - $$PWD/quick3dinputchord_p.h - -INCLUDEPATH += $$PWD diff --git a/src/quick3d/quick3dinput/items/quick3daction.cpp b/src/quick3d/quick3dinput/items/quick3daction.cpp index bb6e89e69..9bc23e194 100644 --- a/src/quick3d/quick3dinput/items/quick3daction.cpp +++ b/src/quick3d/quick3dinput/items/quick3daction.cpp @@ -16,12 +16,7 @@ Quick3DAction::Quick3DAction(QObject *parent) QQmlListProperty<QAbstractActionInput> Quick3DAction::qmlActionInputs() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - auto appendFunction = [](QQmlListProperty<QAbstractActionInput> *list, QAbstractActionInput *input) { Quick3DAction *action = qobject_cast<Quick3DAction *>(list->object); action->parentAction()->addInput(input); diff --git a/src/quick3d/quick3dinput/items/quick3daxis.cpp b/src/quick3d/quick3dinput/items/quick3daxis.cpp index 9b830e440..48e0dc6b0 100644 --- a/src/quick3d/quick3dinput/items/quick3daxis.cpp +++ b/src/quick3d/quick3dinput/items/quick3daxis.cpp @@ -16,12 +16,7 @@ Quick3DAxis::Quick3DAxis(QObject *parent) QQmlListProperty<QAbstractAxisInput> Quick3DAxis::qmlAxisInputs() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QAbstractAxisInput; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *input) { Quick3DAxis *axis = qobject_cast<Quick3DAxis *>(list->object); diff --git a/src/quick3d/quick3dinput/items/quick3dinputchord.cpp b/src/quick3d/quick3dinput/items/quick3dinputchord.cpp index 7cadb5799..7b4885c1d 100644 --- a/src/quick3d/quick3dinput/items/quick3dinputchord.cpp +++ b/src/quick3d/quick3dinput/items/quick3dinputchord.cpp @@ -16,12 +16,7 @@ Quick3DInputChord::Quick3DInputChord(QObject *parent) QQmlListProperty<QAbstractActionInput> Quick3DInputChord::qmlActionInputs() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QAbstractActionInput; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *input) { Quick3DInputChord *action = qobject_cast<Quick3DInputChord *>(list->object); diff --git a/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp b/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp index 9e09d7eeb..05eff2f60 100644 --- a/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp +++ b/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp @@ -16,12 +16,7 @@ Quick3DInputSequence::Quick3DInputSequence(QObject *parent) QQmlListProperty<QAbstractActionInput> Quick3DInputSequence::qmlActionInputs() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QAbstractActionInput; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *input) { Quick3DInputSequence *action = qobject_cast<Quick3DInputSequence *>(list->object); diff --git a/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp b/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp index 5097ef024..ff3c33198 100644 --- a/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp +++ b/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp @@ -16,12 +16,7 @@ Quick3DLogicalDevice::Quick3DLogicalDevice(QObject *parent) QQmlListProperty<QAxis> Quick3DLogicalDevice::qmlAxes() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QAxis; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *axes) { Quick3DLogicalDevice *device = qobject_cast<Quick3DLogicalDevice *>(list->object); @@ -47,12 +42,7 @@ QQmlListProperty<QAxis> Quick3DLogicalDevice::qmlAxes() QQmlListProperty<QAction> Quick3DLogicalDevice::qmlActions() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QAction; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *action) { Quick3DLogicalDevice *device = qobject_cast<Quick3DLogicalDevice *>(list->object); diff --git a/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp b/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp index ef5c46042..4cf2ef839 100644 --- a/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp +++ b/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp @@ -16,12 +16,7 @@ Quick3DPhysicalDevice::Quick3DPhysicalDevice(QObject *parent) : QObject(parent) QQmlListProperty<QAxisSetting> Quick3DPhysicalDevice::axisSettings() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QAxisSetting; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *axisSetting) { Quick3DPhysicalDevice *device = qobject_cast<Quick3DPhysicalDevice *>(list->object); diff --git a/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp b/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp index 6c19918f7..5bd79e7b0 100644 --- a/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp +++ b/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp @@ -28,11 +28,7 @@ Qt3DCore::QNode *QuickInputNodeFactory::createNode(const char *type) if (!typeInfo.resolved) { typeInfo.resolved = true; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), QTypeRevision::fromVersion(typeInfo.version.first, typeInfo.version.second)); -#else - typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second); -#endif } return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr; diff --git a/src/quick3d/quick3dinput/quick3dinput.pro b/src/quick3d/quick3dinput/quick3dinput.pro deleted file mode 100644 index e797f3fae..000000000 --- a/src/quick3d/quick3dinput/quick3dinput.pro +++ /dev/null @@ -1,24 +0,0 @@ -TARGET = Qt3DQuickInput -MODULE = 3dquickinput - -QT += core core-private qml qml-private 3dcore 3dinput 3dquick 3dquick-private 3dcore-private 3dinput-private -CONFIG -= precompile_header - -gcov { - QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage - QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage -} - -SOURCES += \ - qt3dquickinput_global.cpp \ - qt3dquickinputnodefactory.cpp - - -HEADERS += \ - qt3dquickinput_global_p.h \ - qt3dquickinput_global.h \ - qt3dquickinputnodefactory_p.h - -include(./items/items.pri) - -load(qt_module) diff --git a/src/quick3d/quick3drender/items/items.pri b/src/quick3d/quick3drender/items/items.pri deleted file mode 100644 index 06732cf33..000000000 --- a/src/quick3d/quick3drender/items/items.pri +++ /dev/null @@ -1,44 +0,0 @@ -HEADERS += \ - $$PWD/quick3dtechniquefilter_p.h \ - $$PWD/quick3deffect_p.h \ - $$PWD/quick3dlayerfilter_p.h \ - $$PWD/quick3dmaterial_p.h \ - $$PWD/quick3drenderpass_p.h \ - $$PWD/quick3drenderpassfilter_p.h \ - $$PWD/quick3dscene_p.h \ - $$PWD/quick3dshaderdata_p.h \ - $$PWD/quick3dshaderdataarray_p.h \ - $$PWD/quick3dstateset_p.h \ - $$PWD/quick3dtechnique_p.h \ - $$PWD/quick3dtexture_p.h \ - $$PWD/quick3dviewport_p.h \ - $$PWD/quick3dparameter_p_p.h \ - $$PWD/quick3dparameter_p.h \ - $$PWD/quick3drendertargetoutput_p.h \ - $$PWD/quick3dmemorybarrier_p.h \ - $$PWD/quick3draycaster_p.h \ - $$PWD/quick3draycaster_p_p.h \ - $$PWD/quick3dscreenraycaster_p.h \ - $$PWD/quick3dscreenraycaster_p_p.h - -SOURCES += \ - $$PWD/quick3drenderpassfilter.cpp \ - $$PWD/quick3dtechniquefilter.cpp \ - $$PWD/quick3dviewport.cpp \ - $$PWD/quick3dlayerfilter.cpp \ - $$PWD/quick3dmaterial.cpp \ - $$PWD/quick3dtechnique.cpp \ - $$PWD/quick3deffect.cpp \ - $$PWD/quick3dscene.cpp \ - $$PWD/quick3dtexture.cpp \ - $$PWD/quick3drenderpass.cpp \ - $$PWD/quick3dparameter.cpp \ - $$PWD/quick3dshaderdata.cpp \ - $$PWD/quick3dshaderdataarray.cpp \ - $$PWD/quick3dstateset.cpp \ - $$PWD/quick3drendertargetoutput.cpp \ - $$PWD/quick3dmemorybarrier.cpp \ - $$PWD/quick3draycaster.cpp \ - $$PWD/quick3dscreenraycaster.cpp - -INCLUDEPATH += $$PWD diff --git a/src/quick3d/quick3drender/items/quick3deffect.cpp b/src/quick3d/quick3drender/items/quick3deffect.cpp index a38dddb47..f94166498 100644 --- a/src/quick3d/quick3drender/items/quick3deffect.cpp +++ b/src/quick3d/quick3drender/items/quick3deffect.cpp @@ -18,12 +18,7 @@ Quick3DEffect::Quick3DEffect(QObject *parent) QQmlListProperty<QTechnique> Quick3DEffect::techniqueList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QTechnique; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *bar) { Quick3DEffect *eff = qobject_cast<Quick3DEffect*>(list->object); @@ -59,12 +54,7 @@ QQmlListProperty<QTechnique> Quick3DEffect::techniqueList() QQmlListProperty<QParameter> Quick3DEffect::parameterList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QParameter; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *param) { Quick3DEffect *effect = qobject_cast<Quick3DEffect *>(list->object); diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp index 2ad597294..1768604d8 100644 --- a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp +++ b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp @@ -20,12 +20,7 @@ Quick3DLayerFilter::Quick3DLayerFilter(QObject *parent) QQmlListProperty<QLayer> Quick3DLayerFilter::qmlLayers() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QLayer; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *layer) { Quick3DLayerFilter *filter = qobject_cast<Quick3DLayerFilter *>(list->object); diff --git a/src/quick3d/quick3drender/items/quick3dmaterial.cpp b/src/quick3d/quick3drender/items/quick3dmaterial.cpp index 9f8fed800..05f55844a 100644 --- a/src/quick3d/quick3drender/items/quick3dmaterial.cpp +++ b/src/quick3d/quick3drender/items/quick3dmaterial.cpp @@ -20,12 +20,7 @@ Quick3DMaterial::Quick3DMaterial(QObject *parent) QQmlListProperty<QParameter> Quick3DMaterial::qmlParameters() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QParameter; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *param) { Quick3DMaterial *mat = qobject_cast<Quick3DMaterial *>(list->object); diff --git a/src/quick3d/quick3drender/items/quick3dparameter.cpp b/src/quick3d/quick3drender/items/quick3dparameter.cpp index 7f4147ef1..6fb1f144e 100644 --- a/src/quick3d/quick3drender/items/quick3dparameter.cpp +++ b/src/quick3d/quick3drender/items/quick3dparameter.cpp @@ -12,10 +12,6 @@ namespace Qt3DRender { namespace Render { namespace Quick { -namespace { -const int qjsValueTypeId = qMetaTypeId<QJSValue>(); -} - Quick3DParameterPrivate::Quick3DParameterPrivate() : QParameterPrivate() { @@ -23,6 +19,8 @@ Quick3DParameterPrivate::Quick3DParameterPrivate() void Quick3DParameterPrivate::setValue(const QVariant &value) { + static const int qjsValueTypeId = qMetaTypeId<QJSValue>(); + if (value.userType() == qjsValueTypeId) { QJSValue v = value.value<QJSValue>(); if (v.isArray()) diff --git a/src/quick3d/quick3drender/items/quick3draycaster.cpp b/src/quick3d/quick3drender/items/quick3draycaster.cpp index ad924e8d9..4a1c570a4 100644 --- a/src/quick3d/quick3drender/items/quick3draycaster.cpp +++ b/src/quick3d/quick3drender/items/quick3draycaster.cpp @@ -20,12 +20,7 @@ Quick3DRayCaster::Quick3DRayCaster(QObject *parent) QQmlListProperty<Qt3DRender::QLayer> Qt3DRender::Render::Quick::Quick3DRayCaster::qmlLayers() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DRender::QLayer; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *layer) { QAbstractRayCaster *filter = qobject_cast<QAbstractRayCaster *>(list->object); diff --git a/src/quick3d/quick3drender/items/quick3drenderpass.cpp b/src/quick3d/quick3drender/items/quick3drenderpass.cpp index 5bc50673a..c77751f80 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpass.cpp +++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp @@ -17,12 +17,7 @@ Quick3DRenderPass::Quick3DRenderPass(QObject *parent) QQmlListProperty<QFilterKey> Quick3DRenderPass::filterKeyList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QFilterKey; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *filterKey) { Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object); @@ -48,12 +43,7 @@ QQmlListProperty<QFilterKey> Quick3DRenderPass::filterKeyList() QQmlListProperty<QRenderState> Quick3DRenderPass::renderStateList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QRenderState; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *state) { Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object); @@ -79,12 +69,7 @@ QQmlListProperty<QRenderState> Quick3DRenderPass::renderStateList() QQmlListProperty<QParameter> Quick3DRenderPass::parameterList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QParameter; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *param) { Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object); diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp index 7c6249298..ade8f6ca7 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp +++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp @@ -16,11 +16,7 @@ Quick3DRenderPassFilter::Quick3DRenderPassFilter(QObject *parent) QQmlListProperty<QFilterKey> Quick3DRenderPassFilter::includeList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif auto appendFunction = [](QQmlListProperty<QFilterKey> *list, QFilterKey *v) { auto self = qobject_cast<Quick3DRenderPassFilter *>(list->object); @@ -55,11 +51,7 @@ QQmlListProperty<QFilterKey> Quick3DRenderPassFilter::includeList() QQmlListProperty<QParameter> Quick3DRenderPassFilter::parameterList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif auto appendFunction = [](QQmlListProperty<QParameter> *list, QParameter *v) { auto self = qobject_cast<Quick3DRenderPassFilter *>(list->object); diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp index 9ede43513..534e69ad6 100644 --- a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp +++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp @@ -16,12 +16,7 @@ Quick3DRenderTargetOutput::Quick3DRenderTargetOutput(QObject * parent) QQmlListProperty<QRenderTargetOutput> Quick3DRenderTargetOutput::qmlAttachments() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QRenderTargetOutput; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *output) { Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object); diff --git a/src/quick3d/quick3drender/items/quick3dscreenraycaster.cpp b/src/quick3d/quick3drender/items/quick3dscreenraycaster.cpp index a28884c85..153d35f42 100644 --- a/src/quick3d/quick3drender/items/quick3dscreenraycaster.cpp +++ b/src/quick3d/quick3drender/items/quick3dscreenraycaster.cpp @@ -24,12 +24,7 @@ Quick3DScreenRayCaster::Quick3DScreenRayCaster(QObject *parent) QQmlListProperty<Qt3DRender::QLayer> Qt3DRender::Render::Quick::Quick3DScreenRayCaster::qmlLayers() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DRender::QLayer; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *layer) { QAbstractRayCaster *filter = qobject_cast<QAbstractRayCaster *>(list->object); diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp index d03c900c1..8f92fb8f3 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp +++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp @@ -14,8 +14,6 @@ namespace Render { namespace Quick { namespace { - -const int qjsValueTypeId = qMetaTypeId<QJSValue>(); const int quick3DShaderDataArrayTypeId = qMetaTypeId<Quick3DShaderDataArray*>(); Q_DECL_UNUSED const int quick3DShaderDataTypeId = qMetaTypeId<Quick3DShaderData*>(); @@ -30,6 +28,8 @@ public: QVariant readProperty(const QVariant &v) override { + static const int qjsValueTypeId = qMetaTypeId<QJSValue>(); + // qjsValueTypeId are not compile time constant (no switch) if (v.userType() == qjsValueTypeId) { QJSValue jsValue = v.value<QJSValue>(); diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp index 76f1948b4..725dd6c6d 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp +++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp @@ -27,12 +27,7 @@ Quick3DShaderDataArray::Quick3DShaderDataArray(QNode *parent) QQmlListProperty<QShaderData> Quick3DShaderDataArray::valuesList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QShaderData; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *bar) { Quick3DShaderDataArray *self = static_cast<Quick3DShaderDataArray *>(list->object); diff --git a/src/quick3d/quick3drender/items/quick3dstateset.cpp b/src/quick3d/quick3drender/items/quick3dstateset.cpp index 0c37c529f..020462fab 100644 --- a/src/quick3d/quick3drender/items/quick3dstateset.cpp +++ b/src/quick3d/quick3drender/items/quick3dstateset.cpp @@ -20,12 +20,7 @@ Quick3DStateSet::~Quick3DStateSet() QQmlListProperty<QRenderState> Quick3DStateSet::renderStateList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QRenderState; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *state) { Quick3DStateSet *stateSet = qobject_cast<Quick3DStateSet *>(list->object); diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp index d7ebfc9fe..5d871893f 100644 --- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp +++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp @@ -16,12 +16,7 @@ Quick3DTechnique::Quick3DTechnique(QObject *parent) QQmlListProperty<QRenderPass> Quick3DTechnique::renderPassList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QRenderPass; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *renderPass) { Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object); @@ -54,12 +49,7 @@ QQmlListProperty<QRenderPass> Quick3DTechnique::renderPassList() QQmlListProperty<QParameter> Quick3DTechnique::parameterList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QParameter; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *param) { Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object); @@ -85,12 +75,7 @@ QQmlListProperty<QParameter> Quick3DTechnique::parameterList() QQmlListProperty<QFilterKey> Quick3DTechnique::filterKeyList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QFilterKey; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *filterKey) { Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object); diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp index 37ac4045f..da651cf59 100644 --- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp +++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp @@ -16,12 +16,7 @@ Quick3DTechniqueFilter::Quick3DTechniqueFilter(QObject *parent) QQmlListProperty<QFilterKey> Quick3DTechniqueFilter::matchList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QFilterKey; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *criterion) { Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object); @@ -56,12 +51,7 @@ QQmlListProperty<QFilterKey> Quick3DTechniqueFilter::matchList() QQmlListProperty<QParameter> Quick3DTechniqueFilter::parameterList() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QParameter; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *param) { Quick3DTechniqueFilter *techniqueFilter = qobject_cast<Quick3DTechniqueFilter *>(list->object); diff --git a/src/quick3d/quick3drender/items/quick3dtexture.cpp b/src/quick3d/quick3drender/items/quick3dtexture.cpp index 2929ff4d4..0acd6fc2f 100644 --- a/src/quick3d/quick3drender/items/quick3dtexture.cpp +++ b/src/quick3d/quick3drender/items/quick3dtexture.cpp @@ -18,12 +18,7 @@ Quick3DTextureExtension::Quick3DTextureExtension(QObject *parent) QQmlListProperty<QAbstractTextureImage> Quick3DTextureExtension::textureImages() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QAbstractTextureImage; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *textureImage) { Quick3DTextureExtension *self = qobject_cast<Quick3DTextureExtension *>(list->object); diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp index 15e287caa..12acb32a1 100644 --- a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp +++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp @@ -28,11 +28,7 @@ Qt3DCore::QNode *QuickRenderNodeFactory::createNode(const char *type) if (!typeInfo.resolved) { typeInfo.resolved = true; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), QTypeRevision::fromVersion(typeInfo.version.first, typeInfo.version.second)); -#else - typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second); -#endif } return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr; diff --git a/src/quick3d/quick3drender/quick3drender.pro b/src/quick3d/quick3drender/quick3drender.pro deleted file mode 100644 index 4c158a7b7..000000000 --- a/src/quick3d/quick3drender/quick3drender.pro +++ /dev/null @@ -1,23 +0,0 @@ -TARGET = Qt3DQuickRender -MODULE = 3dquickrender - -QT += core core-private qml qml-private 3dcore 3drender 3dquick 3dquick-private 3dcore-private 3drender-private -CONFIG -= precompile_header - -gcov { - QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage - QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage -} - -SOURCES += \ - qt3dquickrender_global.cpp \ - qt3dquickrendernodefactory.cpp - -HEADERS += \ - qt3dquickrendernodefactory_p.h \ - qt3dquickrender_global_p.h \ - qt3dquickrender_global.h - -include(./items/items.pri) - -load(qt_module) diff --git a/src/quick3d/quick3dscene2d/items/items.pri b/src/quick3d/quick3dscene2d/items/items.pri deleted file mode 100644 index 45d18dc40..000000000 --- a/src/quick3d/quick3dscene2d/items/items.pri +++ /dev/null @@ -1,17 +0,0 @@ -HEADERS += \ - $$PWD/scene2d_p.h \ - $$PWD/qscene2d_p.h \ - $$PWD/qscene2d.h \ - $$PWD/scene2dmanager_p.h \ - $$PWD/scene2dsharedobject_p.h \ - $$PWD/scene2devent_p.h \ - $$PWD/qt3dquick3dscene2d_p.h - -SOURCES += \ - $$PWD/qscene2d.cpp \ - $$PWD/scene2d.cpp \ - $$PWD/scene2dmanager.cpp \ - $$PWD/scene2dsharedobject.cpp \ - $$PWD/qt3dquick3dscene2d.cpp - -INCLUDEPATH += $$PWD diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.cpp b/src/quick3d/quick3dscene2d/items/qscene2d.cpp index 859ec666f..07f659e75 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/qscene2d.cpp @@ -12,12 +12,13 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Quick { +using namespace Qt3DCore; + /*! \namespace Qt3DRender::Quick \inmodule Qt3DScene2D @@ -108,7 +109,7 @@ namespace Quick { */ /*! - \enum QScene2D::RenderPolicy + \enum Qt3DRender::Quick::QScene2D::RenderPolicy This enum type describes types of render policies available. \value Continuous The Scene2D is rendering continuously. This is the default render policy. @@ -117,12 +118,12 @@ namespace Quick { */ /*! - \qmlproperty RenderTargetOutput Qt3D.Render::Scene2D::output + \qmlproperty RenderTargetOutput QtQuick.Scene2D::Scene2D::output Holds the RenderTargetOutput, which specifies where the Scene2D is rendering to. */ /*! - \qmlproperty enumeration Qt3D.Render::Scene2D::renderPolicy + \qmlproperty enumeration QtQuick.Scene2D::Scene2D::renderPolicy Holds the render policy of this Scene2D. \list @@ -132,12 +133,12 @@ namespace Quick { \endlist */ /*! - \qmlproperty Item Qt3D.Render::Scene2D::item + \qmlproperty Item QtQuick.Scene2D::Scene2D::item Holds the Item, which is rendered by Scene2D to the texture. */ /*! - \qmlproperty bool Qt3D.Render::Scene2D::mouseEnabled + \qmlproperty bool QtQuick.Scene2D::Scene2D::mouseEnabled Holds whether mouse events are enabled for the rendered item. The mouse events are generated from object picking events of the entities added to the Scene2D. Mouse is enabled by default. @@ -146,7 +147,7 @@ namespace Quick { happening in the backend. */ /*! - \qmlproperty list<Entity> Qt3D.Render::Scene2D::entities + \qmlproperty list<Entity> QtQuick.Scene2D::Scene2D::entities Holds the list of entities which are associated with the Scene2D object. If the entities have ObjectPicker, the pick events from that entity are sent to Scene2D and converted to mouse events. @@ -181,7 +182,7 @@ QScene2D::QScene2D(Qt3DCore::QNode *parent) } /*! - \property QScene2D::item + \property Qt3DRender::Quick::QScene2D::item Holds the QQuickItem, which is rendered by QScene2D to the texture. */ QQuickItem* QScene2D::item() const @@ -204,7 +205,7 @@ void QScene2D::setItem(QQuickItem *item) } /*! - \property QScene2D::renderPolicy + \property Qt3DRender::Quick::QScene2D::renderPolicy Holds the render policy of this Scene2D. */ @@ -224,7 +225,7 @@ void QScene2D::setRenderPolicy(QScene2D::RenderPolicy renderPolicy) } /*! - \property QScene2D::output + \property Qt3DRender::Quick::QScene2D::output Holds the QRenderTargetOutput, which specifies where the QScene2D is rendering to. */ @@ -292,7 +293,7 @@ void QScene2D::removeEntity(Qt3DCore::QEntity *entity) } /*! - \property QScene2D::mouseEnabled + \property Qt3DRender::Quick::QScene2D::mouseEnabled Holds whether mouse events are enabled for the rendered item. The mouse events are generated from object picking events of the entities added to the QScene2D. Mouse is enabled by default. diff --git a/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp b/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp index e4b76765d..9da79b4c0 100644 --- a/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp @@ -17,12 +17,7 @@ QQuick3DScene2D::QQuick3DScene2D(QObject *parent) QQmlListProperty<Qt3DCore::QEntity> QQuick3DScene2D::entities() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DCore::QEntity; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *entity) { QQuick3DScene2D *scene2d = qobject_cast<QQuick3DScene2D *>(list->object); diff --git a/src/quick3d/quick3dscene2d/items/scene2d.cpp b/src/quick3d/quick3dscene2d/items/scene2d.cpp index e679d56af..77d875cb5 100644 --- a/src/quick3d/quick3dscene2d/items/scene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2d.cpp @@ -10,9 +10,7 @@ #include <QtCore/qatomic.h> #include <QtGui/qevent.h> #include <QtGui/QOpenGLFunctions> -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #include <QQuickRenderTarget> -#endif #include <private/qscene2d_p.h> #include <private/scene2d_p.h> @@ -37,7 +35,6 @@ QT_BEGIN_NAMESPACE #define GL_DEPTH24_STENCIL8 0x88F0 #endif -using namespace Qt3DRender::Quick; namespace Qt3DRender { @@ -45,6 +42,8 @@ namespace Render { namespace Quick { +using namespace Qt3DRender::Quick; + Q_GLOBAL_STATIC(QThread, renderThread) Q_GLOBAL_STATIC(QAtomicInt, renderThreadClientCount) @@ -214,11 +213,7 @@ void Scene2D::initializeRender() m_context->create(); m_context->makeCurrent(m_sharedObject->m_surface); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) m_sharedObject->m_renderControl->initialize(); -#else - m_sharedObject->m_renderControl->initialize(m_context); -#endif m_context->doneCurrent(); QCoreApplication::postEvent(m_sharedObject->m_renderManager, diff --git a/src/quick3d/quick3dscene2d/items/scene2d.pri b/src/quick3d/quick3dscene2d/items/scene2d.pri deleted file mode 100644 index 4635c43e1..000000000 --- a/src/quick3d/quick3dscene2d/items/scene2d.pri +++ /dev/null @@ -1,10 +0,0 @@ -HEADERS += \ - $$PWD/qscene2d.h \ - $$PWD/qscene2d_p.h \ - $$PWD/scene2d_p.h - -SOURCES += \ - $$PWD/qscene2d.cpp \ - $$PWD/scene2d.cpp - -INCLUDEPATH += $$PWD diff --git a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp index e87f5cf7d..f1644d366 100644 --- a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp @@ -9,12 +9,13 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Quick { +using namespace Qt3DCore; + class RenderControl : public QQuickRenderControl { public: diff --git a/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp b/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp index 108f1c5f6..98a1eed8f 100644 --- a/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp @@ -10,12 +10,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Quick { +using namespace Qt3DCore; /*! \internal diff --git a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp index c2a1b3bcd..1b090663d 100644 --- a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp +++ b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp @@ -40,11 +40,7 @@ Qt3DCore::QNode *QuickScene2DNodeFactory::createNode(const char *type) if (!typeInfo.resolved) { typeInfo.resolved = true; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), QTypeRevision::fromVersion(typeInfo.version.first, typeInfo.version.second)); -#else - typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second); -#endif } return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr; diff --git a/src/quick3d/quick3dscene2d/quick3dscene2d.pro b/src/quick3d/quick3dscene2d/quick3dscene2d.pro deleted file mode 100644 index b0596e8de..000000000 --- a/src/quick3d/quick3dscene2d/quick3dscene2d.pro +++ /dev/null @@ -1,25 +0,0 @@ -TARGET = Qt3DQuickScene2D -MODULE = 3dquickscene2d - -QT += core core-private qml qml-private 3dcore 3drender 3dquick 3dquick-private 3dcore-private 3drender-private -CONFIG -= precompile_header - -gcov { - QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage - QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage -} - -SOURCES += \ - qt3dquickscene2d_global.cpp \ - qt3dquickscene2dnodefactory.cpp \ - qt3dquickscene2d_logging.cpp - -HEADERS += \ - qt3dquickscene2dnodefactory_p.h \ - qt3dquickscene2d_global_p.h \ - qt3dquickscene2d_global.h \ - qt3dquickscene2d_logging_p.h - -include(./items/items.pri) - -load(qt_module) |