From b7b9c97c54a58405fba017366236510650200b69 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Thu, 19 Feb 2015 13:35:03 +0000 Subject: Remove incomplete bullet and OpenAL aspects This can be reverted following the merge from dev -> 5.5. Change-Id: I7b85e64aa91d9ed81e3ef4d866e531056314d72e Reviewed-by: Paul Lemire --- config.tests/bullet/bullet.pro | 8 - config.tests/bullet/main.cpp | 44 ------ examples/examples.pro | 4 - examples/rollerball/AdsEffect.qml | 96 ------------ examples/rollerball/AdsMaterial.qml | 61 -------- examples/rollerball/BallEntity.qml | 69 --------- examples/rollerball/BasicCamera.qml | 58 -------- examples/rollerball/BoxEntity.qml | 78 ---------- examples/rollerball/PlaneEntity.qml | 70 --------- examples/rollerball/main.cpp | 77 ---------- examples/rollerball/main.qml | 165 --------------------- examples/rollerball/rollerball.pro | 19 --- examples/rollerball/rollerball.qrc | 11 -- qt3d.pro | 1 - src/bulletphysics/bulletphysics.pri | 20 --- src/bulletphysics/bulletphysics.pro | 32 ---- src/bulletphysics/bulletphysicsaspect.cpp | 87 ----------- src/bulletphysics/bulletphysicsaspect.h | 72 --------- src/bulletphysics/qabstractcollider.cpp | 87 ----------- src/bulletphysics/qabstractcollider.h | 84 ----------- src/bulletphysics/qabstractcollider_p.h | 65 -------- src/bulletphysics/qboxcollider.cpp | 150 ------------------- src/bulletphysics/qboxcollider.h | 101 ------------- src/bulletphysics/qboxcollider_p.h | 67 --------- src/bulletphysics/qrigidbody.cpp | 151 ------------------- src/bulletphysics/qrigidbody.h | 104 ------------- src/bulletphysics/qrigidbody_p.h | 64 -------- src/bulletphysics/qspherecollider.cpp | 151 ------------------- src/bulletphysics/qspherecollider.h | 101 ------------- src/bulletphysics/qspherecollider_p.h | 66 --------- src/bulletphysics/qt3dbulletphysics_global.h | 56 ------- src/openal/openal.pri | 8 - src/openal/openal.pro | 25 ---- src/openal/openalaspect.cpp | 87 ----------- src/openal/openalaspect.h | 71 --------- src/openal/qt3dopenal_global.h | 56 ------- .../imports/bulletphysics/importsbulletphysics.pro | 15 -- src/quick3d/imports/bulletphysics/qmldir | 3 - .../qt3dquick3dbulletphysicsplugin.cpp | 55 ------- .../bulletphysics/qt3dquick3dbulletphysicsplugin.h | 54 ------- src/quick3d/quick3dbulletphysics/items/items.pri | 5 - .../qt3dquickbulletphysics_global.h | 52 ------- .../quick3dbulletphysics/quick3dbulletphysics.pro | 28 ---- src/src.pro | 19 --- sync.profile | 3 - 45 files changed, 2700 deletions(-) delete mode 100644 config.tests/bullet/bullet.pro delete mode 100644 config.tests/bullet/main.cpp delete mode 100644 examples/rollerball/AdsEffect.qml delete mode 100644 examples/rollerball/AdsMaterial.qml delete mode 100644 examples/rollerball/BallEntity.qml delete mode 100644 examples/rollerball/BasicCamera.qml delete mode 100644 examples/rollerball/BoxEntity.qml delete mode 100644 examples/rollerball/PlaneEntity.qml delete mode 100644 examples/rollerball/main.cpp delete mode 100644 examples/rollerball/main.qml delete mode 100644 examples/rollerball/rollerball.pro delete mode 100644 examples/rollerball/rollerball.qrc delete mode 100644 src/bulletphysics/bulletphysics.pri delete mode 100644 src/bulletphysics/bulletphysics.pro delete mode 100644 src/bulletphysics/bulletphysicsaspect.cpp delete mode 100644 src/bulletphysics/bulletphysicsaspect.h delete mode 100644 src/bulletphysics/qabstractcollider.cpp delete mode 100644 src/bulletphysics/qabstractcollider.h delete mode 100644 src/bulletphysics/qabstractcollider_p.h delete mode 100644 src/bulletphysics/qboxcollider.cpp delete mode 100644 src/bulletphysics/qboxcollider.h delete mode 100644 src/bulletphysics/qboxcollider_p.h delete mode 100644 src/bulletphysics/qrigidbody.cpp delete mode 100644 src/bulletphysics/qrigidbody.h delete mode 100644 src/bulletphysics/qrigidbody_p.h delete mode 100644 src/bulletphysics/qspherecollider.cpp delete mode 100644 src/bulletphysics/qspherecollider.h delete mode 100644 src/bulletphysics/qspherecollider_p.h delete mode 100644 src/bulletphysics/qt3dbulletphysics_global.h delete mode 100644 src/openal/openal.pri delete mode 100644 src/openal/openal.pro delete mode 100644 src/openal/openalaspect.cpp delete mode 100644 src/openal/openalaspect.h delete mode 100644 src/openal/qt3dopenal_global.h delete mode 100644 src/quick3d/imports/bulletphysics/importsbulletphysics.pro delete mode 100644 src/quick3d/imports/bulletphysics/qmldir delete mode 100644 src/quick3d/imports/bulletphysics/qt3dquick3dbulletphysicsplugin.cpp delete mode 100644 src/quick3d/imports/bulletphysics/qt3dquick3dbulletphysicsplugin.h delete mode 100644 src/quick3d/quick3dbulletphysics/items/items.pri delete mode 100644 src/quick3d/quick3dbulletphysics/qt3dquickbulletphysics_global.h delete mode 100644 src/quick3d/quick3dbulletphysics/quick3dbulletphysics.pro diff --git a/config.tests/bullet/bullet.pro b/config.tests/bullet/bullet.pro deleted file mode 100644 index 593f29f35..000000000 --- a/config.tests/bullet/bullet.pro +++ /dev/null @@ -1,8 +0,0 @@ -SOURCES += main.cpp - -LIBS += -lBulletDynamics -lBulletCollision -lLinearMath - -unix { - CONFIG += link_pkgconfig - PKGCONFIG += bullet -} diff --git a/config.tests/bullet/main.cpp b/config.tests/bullet/main.cpp deleted file mode 100644 index 569017e60..000000000 --- a/config.tests/bullet/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -int main(int argc, char** argv) -{ - btSequentialImpulseConstraintSolver *solver = new btSequentialImpulseConstraintSolver; - delete solver; - return 0; -} diff --git a/examples/examples.pro b/examples/examples.pro index 7f7e681bf..d47fd5bb8 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -34,10 +34,6 @@ SUBDIRS += \ #SUBDIRS += qt3d #qtHaveModule(qml): SUBDIRS += quick3d -qtHaveModule(3dbulletphysics) { - SUBDIRS += rollerball -} - # Make all other subdirs depend on exampleresources for(subdir, SUBDIRS) { !equals(subdir, exampleresources) { diff --git a/examples/rollerball/AdsEffect.qml b/examples/rollerball/AdsEffect.qml deleted file mode 100644 index 737811401..000000000 --- a/examples/rollerball/AdsEffect.qml +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt3D 2.0 -import Qt3D.Render 2.0 - -Effect { - id: root - - // These parameters act as default values for the effect. They take - // priority over any parameters specified in the RenderPasses below - // (none provided in this example). In turn these parameters can be - // overwritten by specifying them in a Material that references this - // effect. - // The priority order is: - // - // Material -> Effect -> Technique -> RenderPass -> GLSL default values - parameters: [ - Parameter { name: "ambient"; value: Qt.vector3d( 0.1, 0.1, 0.1 ) }, - Parameter { name: "diffuse"; value: Qt.vector3d( 0.7, 0.7, 0.7 ) }, - Parameter { name: "specular"; value: Qt.vector3d( 0.95, 0.95, 0.95 ) }, - Parameter { name: "shininess"; value: root.shininess } - ] - - techniques: [ - Technique { - openGLFilter { - api: OpenGLFilter.Desktop - profile: OpenGLFilter.Core - majorVersion: 3 - minorVersion: 1 - } - - annotations : [ Annotation { name : "renderingStyle"; value : "forward" } ] - - parameters: [ - Parameter { name: "lightPosition"; value: Qt.vector4d( 0.0, 0.0, 0.0, 1.0 ) }, - Parameter { name: "lightIntensity"; value: Qt.vector3d( 1.0, 1.0, 1.0 ) } - ] - - renderPasses: [ - RenderPass { - - // The bindings property allows us to map from names of parameters (uniforms or vertex attributes) - // within a shader to more friendly names in QML. By default the parameter names are exposed from - // the shader so we only need to add add mappings where the names differ. E.g. here we map from the - // ka uniform name in the shader to a property called ambient - bindings: [ - // Uniforms (those provided by the user) - ParameterMapping { parameterName: "ambient"; shaderVariableName: "ka"; bindingType: ParameterMapping.Uniform }, - ParameterMapping { parameterName: "diffuse"; shaderVariableName: "kd"; bindingType: ParameterMapping.Uniform }, - ParameterMapping { parameterName: "specular"; shaderVariableName: "ks"; bindingType: ParameterMapping.Uniform } - ] - - shaderProgram: ShaderProgram { - vertexShaderCode: loadSource("qrc:/shaders/phong.vert") - fragmentShaderCode: loadSource("qrc:/shaders/phong.frag") - } - } - ] - } - ] -} diff --git a/examples/rollerball/AdsMaterial.qml b/examples/rollerball/AdsMaterial.qml deleted file mode 100644 index 4f1b0a7ef..000000000 --- a/examples/rollerball/AdsMaterial.qml +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt3D 2.0 -import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. -import QtQuick 2.1 as QQ2 - -Material { - id: root - - property color ambient: Qt.rgba( 0.05, 0.05, 0.05, 1.0 ) - property color diffuse: Qt.rgba( 0.7, 0.7, 0.7, 1.0 ) - property color specular: Qt.rgba( 0.95, 0.95, 0.95, 1.0 ) - property real shininess: 150.0 - - parameters: [ - Parameter { name: "ambient"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) }, - Parameter { name: "diffuse"; value: Qt.vector3d(root.diffuse.r, root.diffuse.g, root.diffuse.b) }, - Parameter { name: "specular"; value: Qt.vector3d(root.specular.r, root.specular.g, root.specular.b) }, - Parameter { name: "shininess"; value: root.shininess } - ] -} diff --git a/examples/rollerball/BallEntity.qml b/examples/rollerball/BallEntity.qml deleted file mode 100644 index fc1985cc5..000000000 --- a/examples/rollerball/BallEntity.qml +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt3D 2.0 -import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. -import QtQuick 2.1 as QQ2 - -Entity { - id: root - - property real x: 0.0 - property real y: 1.0 - property real z: 0.0 - property real scale: 1.0 - property Material material - - components: [ transform, mesh, root.material ] - - Transform { - id: transform - Translate { dx: root.x; dy: root.y; dz: root.z } - Scale { scale: root.scale } - } - - SphereMesh { - id: mesh - rings: 50 - slices: 100 - } -} diff --git a/examples/rollerball/BasicCamera.qml b/examples/rollerball/BasicCamera.qml deleted file mode 100644 index db465a05f..000000000 --- a/examples/rollerball/BasicCamera.qml +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt3D 2.0 -import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. -import QtQuick 2.1 as QQ2 - -Camera { - id: mainCamera - objectName: "mainCamera" - projectionType: CameraLens.PerspectiveProjection - fieldOfView: 22.5 - aspectRatio: _window.width / _window.height - onAspectRatioChanged: console.log( "aspectRatio = " + aspectRatio ) - nearPlane: 0.01 - farPlane: 1000.0 - viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 ) - upVector: Qt.vector3d( 0.0, 1.0, 0.0 ) -} diff --git a/examples/rollerball/BoxEntity.qml b/examples/rollerball/BoxEntity.qml deleted file mode 100644 index ac183f837..000000000 --- a/examples/rollerball/BoxEntity.qml +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt3D 2.0 -import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. -import QtQuick 2.1 as QQ2 - -Entity { - id: root - - property alias width: mesh.xExtent - property alias height: mesh.yExtent - property alias depth: mesh.zExtent - - property alias x: translateTransform.dx - property alias y: translateTransform.dy - property alias z: translateTransform.dz - property alias angle: rotateTransform.angle - property alias axis: rotateTransform.axis - property alias scale: scaleTransform.scale - - property Material material - - components: [ transform, mesh, root.material ] - - Transform { - id: transform - Scale { id: scaleTransform } - Rotate { id: rotateTransform } - Translate { id: translateTransform } - } - - CuboidMesh { - id: mesh - yzMeshResolution: Qt.size(2, 2) - xzMeshResolution: Qt.size(2, 2) - xyMeshResolution: Qt.size(2, 2) - } -} diff --git a/examples/rollerball/PlaneEntity.qml b/examples/rollerball/PlaneEntity.qml deleted file mode 100644 index a1d5ce81e..000000000 --- a/examples/rollerball/PlaneEntity.qml +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt3D 2.0 -import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. -import QtQuick 2.1 as QQ2 - -Entity { - id: root - - property real x: 0.0 - property real y: 0.0 - property real z: 0.0 - property real scale: 1.0 - property Material material - - components: [ transform, mesh, root.material ] - - Transform { - id: transform - Translate { dx: root.x; dy: root.y; dz: root.z } - Scale { scale: root.scale } - } - - PlaneMesh { - id: mesh - width: 1.0 - height: 1.0 - meshResolution: Qt.size(2, 2) - } -} diff --git a/examples/rollerball/main.cpp b/examples/rollerball/main.cpp deleted file mode 100644 index de19070d6..000000000 --- a/examples/rollerball/main.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include -#include - -#include - -#include -#include - -int main(int argc, char* argv[]) -{ - QGuiApplication app(argc, argv); - - initializeAssetResources("../exampleresources/example-assets.qrb"); - - Qt3D::Window view; - Qt3D::Quick::QQmlAspectEngine engine; - - engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::BulletPhysicsAspect()); - QVariantMap data; - data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); - data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); - engine.aspectEngine()->setData(data); - engine.aspectEngine()->initialize(); - - // Expose the window as a context property so we can set the aspect ratio - engine.qmlEngine()->rootContext()->setContextProperty("_window", &view); - - // There should be some synchronising mechanism to make sure - // the source is set after all aspects have been completely initialized - // Otherwise we might encounter cases where an Aspect's QML elements have - // not yet been registered - engine.setSource(QUrl("qrc:/main.qml")); - view.show(); - - return app.exec(); -} diff --git a/examples/rollerball/main.qml b/examples/rollerball/main.qml deleted file mode 100644 index 85ec2c89f..000000000 --- a/examples/rollerball/main.qml +++ /dev/null @@ -1,165 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt3D 2.0 -import Qt3D.Render 2.0 - -Entity { - id: root - objectName: "root" - - // Use the renderer configuration specified in ForwardRenderer.qml - // and render from the mainCamera - components: [ - FrameGraph { - activeFrameGraph: ForwardRenderer { - id: renderer - camera: mainCamera - clearColor: "black" - } - } - ] - - BasicCamera { - id: mainCamera - position: Qt.vector3d( 0.0, 20.0, 70.0 ) - } - - Configuration { - controlledCamera: mainCamera - } - - AdsEffect { - id: adsEffect - } - - PlaneEntity { - id: floor - scale: 50 - material: AdsMaterial { - effect: adsEffect - ambient: Qt.rgba( 1.0, 1.0, 1.0, 1.0 ) - diffuse: Qt.rgba( 1.0, 1.0, 1.0, 1.0 ) - } - } - - AdsMaterial { - id: wallMaterial - effect: adsEffect - ambient: Qt.rgba( 0.1, 0.0, 0.1, 1.0 ) - diffuse: Qt.rgba( 1.0, 0.0, 1.0, 1.0 ) - } - - BoxEntity { - id: eastWall - width: 3 - height: 4 - depth: floor.scale + 2 * width - x: (floor.scale + width) / 2.0 - y: height / 2 - material: wallMaterial - } - - BoxEntity { - id: westWall - width: 3 - height: 4 - depth: floor.scale + 2 * width - x: -(floor.scale + width) / 2.0 - y: height / 2 - material: wallMaterial - } - - BoxEntity { - id: northWall - width: 3 - height: 4 - depth: floor.scale - z: (floor.scale + width) / 2.0 - y: height / 2 - angle: 90 - material: wallMaterial - } - - BoxEntity { - id: southWall - width: 3 - height: 4 - depth: floor.scale - z: -(floor.scale + width) / 2.0 - y: height / 2 - angle: 90 - material: wallMaterial - } - - AdsMaterial { - id: redMaterial - effect: adsEffect - ambient: Qt.rgba( 0.2, 0.0, 0.0, 1.0 ) - diffuse: Qt.rgba( 0.8, 0.0, 0.0, 1.0 ) - } - - AdsMaterial { - id: greenMaterial - effect: adsEffect - ambient: Qt.rgba( 0.0, 0.2, 0.0, 1.0 ) - diffuse: Qt.rgba( 0.0, 0.8, 0.0, 1.0 ) - } - - AdsMaterial { - id: blueMaterial - effect: adsEffect - ambient: Qt.rgba( 0.0, 0.0, 0.2, 1.0 ) - diffuse: Qt.rgba( 0.0, 0.0, 0.8, 1.0 ) - } - - BallEntity { - id: redBall - material: redMaterial - x: -5 - } - - BallEntity { - id: greenBall - material: greenMaterial - } - - BallEntity { - id: blueBall - material: blueMaterial - x: 5 - } -} diff --git a/examples/rollerball/rollerball.pro b/examples/rollerball/rollerball.pro deleted file mode 100644 index 601b3811f..000000000 --- a/examples/rollerball/rollerball.pro +++ /dev/null @@ -1,19 +0,0 @@ -TEMPLATE = app - -QT += 3dcore 3drenderer 3dinput 3dbulletphysics 3dquick qml quick - -include("../exampleresources/exampleresources.pri") - -HEADERS += \ - -SOURCES += \ - main.cpp - -OTHER_FILES += \ - main.qml \ - AdsEffect.qml \ - Renderable.qml \ - SimpleEffect.qml - -RESOURCES += \ - rollerball.qrc diff --git a/examples/rollerball/rollerball.qrc b/examples/rollerball/rollerball.qrc deleted file mode 100644 index ce83428c2..000000000 --- a/examples/rollerball/rollerball.qrc +++ /dev/null @@ -1,11 +0,0 @@ - - - main.qml - AdsEffect.qml - BasicCamera.qml - AdsMaterial.qml - BallEntity.qml - PlaneEntity.qml - BoxEntity.qml - - diff --git a/qt3d.pro b/qt3d.pro index 6562a9c29..4a57898b6 100644 --- a/qt3d.pro +++ b/qt3d.pro @@ -1,7 +1,6 @@ #requires(qtHaveModule(opengl)) load(configure) -qtCompileTest(bullet) qtCompileTest(assimp) load(qt_parts) diff --git a/src/bulletphysics/bulletphysics.pri b/src/bulletphysics/bulletphysics.pri deleted file mode 100644 index 1b8a027c6..000000000 --- a/src/bulletphysics/bulletphysics.pri +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/bulletphysicsaspect.h \ - $$PWD/qrigidbody.h \ - $$PWD/qrigidbody_p.h \ - $$PWD/qabstractcollider.h \ - $$PWD/qabstractcollider_p.h \ - $$PWD/qspherecollider.h \ - $$PWD/qspherecollider_p.h \ - $$PWD/qboxcollider.h \ - $$PWD/qboxcollider_p.h - -SOURCES += \ - $$PWD/bulletphysicsaspect.cpp \ - $$PWD/qrigidbody.cpp \ - $$PWD/qabstractcollider.cpp \ - $$PWD/qspherecollider.cpp \ - $$PWD/qboxcollider.cpp - diff --git a/src/bulletphysics/bulletphysics.pro b/src/bulletphysics/bulletphysics.pro deleted file mode 100644 index bdae45d1c..000000000 --- a/src/bulletphysics/bulletphysics.pro +++ /dev/null @@ -1,32 +0,0 @@ -TARGET = Qt3DBulletPhysics - -QT += core 3dcore core-private 3dcore-private - -LIBS += -lBulletDynamics -lBulletCollision -lLinearMath - -DEFINES += QT3DBULLETPHYSICS_LIBRARY - -MODULE = 3dbulletphysics - -load(qt_module) - -include(bulletphysics.pri) - -unix { - CONFIG += link_pkgconfig - PKGCONFIG += bullet -} - -gcov { - CONFIG += static - QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage - QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage -} - -# otherwise mingw headers do not declare common functions like ::strcasecmp -win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x - -HEADERS += \ - qt3dbulletphysics_global.h - -!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL diff --git a/src/bulletphysics/bulletphysicsaspect.cpp b/src/bulletphysics/bulletphysicsaspect.cpp deleted file mode 100644 index df280a3c8..000000000 --- a/src/bulletphysics/bulletphysicsaspect.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "bulletphysicsaspect.h" - -#include - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -BulletPhysicsAspect::BulletPhysicsAspect(QObject *parent) - : QAbstractAspect(QAbstractAspect::AspectAudio, parent) -{ -} - -void BulletPhysicsAspect::sceneNodeAdded(QSceneChangePtr &) -{ - -} - -void BulletPhysicsAspect::sceneNodeRemoved(QSceneChangePtr &) -{ - -} - -QVector BulletPhysicsAspect::jobsToExecute(qint64 time) -{ - Q_UNUSED(time); - QVector jobs; - - return jobs; -} - -void BulletPhysicsAspect::setRootEntity(QEntity *rootObject) -{ - Q_UNUSED(rootObject); -} - -void BulletPhysicsAspect::onInitialize(const QVariantMap &data) -{ - -} - -void BulletPhysicsAspect::onCleanup() -{ - -} - -} // Qt3D - -QT_END_NAMESPACE - -QT3D_REGISTER_NAMESPACED_ASPECT("bulletphysics", QT_PREPEND_NAMESPACE(Qt3D), BulletPhysicsAspect) diff --git a/src/bulletphysics/bulletphysicsaspect.h b/src/bulletphysics/bulletphysicsaspect.h deleted file mode 100644 index 55c566718..000000000 --- a/src/bulletphysics/bulletphysicsaspect.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_BULLETPHYSICSASPECT_H -#define QT3D_BULLETPHYSICSASPECT_H - -#include -#include - -QT_BEGIN_NAMESPACE - -class QSurface; - -namespace Qt3D { - -class QT3DBULLETPHYSICSSHARED_EXPORT BulletPhysicsAspect : public QAbstractAspect -{ - Q_OBJECT -public: - explicit BulletPhysicsAspect(QObject *parent = 0); - - void sceneNodeAdded(QSceneChangePtr &e) Q_DECL_OVERRIDE; - void sceneNodeRemoved(QSceneChangePtr &e) Q_DECL_OVERRIDE; - - // QJobProviderInterface interface - QVector jobsToExecute(qint64 time) Q_DECL_OVERRIDE; - - // AbstractAspect interface -private: - void setRootEntity(QEntity *rootObject) Q_DECL_OVERRIDE; - void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE; - void onCleanup() Q_DECL_OVERRIDE; -}; - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_BULLETPHYSICSASPECT_H diff --git a/src/bulletphysics/qabstractcollider.cpp b/src/bulletphysics/qabstractcollider.cpp deleted file mode 100644 index 96b3542cb..000000000 --- a/src/bulletphysics/qabstractcollider.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qabstractcollider.h" -#include "qabstractcollider_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { -namespace BulletPhysics { - -QAbstractColliderPrivate::QAbstractColliderPrivate(QAbstractCollider *qq) - : Qt3D::QComponentPrivate(qq) - , m_collisionBehavior(QAbstractCollider::NotifyOnly) -{ -} - -void QAbstractCollider::copy(const QNode *ref) -{ - QComponent::copy(ref); - const QAbstractCollider *other = static_cast(ref); - d_func()->m_collisionBehavior = other->d_func()->m_collisionBehavior; -} - -QAbstractCollider::QAbstractCollider(QNode *parent) - : Qt3D::QComponent(*new QAbstractColliderPrivate(this), parent) -{ -} - -QAbstractCollider::QAbstractCollider(QAbstractColliderPrivate &dd, Qt3D::QNode *parent) - : Qt3D::QComponent(dd, parent) -{ -} - - -void QAbstractCollider::setCollisionBehavior(CollisionBehavior collisionBehavior) -{ - Q_D(QAbstractCollider); - if (d->m_collisionBehavior != collisionBehavior) { - d->m_collisionBehavior = collisionBehavior; - emit collisionBehaviorChanged(); - } -} - -QAbstractCollider::CollisionBehavior QAbstractCollider::collisionBehavior() const -{ - Q_D(const QAbstractCollider); - return d->m_collisionBehavior; -} - -} // namespace BulletPhysics -} // namespace Qt3D - -QT_END_NAMESPACE diff --git a/src/bulletphysics/qabstractcollider.h b/src/bulletphysics/qabstractcollider.h deleted file mode 100644 index 04fe6ca96..000000000 --- a/src/bulletphysics/qabstractcollider.h +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_BULLETPHYSICS_QABSTRACTCOLLIDER_H -#define QT3D_BULLETPHYSICS_QABSTRACTCOLLIDER_H - -#include -#include - -QT_BEGIN_NAMESPACE - -namespace Qt3D { -namespace BulletPhysics { - -class QAbstractColliderPrivate; - -class QT3DBULLETPHYSICSSHARED_EXPORT QAbstractCollider : public Qt3D::QComponent -{ - Q_OBJECT - - Q_ENUMS(CollisionBehavior) - Q_PROPERTY(CollisionBehavior collisionBehavior READ collisionBehavior WRITE setCollisionBehavior NOTIFY collisionBehaviorChanged) - -public: - explicit QAbstractCollider(QNode *parent = 0); - - enum CollisionBehavior { - NotifyOnly = 0, - NotifyAndPreventIntersection - }; - - void setCollisionBehavior(CollisionBehavior collisionBehavior); - CollisionBehavior collisionBehavior() const; - -Q_SIGNALS: - void collisionBehaviorChanged(); - -protected: - QAbstractCollider(QAbstractColliderPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; - -private: - Q_DECLARE_PRIVATE(QAbstractCollider) -}; - -} // namespace BulletPhysics -} // namespace Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_BULLETPHYSICS_QABSTRACTCOLLIDER_H diff --git a/src/bulletphysics/qabstractcollider_p.h b/src/bulletphysics/qabstractcollider_p.h deleted file mode 100644 index 70486eb88..000000000 --- a/src/bulletphysics/qabstractcollider_p.h +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_BULLETPHYSICS_QABSTRACTCOLLIDER_P_H -#define QT3D_BULLETPHYSICS_QABSTRACTCOLLIDER_P_H - -#include -#include - -#include "qabstractcollider.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { -namespace BulletPhysics { - -class QAbstractColliderPrivate : public Qt3D::QComponentPrivate -{ -public: - QAbstractColliderPrivate(QAbstractCollider *qq); - - Q_DECLARE_PUBLIC(QAbstractCollider) - - QAbstractCollider::CollisionBehavior m_collisionBehavior; -}; - -} -} - -QT_END_NAMESPACE - -#endif // QT3D_BULLETPHYSICS_QABSTRACTCOLLIDER_P_H diff --git a/src/bulletphysics/qboxcollider.cpp b/src/bulletphysics/qboxcollider.cpp deleted file mode 100644 index 9ae9d87a2..000000000 --- a/src/bulletphysics/qboxcollider.cpp +++ /dev/null @@ -1,150 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qboxcollider.h" -#include "qboxcollider_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { -namespace BulletPhysics { - -QBoxColliderPrivate::QBoxColliderPrivate(QBoxCollider *qq) - : QAbstractColliderPrivate(qq) - , m_center() - , m_halfExtents() -{ -} - -void QBoxCollider::copy(const QNode *ref) -{ - QAbstractCollider::copy(ref); - const QBoxCollider *other = static_cast(ref); - d_func()->m_center = other->d_func()->m_center; - d_func()->m_halfExtents = other->d_func()->m_halfExtents; -} - -QBoxCollider::QBoxCollider(Qt3D::QNode *parent) - : QAbstractCollider(*new QBoxColliderPrivate(this), parent) -{ -} - -QBoxCollider::QBoxCollider(QBoxColliderPrivate &dd, QNode *parent) - : QAbstractCollider(dd, parent) -{ -} - -void QBoxCollider::setCenter(const QVector3D ¢er) -{ - Q_D(QBoxCollider); - if (!qFuzzyCompare(d->m_center, center)) { - setCenterX(center.x()); - setCenterY(center.y()); - setCenterZ(center.z()); - emit centerChanged(); - } -} - -QVector3D QBoxCollider::center() const -{ - Q_D(const QBoxCollider); - return d->m_center; -} - -void QBoxCollider::setHalfExtents(const QVector3D &halfExtents) -{ - Q_D(QBoxCollider); - if (d->m_halfExtents != halfExtents) { - d->m_halfExtents = halfExtents; - emit halfExtentsChanged(); - } -} - -QVector3D QBoxCollider::halfExtents() const -{ - Q_D(const QBoxCollider); - return d->m_halfExtents; -} - -void QBoxCollider::setCenterX(float x) -{ - Q_D(QBoxCollider); - if (!qFuzzyCompare(d->m_center.x(), x)) { - d->m_center.setX(x); - emit centerXChanged(); - } -} - -float QBoxCollider::centerX() const -{ - Q_D(const QBoxCollider); - return d->m_center.x(); -} - -void QBoxCollider::setCenterY(float y) -{ - Q_D(QBoxCollider); - if (!qFuzzyCompare(d->m_center.y(), y)) { - d->m_center.setY(y); - emit centerYChanged(); - } -} - -float QBoxCollider::centerY() const -{ - Q_D(const QBoxCollider); - return d->m_center.y(); -} - -void QBoxCollider::setCenterZ(float z) -{ - Q_D(QBoxCollider); - if (!qFuzzyCompare(d->m_center.z(), z)) { - d->m_center.setZ(z); - emit centerZChanged(); - } -} - -float QBoxCollider::centerZ() const -{ - Q_D(const QBoxCollider); - return d->m_center.z(); -} - -} // namespace BulletPhysics -} // namespace Qt3D - -QT_END_NAMESPACE diff --git a/src/bulletphysics/qboxcollider.h b/src/bulletphysics/qboxcollider.h deleted file mode 100644 index 9a890e5e0..000000000 --- a/src/bulletphysics/qboxcollider.h +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_BULLETPHYSICS_QBOXCOLLIDER_H -#define QT3D_BULLETPHYSICS_QBOXCOLLIDER_H - -#include -#include - -#include - -QT_BEGIN_NAMESPACE - -namespace Qt3D { -namespace BulletPhysics { - -class QBoxColliderPrivate; - -class QBoxCollider : public Qt3D::BulletPhysics::QAbstractCollider -{ - Q_OBJECT - - Q_PROPERTY(QVector3D center READ center WRITE setCenter NOTIFY centerChanged) - Q_PROPERTY(float centerX READ centerX WRITE setCenterX NOTIFY centerXChanged) - Q_PROPERTY(float centerY READ centerY WRITE setCenterY NOTIFY centerYChanged) - Q_PROPERTY(float centerZ READ centerZ WRITE setCenterZ NOTIFY centerZChanged) - Q_PROPERTY(QVector3D halfExtents READ halfExtents WRITE setHalfExtents NOTIFY halfExtentsChanged) - -public: - explicit QBoxCollider(Qt3D::QNode *parent = 0); - - void setCenter(const QVector3D ¢er); - QVector3D center() const; - - void setHalfExtents(const QVector3D &halfExtents); - QVector3D halfExtents() const; - - void setCenterX(float x); - float centerX() const; - - void setCenterY(float y); - float centerY() const; - - void setCenterZ(float z); - float centerZ() const; - -Q_SIGNALS: - void centerXChanged(); - void centerYChanged(); - void centerZChanged(); - void centerChanged(); - void halfExtentsChanged(); - -protected: - QBoxCollider(QBoxColliderPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; - -private: - Q_DECLARE_PRIVATE(QBoxCollider) - QT3D_CLONEABLE(QBoxCollider) -}; - -} // namespace BulletPhysics -} // namespace Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_BULLETPHYSICS_QBOXCOLLIDER_H diff --git a/src/bulletphysics/qboxcollider_p.h b/src/bulletphysics/qboxcollider_p.h deleted file mode 100644 index e8da0b849..000000000 --- a/src/bulletphysics/qboxcollider_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_BULLETPHYSICS_QBOXCOLLIDER_P_H -#define QT3D_BULLETPHYSICS_QBOXCOLLIDER_P_H - -#include -#include -#include - -#include - -QT_BEGIN_NAMESPACE - -namespace Qt3D { -namespace BulletPhysics { - -class QBoxColliderPrivate : public QAbstractColliderPrivate -{ -public: - QBoxColliderPrivate(QBoxCollider *qq); - - Q_DECLARE_PUBLIC(QBoxCollider) - - QVector3D m_center; - QVector3D m_halfExtents; -}; - -} // namespace BulletPhysics -} // namespace Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_BULLETPHYSICS_QBOXCOLLIDER_P_H diff --git a/src/bulletphysics/qrigidbody.cpp b/src/bulletphysics/qrigidbody.cpp deleted file mode 100644 index f09125aa7..000000000 --- a/src/bulletphysics/qrigidbody.cpp +++ /dev/null @@ -1,151 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qrigidbody.h" -#include "qrigidbody_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { -namespace BulletPhysics { - -QRigidBodyPrivate::QRigidBodyPrivate(QRigidBody *qq) - : Qt3D::QComponentPrivate(qq) - , m_mass(0.0f) - , m_centerOfMass() -{ -} - - -QRigidBody::QRigidBody(Qt3D::QNode *parent) - : Qt3D::QComponent(*new QRigidBodyPrivate(this), parent) -{ -} - -QRigidBody::QRigidBody(QRigidBodyPrivate &dd, Qt3D::QNode *parent) - : Qt3D::QComponent(dd, parent) -{ -} - -void QRigidBody::copy(const QNode *ref) -{ - QRigidBody::copy(ref); - const QRigidBody *other = static_cast(ref); - d_func()->m_mass = other->d_func()->m_mass; - d_func()->m_centerOfMass = other->d_func()->m_centerOfMass; -} - -void QRigidBody::setMass(float mass) -{ - Q_D(QRigidBody); - if (!qFuzzyCompare(d->m_mass, mass)) { - d->m_mass = mass; - emit massChanged(); - } -} - -float QRigidBody::mass() const -{ - Q_D(const QRigidBody); - return d->m_mass; -} - -void QRigidBody::setCenterOfMass(const QVector3D ¢erOfMass) -{ - Q_D(QRigidBody); - if (!qFuzzyCompare(d->m_centerOfMass,centerOfMass)) { - setCenterOfMassX(centerOfMass.x()); - setCenterOfMassY(centerOfMass.y()); - setCenterOfMassZ(centerOfMass.z()); - emit centerOfMassChanged(); - } -} - -QVector3D QRigidBody::centerOfMass() const -{ - Q_D(const QRigidBody); - return d->m_centerOfMass; -} - -void QRigidBody::setCenterOfMassX(float x) -{ - Q_D(QRigidBody); - if (!qFuzzyCompare(d->m_centerOfMass.x(), x)) { - d->m_centerOfMass.setX(x); - emit centerOfMassXChanged(); - } -} - -float QRigidBody::centerOfMassX() const -{ - Q_D(const QRigidBody); - return d->m_centerOfMass.x(); -} - -void QRigidBody::setCenterOfMassY(float y) -{ - Q_D(QRigidBody); - if (!qFuzzyCompare(d->m_centerOfMass.y(), y)) { - d->m_centerOfMass.setY(y); - emit centerOfMassYChanged(); - } -} - -float QRigidBody::centerOfMassY() const -{ - Q_D(const QRigidBody); - return d->m_centerOfMass.y(); -} - -void QRigidBody::setCenterOfMassZ(float z) -{ - Q_D(QRigidBody); - if (!qFuzzyCompare(d->m_centerOfMass.z(), z)) { - d->m_centerOfMass.setZ(z); - emit centerOfMassZChanged(); - } -} - -float QRigidBody::centerOfMassZ() const -{ - Q_D(const QRigidBody); - return d->m_centerOfMass.z(); -} - -} // namespace BulletPhysics -} // namespace Qt3D - -QT_END_NAMESPACE diff --git a/src/bulletphysics/qrigidbody.h b/src/bulletphysics/qrigidbody.h deleted file mode 100644 index 0d741ce97..000000000 --- a/src/bulletphysics/qrigidbody.h +++ /dev/null @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_BULLETPHYSICS_QRIGIDBODY_H -#define QT3D_BULLETPHYSICS_QRIGIDBODY_H - -#include - -#include -#include - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -class QNode; - -namespace BulletPhysics { - -class QRigidBodyPrivate; - -class QT3DBULLETPHYSICSSHARED_EXPORT QRigidBody : public Qt3D::QComponent -{ - Q_OBJECT - - Q_PROPERTY(float mass READ mass WRITE setMass NOTIFY massChanged) - Q_PROPERTY(QVector3D centerOfMass READ centerOfMass WRITE setCenterOfMass NOTIFY centerOfMassChanged) - Q_PROPERTY(float centerOfMassX READ centerOfMassX WRITE setCenterOfMassX NOTIFY centerOfMassXChanged) - Q_PROPERTY(float centerOfMassY READ centerOfMassY WRITE setCenterOfMassY NOTIFY centerOfMassYChanged) - Q_PROPERTY(float centerOfMassZ READ centerOfMassZ WRITE setCenterOfMassZ NOTIFY centerOfMassZChanged) - -public: - explicit QRigidBody(Qt3D::QNode *parent = 0); - - void setMass(float mass); - float mass() const; - - void setCenterOfMass(const QVector3D ¢erOfMass); - QVector3D centerOfMass() const; - - void setCenterOfMassX(float x); - float centerOfMassX() const; - - void setCenterOfMassY(float y); - float centerOfMassY() const; - - void setCenterOfMassZ(float z); - float centerOfMassZ() const; - -Q_SIGNALS: - void massChanged(); - void centerOfMassXChanged(); - void centerOfMassYChanged(); - void centerOfMassZChanged(); - void centerOfMassChanged(); - -protected: - QRigidBody(QRigidBodyPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; - -private: - Q_DECLARE_PRIVATE(QRigidBody) - QT3D_CLONEABLE(QRigidBody) -}; - -} // namespace BulletPhysics -} // namespace Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_BULLETPHYSICS_QRIGIDBODY_H diff --git a/src/bulletphysics/qrigidbody_p.h b/src/bulletphysics/qrigidbody_p.h deleted file mode 100644 index 53c1da3c3..000000000 --- a/src/bulletphysics/qrigidbody_p.h +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_BULLETPHYSICS_QRIGIDBODY_P_H -#define QT3D_BULLETPHYSICS_QRIGIDBODY_P_H - -#include -#include - -QT_BEGIN_NAMESPACE - -namespace Qt3D { -namespace BulletPhysics { - -class QRigidBodyPrivate : public Qt3D::QComponentPrivate -{ -public: - explicit QRigidBodyPrivate(QRigidBody *qq); - - Q_DECLARE_PUBLIC(QRigidBody) - - float m_mass; - QVector3D m_centerOfMass; -}; - -} -} - -QT_END_NAMESPACE - -#endif // QT3D_BULLETPHYSICS_QRIGIDBODY_P_H diff --git a/src/bulletphysics/qspherecollider.cpp b/src/bulletphysics/qspherecollider.cpp deleted file mode 100644 index 2a052ba9d..000000000 --- a/src/bulletphysics/qspherecollider.cpp +++ /dev/null @@ -1,151 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qspherecollider.h" -#include "qspherecollider_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { -namespace BulletPhysics { - -QSphereColliderPrivate::QSphereColliderPrivate(QSphereCollider *qq) - : QAbstractColliderPrivate(qq) - , m_center() - , m_radius(1.0f) -{ -} - - -QSphereCollider::QSphereCollider(Qt3D::QNode *parent) - : QAbstractCollider(*new QSphereColliderPrivate(this), parent) -{ -} - -QSphereCollider::QSphereCollider(QSphereColliderPrivate &dd, QNode *parent) - : QAbstractCollider(dd, parent) -{ -} - -void QSphereCollider::copy(const QNode *ref) -{ - QAbstractCollider::copy(ref); - const QSphereCollider *other = static_cast(ref); - d_func()->m_center = other->d_func()->m_center; - d_func()->m_radius = other->d_func()->m_radius; -} - -void QSphereCollider::setCenter(const QVector3D ¢er) -{ - Q_D(QSphereCollider); - if (!qFuzzyCompare(d->m_center, center)) { - setCenterX(center.x()); - setCenterY(center.y()); - setCenterZ(center.z()); - emit centerChanged(); - } -} - -QVector3D QSphereCollider::center() const -{ - Q_D(const QSphereCollider); - return d->m_center; -} - -void QSphereCollider::setRadius(float radius) -{ - Q_D(QSphereCollider); - if (d->m_radius != radius) { - d->m_radius = radius; - emit radiusChanged(); - } -} - -float QSphereCollider::radius() const -{ - Q_D(const QSphereCollider); - return d->m_radius; -} - -void QSphereCollider::setCenterX(float x) -{ - Q_D(QSphereCollider); - if (!qFuzzyCompare(d->m_center.x(), x)) { - d->m_center.setX(x); - emit centerXChanged(); - } -} - -float QSphereCollider::centerX() const -{ - Q_D(const QSphereCollider); - return d->m_center.x(); -} - -void QSphereCollider::setCenterY(float y) -{ - Q_D(QSphereCollider); - if (!qFuzzyCompare(d->m_center.y(), y)) { - d->m_center.setY(y); - emit centerYChanged(); - } -} - -float QSphereCollider::centerY() const -{ - Q_D(const QSphereCollider); - return d->m_center.y(); -} - -void QSphereCollider::setCenterZ(float z) -{ - Q_D(QSphereCollider); - if (!qFuzzyCompare(d->m_center.z(), z)) { - d->m_center.setZ(z); - emit centerZChanged(); - } -} - -float QSphereCollider::centerZ() const -{ - Q_D(const QSphereCollider); - return d->m_center.z(); -} - -} // namespace BulletPhysics -} // namespace Qt3D - -QT_END_NAMESPACE diff --git a/src/bulletphysics/qspherecollider.h b/src/bulletphysics/qspherecollider.h deleted file mode 100644 index 1a4781ba6..000000000 --- a/src/bulletphysics/qspherecollider.h +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_BULLETPHYSICS_QSPHERECOLLIDER_H -#define QT3D_BULLETPHYSICS_QSPHERECOLLIDER_H - -#include -#include - -#include - -QT_BEGIN_NAMESPACE - -namespace Qt3D { -namespace BulletPhysics { - -class QSphereColliderPrivate; - -class QT3DBULLETPHYSICSSHARED_EXPORT QSphereCollider : public Qt3D::BulletPhysics::QAbstractCollider -{ - Q_OBJECT - - Q_PROPERTY(QVector3D center READ center WRITE setCenter NOTIFY centerChanged) - Q_PROPERTY(float centerX READ centerX WRITE setCenterX NOTIFY centerXChanged) - Q_PROPERTY(float centerY READ centerY WRITE setCenterY NOTIFY centerYChanged) - Q_PROPERTY(float centerZ READ centerZ WRITE setCenterZ NOTIFY centerZChanged) - Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged) - -public: - explicit QSphereCollider(Qt3D::QNode *parent = 0); - - void setCenter(const QVector3D ¢er); - QVector3D center() const; - - void setRadius(float radius); - float radius() const; - - void setCenterX(float x); - float centerX() const; - - void setCenterY(float y); - float centerY() const; - - void setCenterZ(float z); - float centerZ() const; - -Q_SIGNALS: - void centerXChanged(); - void centerYChanged(); - void centerZChanged(); - void centerChanged(); - void radiusChanged(); - -protected: - QSphereCollider(QSphereColliderPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; - -private: - Q_DECLARE_PRIVATE(QSphereCollider) - QT3D_CLONEABLE(QSphereCollider) -}; - -} // namespace BulletPhysics -} // namespace Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_BULLETPHYSICS_QSPHERECOLLIDER_H diff --git a/src/bulletphysics/qspherecollider_p.h b/src/bulletphysics/qspherecollider_p.h deleted file mode 100644 index 165815d68..000000000 --- a/src/bulletphysics/qspherecollider_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_BULLETPHYSICS_QSPHERECOLLIDER_P_H -#define QT3D_BULLETPHYSICS_QSPHERECOLLIDER_P_H - -#include -#include - -#include - -QT_BEGIN_NAMESPACE - -namespace Qt3D { -namespace BulletPhysics { - -class QSphereColliderPrivate : public QAbstractColliderPrivate -{ -public: - QSphereColliderPrivate(QSphereCollider *qq); - - Q_DECLARE_PUBLIC(QSphereCollider) - - QVector3D m_center; - float m_radius; -}; - -} // namespace BulletPhysics -} // namespace Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_BULLETPHYSICS_QSPHERECOLLIDER_P_H diff --git a/src/bulletphysics/qt3dbulletphysics_global.h b/src/bulletphysics/qt3dbulletphysics_global.h deleted file mode 100644 index 6e992d8c5..000000000 --- a/src/bulletphysics/qt3dbulletphysics_global.h +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3DBULLETPHYSICS_GLOBAL_H -#define QT3DBULLETPHYSICS_GLOBAL_H - -#include - -QT_BEGIN_NAMESPACE - -#if defined(QT_SHARED) || !defined(QT_STATIC) -# if defined(QT3DBULLETPHYSICS_LIBRARY) -# define QT3DBULLETPHYSICSSHARED_EXPORT Q_DECL_EXPORT -# else -# define QT3DBULLETPHYSICSSHARED_EXPORT Q_DECL_IMPORT -# endif -#else -# define QT3DBULLETPHYSICSSHARED_EXPORT -#endif - -QT_END_NAMESPACE - -#endif // QT3DBULLETPHYSICS_GLOBAL_H diff --git a/src/openal/openal.pri b/src/openal/openal.pri deleted file mode 100644 index 7c0536c4f..000000000 --- a/src/openal/openal.pri +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/openalaspect.h - -SOURCES += \ - $$PWD/openalaspect.cpp - diff --git a/src/openal/openal.pro b/src/openal/openal.pro deleted file mode 100644 index 995dfa073..000000000 --- a/src/openal/openal.pro +++ /dev/null @@ -1,25 +0,0 @@ -TARGET = Qt3DOpenAL - -QT += core 3dcore - -DEFINES += QT3DOPENAL_LIBRARY - -MODULE = 3dopenal - -load(qt_module) - -include(openal.pri) - -gcov { - CONFIG += static - QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage - QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage -} - -# otherwise mingw headers do not declare common functions like ::strcasecmp -win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x - -HEADERS += \ - qt3dopenal_global.h - -!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL diff --git a/src/openal/openalaspect.cpp b/src/openal/openalaspect.cpp deleted file mode 100644 index c15de54d8..000000000 --- a/src/openal/openalaspect.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "openalaspect.h" - -#include - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -OpenALAspect::OpenALAspect(QObject *parent) - : QAbstractAspect(QAbstractAspect::AspectAudio, parent) -{ -} - -void OpenALAspect::sceneNodeAdded(QSceneChangePtr &) -{ - -} - -void OpenALAspect::sceneNodeRemoved(QSceneChangePtr &) -{ - -} - -QVector OpenALAspect::jobsToExecute(qint64 time) -{ - Q_UNUSED(time); - QVector jobs; - - return jobs; -} - -void OpenALAspect::setRootEntity(QEntity *) -{ - -} - -void OpenALAspect::onInitialize(const QVariantMap &) -{ - -} - -void OpenALAspect::onCleanup() -{ - -} - -} // Qt3D - -QT_END_NAMESPACE - -QT3D_REGISTER_NAMESPACED_ASPECT("openal", QT_PREPEND_NAMESPACE(Qt3D), OpenALAspect) diff --git a/src/openal/openalaspect.h b/src/openal/openalaspect.h deleted file mode 100644 index 39574e554..000000000 --- a/src/openal/openalaspect.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_OPENALASPECT_H -#define QT3D_OPENALASPECT_H - -#include -#include - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -class QT3DOPENALSHARED_EXPORT OpenALAspect : public QAbstractAspect -{ - Q_OBJECT -public: - explicit OpenALAspect(QObject *parent = 0); - - void sceneNodeAdded(QSceneChangePtr &e) Q_DECL_OVERRIDE; - void sceneNodeRemoved(QSceneChangePtr &e) Q_DECL_OVERRIDE; - - // QJobProviderInterface interface - QVector jobsToExecute(qint64 time) Q_DECL_OVERRIDE; - - // AbstractAspect interface -private: - void setRootEntity(QEntity *rootObject) Q_DECL_OVERRIDE; - void onInitialize(const QVariantMap &) Q_DECL_OVERRIDE; - void onCleanup() Q_DECL_OVERRIDE; - -}; - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_OPENALASPECT_H diff --git a/src/openal/qt3dopenal_global.h b/src/openal/qt3dopenal_global.h deleted file mode 100644 index c1ca2b4c9..000000000 --- a/src/openal/qt3dopenal_global.h +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3DOPENAL_GLOBAL_H -#define QT3DOPENAL_GLOBAL_H - -#include - -QT_BEGIN_NAMESPACE - -#if defined(QT_SHARED) || !defined(QT_STATIC) -# if defined(QT3DOPENAL_LIBRARY) -# define QT3DOPENALSHARED_EXPORT Q_DECL_EXPORT -# else -# define QT3DOPENALSHARED_EXPORT Q_DECL_IMPORT -# endif -#else -# define QT3DOPENALSHARED_EXPORT -#endif - -QT_END_NAMESPACE - -#endif // QT3DOPENAL_GLOBAL_H diff --git a/src/quick3d/imports/bulletphysics/importsbulletphysics.pro b/src/quick3d/imports/bulletphysics/importsbulletphysics.pro deleted file mode 100644 index 0b8e2864a..000000000 --- a/src/quick3d/imports/bulletphysics/importsbulletphysics.pro +++ /dev/null @@ -1,15 +0,0 @@ -CXX_MODULE = qml -TARGET = quick3dbulletphysicsplugin -TARGETPATH = Qt3D/BulletPhysics - -QT += core-private qml 3dcore 3dbulletphysics - -HEADERS += \ - qt3dquick3dbulletphysicsplugin.h - -SOURCES += \ - qt3dquick3dbulletphysicsplugin.cpp - -OTHER_FILES += qmldir - -load(qml_plugin) diff --git a/src/quick3d/imports/bulletphysics/qmldir b/src/quick3d/imports/bulletphysics/qmldir deleted file mode 100644 index 51cb48726..000000000 --- a/src/quick3d/imports/bulletphysics/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -module Qt3D.BulletPhysics -plugin quick3dbulletphysicsplugin -classname Qt3DQuick3DBulletPhysicsPlugin diff --git a/src/quick3d/imports/bulletphysics/qt3dquick3dbulletphysicsplugin.cpp b/src/quick3d/imports/bulletphysics/qt3dquick3dbulletphysicsplugin.cpp deleted file mode 100644 index a9e0ce7a3..000000000 --- a/src/quick3d/imports/bulletphysics/qt3dquick3dbulletphysicsplugin.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "qt3dquick3dbulletphysicsplugin.h" - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -void Qt3DQuick3DBulletPhysicsPlugin::registerTypes(const char *uri) -{ - qmlRegisterInterface("QAbstractCollider"); - qmlRegisterType(uri, 2, 0, "SphereCollider"); - qmlRegisterType(uri, 2, 0, "RigidBody"); -} - -QT_END_NAMESPACE - - diff --git a/src/quick3d/imports/bulletphysics/qt3dquick3dbulletphysicsplugin.h b/src/quick3d/imports/bulletphysics/qt3dquick3dbulletphysicsplugin.h deleted file mode 100644 index f3d97bfb5..000000000 --- a/src/quick3d/imports/bulletphysics/qt3dquick3dbulletphysicsplugin.h +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3DQUICK3DRENDERPLUGIN_H -#define QT3DQUICK3DRENDERPLUGIN_H - -#include - -QT_BEGIN_NAMESPACE - -class Qt3DQuick3DBulletPhysicsPlugin : public QQmlExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") -public: - void registerTypes(const char *uri) Q_DECL_OVERRIDE; -}; - -QT_END_NAMESPACE - -#endif // QT3DQUICK3DRENDERPLUGIN_H diff --git a/src/quick3d/quick3dbulletphysics/items/items.pri b/src/quick3d/quick3dbulletphysics/items/items.pri deleted file mode 100644 index e4d92bb8f..000000000 --- a/src/quick3d/quick3dbulletphysics/items/items.pri +++ /dev/null @@ -1,5 +0,0 @@ -#HEADERS += - -#SOURCES += - -INCLUDEPATH += $$PWD diff --git a/src/quick3d/quick3dbulletphysics/qt3dquickbulletphysics_global.h b/src/quick3d/quick3dbulletphysics/qt3dquickbulletphysics_global.h deleted file mode 100644 index 94f2bd6e8..000000000 --- a/src/quick3d/quick3dbulletphysics/qt3dquickbulletphysics_global.h +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3DQUICKBULLETPHYSICS_GLOBAL_H -#define QT3DQUICKBULLETPHYSICS_GLOBAL_H - -#include - -QT_BEGIN_NAMESPACE - -#if defined(QT3DQUICKBULLETPHYSICS_LIBRARY) -# define QT3DQUICKBULLETPHYSICSSHARED_EXPORT Q_DECL_EXPORT -#else -# define QT3DQUICKBULLETPHYSICSSHARED_EXPORT Q_DECL_IMPORT -#endif - -QT_END_NAMESPACE - -#endif // QT3DQUICKBULLETPHYSICS_GLOBAL_H diff --git a/src/quick3d/quick3dbulletphysics/quick3dbulletphysics.pro b/src/quick3d/quick3dbulletphysics/quick3dbulletphysics.pro deleted file mode 100644 index f0a25d703..000000000 --- a/src/quick3d/quick3dbulletphysics/quick3dbulletphysics.pro +++ /dev/null @@ -1,28 +0,0 @@ -TARGET = Qt3DQuickBulletPhysics - -QT += core core-private qml quick 3dcore 3dbulletphysics 3dquick - -DEFINES += QT3DQUICKBULLETPHYSICS_LIBRARY - -MODULE = 3dquickbulletphysics - -load(qt_module) - -gcov { - CONFIG += static - QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage - QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage -} else { - CONFIG += dll -} - -HEADERS += $$PRIVATE_HEADERS \ - qt3dquickbulletphysics_global.h - -!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL - -# otherwise mingw headers do not declare common functions like ::strcasecmp -win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x - -include(./items/items.pri) - diff --git a/src/src.pro b/src/src.pro index e67902fd2..f92a99dba 100644 --- a/src/src.pro +++ b/src/src.pro @@ -7,14 +7,6 @@ src_render.subdir = $$PWD/render src_render.target = sub-render src_render.depends = src_core -src_bulletphysics.subdir = $$PWD/bulletphysics -src_bulletphysics.target = sub-bulletphysics -src_bulletphysics.depends = src_core - -src_openal.subdir = $$PWD/openal -src_openal.target = sub-openal -src_openal.depends = src_core - src_input.subdir = $$PWD/input src_input.target = sub-input src_input.depends = src_render @@ -42,10 +34,6 @@ src_quick3d_imports_scene3d.file = $$PWD/quick3d/imports/scene3d/importsscene3d. src_quick3d_imports_scene3d.target = sub-quick3d-imports-scene3d src_quick3d_imports_scene3d.depends = src_quick3d_render src_input -src_quick3d_imports_bulletphysics.file = $$PWD/quick3d/imports/bulletphysics/importsbulletphysics.pro -src_quick3d_imports_bulletphysics.target = sub-quick3d-imports-bulletphysics -src_quick3d_imports_bulletphysics.depends = src_bulletphysics - src_quick3d_imports_input.file = $$PWD/quick3d/imports/input/importsinputs.pro src_quick3d_imports_input.target = sub-quick3d-imports-input src_quick3d_imports_input.depends = src_input @@ -59,7 +47,6 @@ SUBDIRS += \ src_core \ src_render \ src_input \ - src_openal \ src_quick3d_core \ src_quick3d_core_imports \ src_quick3d_render \ @@ -68,10 +55,4 @@ SUBDIRS += \ src_quick3d_imports_input \ src_plugins_sceneparsers -config_bullet { - SUBDIRS += \ - src_bulletphysics \ - src_quick3d_imports_bulletphysics -} - diff --git a/sync.profile b/sync.profile index 03d989cb7..fdf429afd 100644 --- a/sync.profile +++ b/sync.profile @@ -3,9 +3,6 @@ "Qt3DRenderer" => "$basedir/src/render", "Qt3DQuick" => "$basedir/src/quick3d/quick3d", "Qt3DQuickRenderer" => "$basedir/src/quick3d/quick3drenderer", - "Qt3DOpenAL" => "$basedir/src/openal", - "Qt3DBulletPhysics" => "$basedir/src/bulletphysics", - "Qt3DQuickBulletPhysics" => "$basedir/src/quick3d/quick3dbulletphysics", "Qt3DInput" => "$basedir/src/input", ); %moduleheaders = ( # restrict the module headers to those found in relative path -- cgit v1.2.3