summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorRobert Brock <robert.brock@kdab.com>2016-05-09 11:01:12 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-05-15 13:44:39 +0000
commitc471360f62d2cdc6e88ee116af50d874f549317c (patch)
tree18dedc8fef96895e0dd1fa21b1ee2f1b061c8280 /examples
parentf26fd16f80d9f2fc921b3858cc3f763b10aefa2c (diff)
Moved cylinder-cpp example to manual test
Part of an examples cleanup Change-Id: Id293f78a414cfbdc1f1f8796ec0485aacc06a906 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/qt3d/cylinder-cpp/cylinder-cpp.pro9
-rw-r--r--examples/qt3d/cylinder-cpp/doc/src/cylinder-cpp.qdoc32
-rw-r--r--examples/qt3d/cylinder-cpp/main.cpp120
-rw-r--r--examples/qt3d/qt3d.pro1
4 files changed, 0 insertions, 162 deletions
diff --git a/examples/qt3d/cylinder-cpp/cylinder-cpp.pro b/examples/qt3d/cylinder-cpp/cylinder-cpp.pro
deleted file mode 100644
index a1a935145..000000000
--- a/examples/qt3d/cylinder-cpp/cylinder-cpp.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/cylinder-cpp/doc/src/cylinder-cpp.qdoc b/examples/qt3d/cylinder-cpp/doc/src/cylinder-cpp.qdoc
deleted file mode 100644
index ed1a53e9a..000000000
--- a/examples/qt3d/cylinder-cpp/doc/src/cylinder-cpp.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 cylinder-cpp
- \title Qt 3D: Cylinder C++ Example
- \ingroup qt3d-examples-cpp
-*/
diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp
deleted file mode 100644
index 33a85f32b..000000000
--- a/examples/qt3d/cylinder-cpp/main.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 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 <Qt3DInput/QInputAspect>
-
-#include <Qt3DRender/qcamera.h>
-#include <Qt3DRender/qcameralens.h>
-#include <Qt3DExtras/qcylindermesh.h>
-#include <Qt3DRender/qmesh.h>
-#include <Qt3DRender/qtechnique.h>
-#include <Qt3DExtras/qphongmaterial.h>
-#include <Qt3DRender/qeffect.h>
-#include <Qt3DRender/qtexture.h>
-#include <Qt3DRender/qrenderpass.h>
-#include <Qt3DRender/qrenderaspect.h>
-#include <Qt3DExtras/qforwardrenderer.h>
-
-#include <Qt3DCore/qentity.h>
-#include <Qt3DCore/qtransform.h>
-#include <Qt3DCore/qaspectengine.h>
-
-#include <Qt3DExtras/qt3dwindow.h>
-#include <Qt3DExtras/qorbitcameracontroller.h>
-
-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->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f);
- camera->setPosition(QVector3D(0, 0, 20.0f));
- camera->setUpVector(QVector3D(0, 1, 0));
- camera->setViewCenter(QVector3D(0, 0, 0));
-
- // For camera controls
- Qt3DExtras::QOrbitCameraController *cameraController = new Qt3DExtras::QOrbitCameraController(rootEntity);
- cameraController->setCamera(camera);
-
- // Cylinder shape data
- Qt3DExtras::QCylinderMesh *mesh = new Qt3DExtras::QCylinderMesh();
- mesh->setRadius(1);
- mesh->setLength(3);
- mesh->setRings(100);
- mesh->setSlices(20);
-
- // 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(mesh);
- cylinder->addComponent(transform);
- cylinder->addComponent(material);
-
- // Set root object of the scene
- view.setRootEntity(rootEntity);
- view.show();
-
- return app.exec();
-}
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro
index 985adde7f..57651aa52 100644
--- a/examples/qt3d/qt3d.pro
+++ b/examples/qt3d/qt3d.pro
@@ -6,7 +6,6 @@ SUBDIRS += \
gltf \
multiviewport \
cylinder-qml \
- cylinder-cpp \
wireframe \
tessellation-modes \
deferred-renderer-qml \