diff options
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/manual.pro | 6 | ||||
-rw-r--r-- | tests/manual/sharedtexture/main.cpp | 159 | ||||
-rw-r--r-- | tests/manual/sharedtexture/sharedtexture.pro | 12 | ||||
-rw-r--r-- | tests/manual/sharedtexture/videoplayer.cpp | 233 | ||||
-rw-r--r-- | tests/manual/sharedtexture/videoplayer.h | 122 | ||||
-rw-r--r-- | tests/manual/sharedtextureqml/main.cpp | 131 | ||||
-rw-r--r-- | tests/manual/sharedtextureqml/main.qml | 144 | ||||
-rw-r--r-- | tests/manual/sharedtextureqml/qml.qrc | 5 | ||||
-rw-r--r-- | tests/manual/sharedtextureqml/sharedtextureqml.pro | 17 | ||||
-rw-r--r-- | tests/manual/texture_property_updates/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/texture_property_updates/main.qml | 4 |
11 files changed, 834 insertions, 1 deletions
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 6666245ca..a53437fe2 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -62,6 +62,12 @@ SUBDIRS += \ texture_property_updates \ qtbug-72236 +qtHaveModule(multimedia): { + SUBDIRS += \ + sharedtexture \ + sharedtextureqml +} + qtHaveModule(widgets): { SUBDIRS += \ assimp-cpp \ diff --git a/tests/manual/sharedtexture/main.cpp b/tests/manual/sharedtexture/main.cpp new file mode 100644 index 000000000..a85f90ee6 --- /dev/null +++ b/tests/manual/sharedtexture/main.cpp @@ -0,0 +1,159 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** 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 https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QApplication> +#include <QPropertyAnimation> + +#include <Qt3DCore/QEntity> +#include <Qt3DCore/QTransform> +#include <Qt3DCore/QAspectEngine> + +#include <Qt3DRender/QCamera> +#include <Qt3DRender/QCameraLens> +#include <Qt3DRender/QRenderAspect> +#include <Qt3DRender/QTexture> +#include <Qt3DRender/QDirectionalLight> + +#include <Qt3DInput/QInputAspect> + +#include <Qt3DExtras/QForwardRenderer> +#include <Qt3DExtras/QDiffuseMapMaterial> +#include <Qt3DExtras/QCuboidMesh> +#include <Qt3DExtras/QOrbitCameraController> +#include <Qt3DExtras/Qt3DWindow> + +#include "videoplayer.h" + +Qt3DCore::QEntity *createScene(Qt3DExtras::Qt3DWindow *view, Qt3DRender::QAbstractTexture *diffuseTexture) +{ + // Root entity + Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity; + + // Material + Qt3DExtras::QDiffuseMapMaterial *material = new Qt3DExtras::QDiffuseMapMaterial(rootEntity); + material->setDiffuse(diffuseTexture); + material->setAmbient(QColor(30, 30, 30)); + + // Sphere + Qt3DCore::QEntity *sphereEntity = new Qt3DCore::QEntity(rootEntity); + Qt3DExtras::QCuboidMesh *cuboidMesh = new Qt3DExtras::QCuboidMesh; + Qt3DCore::QTransform *transform = new Qt3DCore::QTransform; + + transform->setRotationX(180); + + QPropertyAnimation *cubeRotateTransformAnimation = new QPropertyAnimation(transform); + cubeRotateTransformAnimation->setTargetObject(transform); + cubeRotateTransformAnimation->setPropertyName("rotationY"); + cubeRotateTransformAnimation->setStartValue(QVariant::fromValue(0)); + cubeRotateTransformAnimation->setEndValue(QVariant::fromValue(360)); + cubeRotateTransformAnimation->setDuration(10000); + cubeRotateTransformAnimation->setLoopCount(-1); + cubeRotateTransformAnimation->start(); + + sphereEntity->addComponent(cuboidMesh); + sphereEntity->addComponent(transform); + sphereEntity->addComponent(material); + + // Camera + Qt3DRender::QCamera *camera = view->camera(); + camera->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f); + camera->setPosition(QVector3D(0, 0, -5.0f)); + camera->setViewCenter(QVector3D(0, 0, 0)); + + // For camera controls + Qt3DExtras::QOrbitCameraController *camController = new Qt3DExtras::QOrbitCameraController(rootEntity); + camController->setLinearSpeed( 50.0f ); + camController->setLookSpeed( 180.0f ); + camController->setCamera(camera); + + Qt3DRender::QDirectionalLight *light = new Qt3DRender::QDirectionalLight(); + light->setIntensity(0.8f); + light->setWorldDirection(camera->viewVector()); + rootEntity->addComponent(light); + + return rootEntity; +} + +int main(int argc, char* argv[]) +{ + QSurfaceFormat format = QSurfaceFormat::defaultFormat(); + format.setMajorVersion(4); + format.setMinorVersion(5); + format.setProfile(QSurfaceFormat::CoreProfile); + format.setRenderableType(QSurfaceFormat::OpenGL); + QSurfaceFormat::setDefaultFormat(format); + + // Will make Qt3D and QOpenGLWidget share a common context + QApplication::setAttribute(Qt::AA_ShareOpenGLContexts); + + QApplication app(argc, argv); + + // Multimedia player + TextureWidget textureWidget; + VideoPlayerThread *videoPlayer = new VideoPlayerThread(&textureWidget); + videoPlayer->start(); + + textureWidget.resize(800, 600); + textureWidget.show(); + + // Texture object that Qt3D uses to access the texture from the video player + Qt3DRender::QSharedGLTexture *sharedTexture = new Qt3DRender::QSharedGLTexture(); + + QObject::connect(&textureWidget, &TextureWidget::textureIdChanged, + sharedTexture, &Qt3DRender::QSharedGLTexture::setTextureId); + + // Qt3D Scene + Qt3DExtras::Qt3DWindow view; + Qt3DCore::QEntity *scene = createScene(&view, sharedTexture); + view.setRootEntity(scene); + view.show(); + + return app.exec(); +} diff --git a/tests/manual/sharedtexture/sharedtexture.pro b/tests/manual/sharedtexture/sharedtexture.pro new file mode 100644 index 000000000..b41f43d71 --- /dev/null +++ b/tests/manual/sharedtexture/sharedtexture.pro @@ -0,0 +1,12 @@ +!include( ../manual.pri ) { + error( "Couldn't find the manual.pri file!" ) +} + +QT += widgets 3dcore 3drender 3dinput 3dextras multimedia + +SOURCES += \ + videoplayer.cpp \ + main.cpp + +HEADERS += \ + videoplayer.h diff --git a/tests/manual/sharedtexture/videoplayer.cpp b/tests/manual/sharedtexture/videoplayer.cpp new file mode 100644 index 000000000..f970116b5 --- /dev/null +++ b/tests/manual/sharedtexture/videoplayer.cpp @@ -0,0 +1,233 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** 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 https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QMutexLocker> +#include <QtMultimedia/QVideoFrame> + +#include "videoplayer.h" + +TextureWidget::TextureWidget(QWidget *parent) + : QOpenGLWidget(parent) + , m_texture(QOpenGLTexture::Target2D) +{ + // Lock mutex so that we never process a frame until we have been initialized + m_mutex.lock(); +} + +// Main thread +void TextureWidget::initializeGL() +{ + initializeOpenGLFunctions(); + glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + + if (!m_shader.addShaderFromSourceCode(QOpenGLShader::Vertex, + "#version 330\n" + "out vec2 coords;\n" + "const vec2 positions[6] = vec2[] (" + " vec2(-1.0, 1.0)," + " vec2(-1.0, -1.0)," + " vec2(1.0, 1.0)," + " vec2(1.0, 1.0)," + " vec2(-1.0, -1.0)," + " vec2(1.0, -1.0));\n" + "const vec2 texCoords[6] = vec2[] (" + " vec2(0.0, 0.0)," + " vec2(0.0, 1.0)," + " vec2(1.0, 0.0)," + " vec2(1.0, 0.0)," + " vec2(0.0, 1.0)," + " vec2(1.0, 1.0));\n" + "void main() {\n" + " coords = texCoords[gl_VertexID];\n" + " gl_Position = vec4(positions[gl_VertexID], 0.0, 1.0);\n" + "}")) + qDebug() << "Failed to load vertex shader" << m_shader.log(); + if (!m_shader.addShaderFromSourceCode(QOpenGLShader::Fragment, + "#version 330\n" + "in vec2 coords;\n" + "uniform sampler2D video_texture;\n" + "out vec4 fragColor;\n" + "void main() {\n" + " fragColor = texture(video_texture, coords);\n" + "}")) + qDebug() << "Failed to load fragment shader" << m_shader.log(); + if (!m_shader.link()) + qDebug() << "Failed to link shaders" << m_shader.log(); + + qDebug() << Q_FUNC_INFO << context()->shareContext(); + + m_vao.create(); + // Allow rendering/frame acquisition to go on + m_mutex.unlock(); +} + +// Main thread +void TextureWidget::paintGL() +{ + QMutexLocker lock(&m_mutex); + glViewport(0, 0, width(), height()); + + glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); + + if (!m_texture.isCreated()) + return; + + m_shader.bind(); + + m_texture.bind(0); + m_shader.setUniformValue("video_texture", 0); + + m_vao.bind(); + glDrawArrays(GL_TRIANGLES, 0, 6); + + m_vao.release(); + m_shader.release(); +} + +// Video Player thread +void TextureWidget::setVideoFrame(const QVideoFrame &frame) +{ + // Ensure we won't be rendering while we are processing the frame + QMutexLocker lock(&m_mutex); + + QVideoFrame f = frame; + + // Map frame + if (!f.map(QAbstractVideoBuffer::ReadOnly)) + return; + + makeCurrent(); + + // Create or recreate texture + if (m_texture.width() != f.width() || m_texture.height() != f.height()) { + if (m_texture.isCreated()) + m_texture.destroy(); + + m_texture.setSize(f.width(), f.height()); + m_texture.setFormat(QOpenGLTexture::RGBA32F); + m_texture.setWrapMode(QOpenGLTexture::ClampToBorder); + m_texture.setMinificationFilter(QOpenGLTexture::Nearest); + m_texture.setMagnificationFilter(QOpenGLTexture::Nearest); + m_texture.allocateStorage(); + + m_texture.create(); + emit textureIdChanged(m_texture.textureId()); + } + + const QVideoFrame::PixelFormat pFormat = f.pixelFormat(); + if (pFormat == QVideoFrame::Format_RGB32) { + m_texture.setData(QOpenGLTexture::RGBA, QOpenGLTexture::UInt8, f.bits()); + } + + doneCurrent(); + + // Request display udpate + QOpenGLWidget::update(); + + // Unmap + f.unmap(); +} + +QList<QVideoFrame::PixelFormat> GLVideoSurface::supportedPixelFormats(QAbstractVideoBuffer::HandleType type) const +{ + if (type == QAbstractVideoBuffer::NoHandle) + return { + QVideoFrame::Format_RGB32, + QVideoFrame::Format_ARGB32, + QVideoFrame::Format_BGR32, + QVideoFrame::Format_BGRA32 + }; + return {}; +} + +// Video player thread +bool GLVideoSurface::present(const QVideoFrame &frame) +{ + emit onNewFrame(frame); + return true; +} + +VideoPlayerThread::VideoPlayerThread(TextureWidget *textureWidget) + : QThread(textureWidget) + , m_player(new QMediaPlayer(nullptr, QMediaPlayer::VideoSurface)) + , m_surface(new GLVideoSurface()) +{ + m_player->moveToThread(this); + m_player->setMedia(QUrl("https://www.sample-videos.com/video/mp4/720/big_buck_bunny_720p_1mb.mp4")); + + // Tell player to render on GLVideoSurface + m_surface->moveToThread(this); + m_player->setVideoOutput(m_surface.get()); + + // Display errors + QObject::connect(m_player.get(), QOverload<QMediaPlayer::Error>::of(&QMediaPlayer::error), + m_player.get(), [this] (QMediaPlayer::Error e) { + qDebug() << Q_FUNC_INFO << e << m_player->errorString(); + }); + + // Repeat video indefinitely + QObject::connect(m_player.get(), &QMediaPlayer::stateChanged, m_player.get(), [this] (QMediaPlayer::State state) { + if (state == QMediaPlayer::StoppedState) + m_player->play(); + }); + + // Start playing when thread starts + QObject::connect(this, &QThread::started, this, [this] { m_player->play(); }); + + // Direct connection between 2 objects living in different threads + QObject::connect(m_surface.get(), &GLVideoSurface::onNewFrame, + textureWidget, &TextureWidget::setVideoFrame, Qt::DirectConnection); +} + +VideoPlayerThread::~VideoPlayerThread() +{ + exit(0); + wait(); +} diff --git a/tests/manual/sharedtexture/videoplayer.h b/tests/manual/sharedtexture/videoplayer.h new file mode 100644 index 000000000..377ea57fe --- /dev/null +++ b/tests/manual/sharedtexture/videoplayer.h @@ -0,0 +1,122 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** 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 https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QThread> +#include <QMutex> + +#include <QOpenGLWidget> +#include <QOpenGLFunctions> +#include <QOpenGLVertexArrayObject> +#include <QOpenGLBuffer> +#include <QOpenGLTexture> +#include <QOpenGLShaderProgram> + +#include <QtMultimedia/QAbstractVideoSurface> +#include <QtMultimedia/QMediaPlayer> + +#include <memory> + +class TextureWidget : public QOpenGLWidget, private QOpenGLFunctions +{ + Q_OBJECT + Q_PROPERTY(int textureId READ textureId NOTIFY textureIdChanged) +public: + TextureWidget(QWidget *parent = nullptr); + + int textureId() { return m_texture.textureId(); } + +private: + // MainThread + void initializeGL() override; + + // Main thread + void paintGL() override; + +public Q_SLOTS: + // Called from Video player thread + void setVideoFrame(const QVideoFrame &frame); + +Q_SIGNALS: + void textureIdChanged(int textureId); + +private: + QOpenGLVertexArrayObject m_vao; + QOpenGLShaderProgram m_shader; + QOpenGLTexture m_texture; + QMutex m_mutex; +}; + + +class GLVideoSurface : public QAbstractVideoSurface +{ + Q_OBJECT +public: + QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType type) const override; + + // Call in VideaPlayerThread context + bool present(const QVideoFrame &frame) override; + +Q_SIGNALS: + void onNewFrame(const QVideoFrame &frame); +}; + + +class VideoPlayerThread : public QThread +{ + Q_OBJECT +public: + VideoPlayerThread(TextureWidget *textureWidget); + ~VideoPlayerThread(); + +private: + TextureWidget *m_textureWidget; + std::unique_ptr<QMediaPlayer> m_player; + std::unique_ptr<GLVideoSurface> m_surface; +}; diff --git a/tests/manual/sharedtextureqml/main.cpp b/tests/manual/sharedtextureqml/main.cpp new file mode 100644 index 000000000..5c7ae9cff --- /dev/null +++ b/tests/manual/sharedtextureqml/main.cpp @@ -0,0 +1,131 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** 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 https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QApplication> +#include <QtQml/QQmlContext> +#include <QtQuick/QQuickView> +#include <Qt3DRender/QAbstractTexture> +#include <QWindow> +#include <QTimer> + +#include <QQuickView> +#include "videoplayer.h" + + +template<typename Obj> +QHash<int, QString> enumToNameMap(const char *enumName) +{ + const QMetaObject metaObj = Obj::staticMetaObject; + const int indexOfEnum = metaObj.indexOfEnumerator(enumName); + const QMetaEnum metaEnum = metaObj.enumerator(indexOfEnum); + const int keysCount = metaEnum.keyCount(); + + QHash<int, QString> v; + v.reserve(keysCount); + for (int i = 0; i < keysCount; ++i) + v[metaEnum.value(i)] = metaEnum.key(i); + return v; +} + + +class EnumNameMapper : public QObject +{ + Q_OBJECT + +public: + Q_INVOKABLE QString statusName(int v) const { return m_statusMap.value(v); } + Q_INVOKABLE QString formatName(int v) const { return m_formatMap.value(v); } + Q_INVOKABLE QString targetName(int v) const { return m_targetMap.value(v); } + +private: + const QHash<int, QString> m_statusMap = enumToNameMap<Qt3DRender::QAbstractTexture>("Status"); + const QHash<int, QString> m_formatMap = enumToNameMap<Qt3DRender::QAbstractTexture>("TextureFormat"); + const QHash<int, QString> m_targetMap = enumToNameMap<Qt3DRender::QAbstractTexture>("Target"); +}; + +int main(int argc, char* argv[]) +{ + QSurfaceFormat format = QSurfaceFormat::defaultFormat(); + format.setMajorVersion(4); + format.setMinorVersion(5); + format.setDepthBufferSize(16); + format.setStencilBufferSize(8); + format.setProfile(QSurfaceFormat::CoreProfile); + format.setRenderableType(QSurfaceFormat::OpenGL); + QSurfaceFormat::setDefaultFormat(format); + + + // Make the OpenGLWidget's shared context be qt_gl_global_share_context + QApplication::setAttribute(Qt::AA_ShareOpenGLContexts); + QApplication app(argc, argv); + + // Multimedia player + TextureWidget textureWidget; + VideoPlayerThread *videoPlayer = new VideoPlayerThread(&textureWidget); + videoPlayer->start(); + + textureWidget.resize(800, 600); + textureWidget.show(); + + // Qt3D QtQuick Scene (uses qt_global_share_context by default) + QQuickView view; + QQmlContext *ctx = view.rootContext(); + EnumNameMapper mapper; + ctx->setContextProperty(QStringLiteral("_nameMapper"), &mapper); + ctx->setContextProperty(QStringLiteral("_textureWidget"), &textureWidget); + + view.resize(800, 600); + view.setSource(QUrl("qrc:/main.qml")); + view.show(); + + return app.exec(); +} + +#include "main.moc" diff --git a/tests/manual/sharedtextureqml/main.qml b/tests/manual/sharedtextureqml/main.qml new file mode 100644 index 000000000..fd529e51c --- /dev/null +++ b/tests/manual/sharedtextureqml/main.qml @@ -0,0 +1,144 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** 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 https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.10 +import QtQuick.Scene3D 2.0 +import Qt3D.Core 2.10 +import Qt3D.Render 2.13 +import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 + +Item { + width: 800 + height: 600 + + Scene3D { + anchors.fill: parent + + Entity { + id: sceneRoot + + Camera { + id: camera + projectionType: CameraLens.PerspectiveProjection + fieldOfView: 45 + aspectRatio: 16/9 + nearPlane : 0.1 + farPlane : 1000.0 + position: Qt.vector3d( 0.0, 0.0, -4.0 ) + upVector: Qt.vector3d( 0.0, 1.0, 0.0 ) + viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 ) + } + + OrbitCameraController { + camera: camera + } + + components: [ + RenderSettings { + activeFrameGraph: ForwardRenderer { + clearColor: Qt.rgba(0, 0.5, 1, 1) + camera: camera + } + }, + // Event Source will be set by the Qt3DQuickWindow + InputSettings { }, + DirectionalLight { + intensity: 0.8 + worldDirection: camera.viewVector + } + ] + + + NumberAnimation { + target: cubeTransform + property: "rotationY" + duration: 10000 + from: 0 + to: 360 + + loops: Animation.Infinite + running: true + } + + SharedGLTexture { + id: shaderGLTexture + textureId: _textureWidget.textureId + } + + Entity { + id: cubeEntity + readonly property CuboidMesh cuboid: CuboidMesh {} + readonly property DiffuseMapMaterial material: DiffuseMapMaterial { + diffuse: shaderGLTexture + } + Transform { + id: cubeTransform + rotationX: 180 + } + + components: [ cuboid, material, cubeTransform ] + } + } + } + + Grid { + spacing: 10 + columns: 2 + Text { text: "Target: " + _nameMapper.targetName(shaderGLTexture.target) } + Text { text: "Format: " + _nameMapper.formatName(shaderGLTexture.format) } + Text { text: "Width: " + shaderGLTexture.width } + Text { text: "Height: " + shaderGLTexture.height } + Text { text: "Depth: " + shaderGLTexture.depth } + Text { text: "Layers: " + shaderGLTexture.layers } + Text { text: "GL Texture Id: " + shaderGLTexture.textureId } + } + +} diff --git a/tests/manual/sharedtextureqml/qml.qrc b/tests/manual/sharedtextureqml/qml.qrc new file mode 100644 index 000000000..5f6483ac3 --- /dev/null +++ b/tests/manual/sharedtextureqml/qml.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>main.qml</file> + </qresource> +</RCC> diff --git a/tests/manual/sharedtextureqml/sharedtextureqml.pro b/tests/manual/sharedtextureqml/sharedtextureqml.pro new file mode 100644 index 000000000..066bb8446 --- /dev/null +++ b/tests/manual/sharedtextureqml/sharedtextureqml.pro @@ -0,0 +1,17 @@ +!include( ../manual.pri ) { + error( "Couldn't find the manual.pri file!" ) +} + +QT += widgets gui-private 3dcore 3drender 3dinput 3dextras multimedia quick 3dquickextras + +SOURCES += \ + main.cpp \ + ../sharedtexture/videoplayer.cpp + +HEADERS += \ + ../sharedtexture/videoplayer.h + +INCLUDEPATH += ../sharedtexture + +RESOURCES += \ + qml.qrc diff --git a/tests/manual/texture_property_updates/main.cpp b/tests/manual/texture_property_updates/main.cpp index e145b0a26..725c6ccc1 100644 --- a/tests/manual/texture_property_updates/main.cpp +++ b/tests/manual/texture_property_updates/main.cpp @@ -77,11 +77,13 @@ public: Q_INVOKABLE QString statusName(int v) const { return m_statusMap.value(v); } Q_INVOKABLE QString formatName(int v) const { return m_formatMap.value(v); } Q_INVOKABLE QString targetName(int v) const { return m_targetMap.value(v); } + Q_INVOKABLE QString handleTypeName(int v) const { return m_handleTypeMap.value(v); } private: const QHash<int, QString> m_statusMap = enumToNameMap<Qt3DRender::QAbstractTexture>("Status"); const QHash<int, QString> m_formatMap = enumToNameMap<Qt3DRender::QAbstractTexture>("TextureFormat"); const QHash<int, QString> m_targetMap = enumToNameMap<Qt3DRender::QAbstractTexture>("Target"); + const QHash<int, QString> m_handleTypeMap = enumToNameMap<Qt3DRender::QAbstractTexture>("HandleType"); }; int main(int argc, char* argv[]) diff --git a/tests/manual/texture_property_updates/main.qml b/tests/manual/texture_property_updates/main.qml index f1256c75b..7794dab55 100644 --- a/tests/manual/texture_property_updates/main.qml +++ b/tests/manual/texture_property_updates/main.qml @@ -51,7 +51,7 @@ import QtQuick 2.2 as QQ2 import QtQuick.Scene3D 2.0 import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Render 2.12 import Qt3D.Input 2.0 import Qt3D.Extras 2.0 @@ -184,6 +184,8 @@ QQ2.Item { QQ2.Text { text: "Depth: " + model.modelData.depth} QQ2.Text { text: "Layers: " + model.modelData.layers} QQ2.Text { text: "Status: " + nameMapper.statusName(model.modelData.status.toString()) } + QQ2.Text { text: "HandleType: " + nameMapper.handleTypeName(model.modelData.handleType) } + QQ2.Text { text: "Handle: " + model.modelData.handle } } } } |