summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorRobert Brock <robert.brock@kdab.com>2016-05-09 08:52:46 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-05-15 13:44:32 +0000
commit0d12f150dbf90063f45f9a4a6c05d00f3b5dad01 (patch)
tree92bdca775c32ee949c45374cf703f1cd700024b7 /examples
parentc5cb6a4783818386bd205a380d17987c45b6d742 (diff)
Moved component-changes example to manual test
Part of an examples cleanup Change-Id: I582bcad801efe6a09ceb8ade53ec5e6df858990f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/qt3d/component-changes/component-changes.pro9
-rw-r--r--examples/qt3d/component-changes/doc/src/component-changes.qdoc32
-rw-r--r--examples/qt3d/component-changes/main.cpp161
-rw-r--r--examples/qt3d/qt3d.pro3
4 files changed, 1 insertions, 204 deletions
diff --git a/examples/qt3d/component-changes/component-changes.pro b/examples/qt3d/component-changes/component-changes.pro
deleted file mode 100644
index a1a935145..000000000
--- a/examples/qt3d/component-changes/component-changes.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-!include( ../examples.pri ) {
- error( "Couldn't find the examples.pri file!" )
-}
-
-QT += 3dcore 3drender 3dinput 3dextras
-
-SOURCES += main.cpp
-
-
diff --git a/examples/qt3d/component-changes/doc/src/component-changes.qdoc b/examples/qt3d/component-changes/doc/src/component-changes.qdoc
deleted file mode 100644
index e3ee77ce7..000000000
--- a/examples/qt3d/component-changes/doc/src/component-changes.qdoc
+++ /dev/null
@@ -1,32 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** 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.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \example component-changes
- \title Qt 3D: Component Changes C++ Example
- \ingroup qt3d-examples-cpp
-*/
diff --git a/examples/qt3d/component-changes/main.cpp b/examples/qt3d/component-changes/main.cpp
deleted file mode 100644
index 32f95d7b5..000000000
--- a/examples/qt3d/component-changes/main.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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 <QGuiApplication>
-
-#include <Qt3DRender/qcamera.h>
-#include <Qt3DExtras/qcylindermesh.h>
-#include <Qt3DExtras/qspheremesh.h>
-#include <Qt3DExtras/qphongmaterial.h>
-
-#include <Qt3DCore/qentity.h>
-#include <Qt3DCore/qtransform.h>
-
-#include <Qt3DExtras/qt3dwindow.h>
-#include <Qt3DExtras/qorbitcameracontroller.h>
-
-#include <QTimer>
-
-class ComponentSwapper : public QObject
-{
- Q_OBJECT
-public:
- ComponentSwapper(Qt3DCore::QEntity *entity,
- Qt3DCore::QComponent *component1,
- Qt3DCore::QComponent *component2,
- QObject * parent = nullptr)
- : QObject(parent)
- , m_entity(entity)
- , m_component1(component1)
- , m_component2(component2)
- , m_currentComponent(component1)
- {
- // Set initial state
- m_entity->addComponent(m_component1);
- }
-
-public slots:
- void swapComponents()
- {
- if (m_currentComponent == m_component1) {
- m_entity->removeComponent(m_component1);
- m_entity->addComponent(m_component2);
- m_currentComponent = m_component2;
- } else {
- m_entity->removeComponent(m_component2);
- m_entity->addComponent(m_component1);
- m_currentComponent = m_component1;
- }
- }
-
-private:
- Qt3DCore::QEntity *m_entity;
- Qt3DCore::QComponent *m_component1;
- Qt3DCore::QComponent *m_component2;
- Qt3DCore::QComponent *m_currentComponent;
-};
-
-
-int main(int argc, char **argv)
-{
- QGuiApplication app(argc, argv);
- Qt3DExtras::Qt3DWindow view;
-
- // Root entity
- Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
-
- // Camera
- Qt3DRender::QCamera *camera = view.camera();
- camera->setPosition(QVector3D(0, 0, 20.0f));
- camera->setViewCenter(QVector3D(0, 0, 0));
-
- // For camera controls
- Qt3DExtras::QOrbitCameraController *cameraController = new Qt3DExtras::QOrbitCameraController(rootEntity);
- cameraController->setCamera(camera);
-
- // Cylinder mesh data
- Qt3DExtras::QCylinderMesh *cylinderMesh = new Qt3DExtras::QCylinderMesh();
- cylinderMesh->setRadius(1);
- cylinderMesh->setLength(3);
- cylinderMesh->setRings(5);
- cylinderMesh->setSlices(40);
-
- // Sphere mesh data
- Qt3DExtras::QSphereMesh *sphereMesh = new Qt3DExtras::QSphereMesh();
- sphereMesh->setRings(20);
- sphereMesh->setSlices(40);
-
- // Transform for cylinder
- Qt3DCore::QTransform *transform = new Qt3DCore::QTransform;
- transform->setScale(1.5f);
- transform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1, 0, 0), 45.0f));
-
- // Material
- Qt3DExtras::QPhongMaterial *material = new Qt3DExtras::QPhongMaterial(rootEntity);
- material->setDiffuse(Qt::red);
-
- // Cylinder
- Qt3DCore::QEntity *cylinder = new Qt3DCore::QEntity(rootEntity);
- cylinder->addComponent(transform);
- cylinder->addComponent(material);
-
- // Set root object of the scene
- view.setRootEntity(rootEntity);
- view.show();
-
- ComponentSwapper *swapper = new ComponentSwapper(cylinder, cylinderMesh, sphereMesh);
- QTimer *timer = new QTimer;
- QObject::connect(timer, SIGNAL(timeout()), swapper, SLOT(swapComponents()));
- timer->start(2000);
-
- return app.exec();
-}
-
-#include "main.moc"
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro
index 7621d54f6..6c1ee4668 100644
--- a/examples/qt3d/qt3d.pro
+++ b/examples/qt3d/qt3d.pro
@@ -36,8 +36,7 @@ SUBDIRS += \
picking-qml \
transforms-qml \
lights \
- compute-particles \
- component-changes
+ compute-particles
qtHaveModule(multimedia): SUBDIRS += audio-visualizer-qml