diff options
Diffstat (limited to 'examples')
142 files changed, 1194 insertions, 1367 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index b008b37d8..c4952cd18 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,2 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += quick3d qt3d +SUBDIRS += qt3d +qtHaveModule(qml): SUBDIRS += quick3d diff --git a/examples/qt3d/README b/examples/qt3d/README index 065e59eeb..0c03548f7 100644 --- a/examples/qt3d/README +++ b/examples/qt3d/README @@ -1,6 +1,6 @@ -This directory contains examples for the Qt3D C++ API. +This directory contains examples for the Qt 3D C++ API. -Qt3D can be used to extend Qt Quick3D with custom 3D items. Qt3D is also +Qt 3D can be used to extend Qt Quick with custom 3D items. Qt 3D is also a general 3D toolkit, featuring a scenegraph API, support for OpenGL VBO's and other utilities for general 3D programming. @@ -9,11 +9,9 @@ will place any resulting binaries (and any required resources) into qt3d/bin in the build tree, in line with the logic in pkg.pri. Note that "make install" should not be run on the qt3d examples except for building packages. -Research work on Qt3D also continues in the labs repository: +Research work on Qt 3D also continues in the labs repository: http://qt.gitorious.org/qt-labs/qt3d -...and is from time to time ported into Qt Quick3D. - -Check the labs version of Qt3D for additional cutting edge features such as +Check the labs version of Qt 3D for additional cutting edge features such as support for stereoscopic hardware. diff --git a/examples/qt3d/basket/basket.pro b/examples/qt3d/basket/basket.pro index f7cb60232..9cad84892 100644 --- a/examples/qt3d/basket/basket.pro +++ b/examples/qt3d/basket/basket.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = basket -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/basket/basket_data.h b/examples/qt3d/basket/basket_data.h index 8eaf1ad11..40f0b9399 100644 --- a/examples/qt3d/basket/basket_data.h +++ b/examples/qt3d/basket/basket_data.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/basket/basketview.cpp b/examples/qt3d/basket/basketview.cpp index b5618455d..db27cd2d9 100644 --- a/examples/qt3d/basket/basketview.cpp +++ b/examples/qt3d/basket/basketview.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -49,7 +49,7 @@ BasketView::BasketView(QWindow *parent) : QGLView(parent) , m_angle(0) { - setWindowTitle(tr("Basket")); + setTitle(tr("Basket")); //! [1] QGLBuilder builder; diff --git a/examples/qt3d/basket/basketview.h b/examples/qt3d/basket/basketview.h index 1069652ed..1a6324c19 100644 --- a/examples/qt3d/basket/basketview.h +++ b/examples/qt3d/basket/basketview.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -52,10 +52,10 @@ QT_END_NAMESPACE class BasketView : public QGLView { Q_OBJECT - Q_PROPERTY(qreal angle READ angle WRITE setAngle) + Q_PROPERTY(float angle READ angle WRITE setAngle) public: - qreal angle() const { return m_angle; } - void setAngle(qreal angle) { m_angle = angle; update(); } + float angle() const { return m_angle; } + void setAngle(float angle) { m_angle = angle; update(); } //! [1] BasketView(QWindow *parent = 0); @@ -66,7 +66,7 @@ protected: private: QGLSceneNode *basket; - qreal m_angle; + float m_angle; }; #endif diff --git a/examples/qt3d/basket/main.cpp b/examples/qt3d/basket/main.cpp index ef0636d20..28fc6edfa 100644 --- a/examples/qt3d/basket/main.cpp +++ b/examples/qt3d/basket/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/builder/builder.cpp b/examples/qt3d/builder/builder.cpp index 2e1db9842..34dabb1d9 100644 --- a/examples/qt3d/builder/builder.cpp +++ b/examples/qt3d/builder/builder.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -141,8 +141,8 @@ QGLSceneNode *BuilderView::buildGeometry() //! [2] // size data for can - const qreal canRadius = 1.0f; - const qreal canHeight = 2.5f; + const float canRadius = 1.0f; + const float canHeight = 2.5f; const int numSlices = 32; QGeometryData canRim; @@ -151,9 +151,9 @@ QGLSceneNode *BuilderView::buildGeometry() // do the math for the defining points for (int i = 0; i < numSlices; ++i) { - qreal angle = (qreal(i) * 2.0 * M_PI) / numSlices; - canRim.appendVertex(QVector3D(canRadius * qCos(angle), - canRadius * qSin(angle), + float angle = (float(i) * 2.0 * M_PI) / numSlices; + canRim.appendVertex(QVector3D(canRadius * cosf(angle), + canRadius * sinf(angle), canHeight / 2.0f)); } diff --git a/examples/qt3d/builder/builder.h b/examples/qt3d/builder/builder.h index 014e7c631..b0aa45248 100644 --- a/examples/qt3d/builder/builder.h +++ b/examples/qt3d/builder/builder.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/builder/builder.pro b/examples/qt3d/builder/builder.pro index b820221a8..277b5ed57 100644 --- a/examples/qt3d/builder/builder.pro +++ b/examples/qt3d/builder/builder.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = builder -CONFIG += qt warn_on QT += 3d diff --git a/examples/qt3d/builder/main.cpp b/examples/qt3d/builder/main.cpp index 2840752f7..e857d5b6d 100644 --- a/examples/qt3d/builder/main.cpp +++ b/examples/qt3d/builder/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro index 7eae07d91..75fd802f3 100644 --- a/examples/qt3d/cube/cube.pro +++ b/examples/qt3d/cube/cube.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = cube -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/cube/cubeview.cpp b/examples/qt3d/cube/cubeview.cpp index e588305a2..7c475d67f 100644 --- a/examples/qt3d/cube/cubeview.cpp +++ b/examples/qt3d/cube/cubeview.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/cube/cubeview.h b/examples/qt3d/cube/cubeview.h index dbe256247..daffe3768 100644 --- a/examples/qt3d/cube/cubeview.h +++ b/examples/qt3d/cube/cubeview.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/cube/main.cpp b/examples/qt3d/cube/main.cpp index a9d7c87e5..ed2aa2060 100644 --- a/examples/qt3d/cube/main.cpp +++ b/examples/qt3d/cube/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/cylinder/cubeview.cpp b/examples/qt3d/cylinder/cubeview.cpp index 57a2ba067..38a6dc21b 100644 --- a/examples/qt3d/cylinder/cubeview.cpp +++ b/examples/qt3d/cylinder/cubeview.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/cylinder/cubeview.h b/examples/qt3d/cylinder/cubeview.h index 0a57412b0..f37a9a684 100644 --- a/examples/qt3d/cylinder/cubeview.h +++ b/examples/qt3d/cylinder/cubeview.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro index 03cb2cc5f..63488d8eb 100644 --- a/examples/qt3d/cylinder/cylinder.pro +++ b/examples/qt3d/cylinder/cylinder.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = cylinder -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/cylinder/cylinderview.cpp b/examples/qt3d/cylinder/cylinderview.cpp index 26036bee1..644be4952 100644 --- a/examples/qt3d/cylinder/cylinderview.cpp +++ b/examples/qt3d/cylinder/cylinderview.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/cylinder/cylinderview.h b/examples/qt3d/cylinder/cylinderview.h index 7d55fccd1..c70c27dd2 100644 --- a/examples/qt3d/cylinder/cylinderview.h +++ b/examples/qt3d/cylinder/cylinderview.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/cylinder/main.cpp b/examples/qt3d/cylinder/main.cpp index 7340463ec..d3b0b7ad2 100644 --- a/examples/qt3d/cylinder/main.cpp +++ b/examples/qt3d/cylinder/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/geometry/geometry.cpp b/examples/qt3d/geometry/geometry.cpp index 98e8e25cf..b231f77e4 100644 --- a/examples/qt3d/geometry/geometry.cpp +++ b/examples/qt3d/geometry/geometry.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/geometry/geometry.h b/examples/qt3d/geometry/geometry.h index b83c49918..9605ec70f 100644 --- a/examples/qt3d/geometry/geometry.h +++ b/examples/qt3d/geometry/geometry.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro index 19216a6f6..d56069831 100644 --- a/examples/qt3d/geometry/geometry.pro +++ b/examples/qt3d/geometry/geometry.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = geometry -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/geometry/geometryview.cpp b/examples/qt3d/geometry/geometryview.cpp index c30e1a2e1..c6af0d9c5 100644 --- a/examples/qt3d/geometry/geometryview.cpp +++ b/examples/qt3d/geometry/geometryview.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -84,7 +84,7 @@ GeometryView::GeometryView(QWindow *parent) floor->setMaterialIndex(m); floor->setPosition(QVector3D(0, 0, -5)); QGraphicsScale3D *scale = new QGraphicsScale3D(floor); - scale->setScale(QVector3D(0.2, 0.2, 0.1)); + scale->setScale(QVector3D(0.2f, 0.2f, 0.1f)); floor->addTransform(scale); mdl = new QGLLightModel(this); diff --git a/examples/qt3d/geometry/geometryview.h b/examples/qt3d/geometry/geometryview.h index ec4c3b5be..6ec321f85 100644 --- a/examples/qt3d/geometry/geometryview.h +++ b/examples/qt3d/geometry/geometryview.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/geometry/main.cpp b/examples/qt3d/geometry/main.cpp index 11cb9c87e..c245b4be8 100644 --- a/examples/qt3d/geometry/main.cpp +++ b/examples/qt3d/geometry/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/geometry/quadplane.cpp b/examples/qt3d/geometry/quadplane.cpp index 60429e10b..7b816eb07 100644 --- a/examples/qt3d/geometry/quadplane.cpp +++ b/examples/qt3d/geometry/quadplane.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -72,12 +72,12 @@ QuadPlane::QuadPlane(QObject *parent, QSizeF size, int level) QGeometryData zip2; for (int yy = 0; yy <= divisions; ++yy) { - qreal y = half.height() - float(yy) * div.height(); - qreal texY = float(yy) / divisions; + float y = half.height() - float(yy) * div.height(); + float texY = float(yy) / divisions; for (int xx = 0; xx <= divisions; ++xx) { - qreal x = half.width() - float(xx) * div.width(); - qreal texX = float(xx) / divisions; + float x = half.width() - float(xx) * div.width(); + float texX = float(xx) / divisions; zip.appendVertex(QVector3D(x, y, 0)); zip.appendTexCoord(QVector2D(1.0f - texX, 1.0f - texY)); } diff --git a/examples/qt3d/geometry/quadplane.h b/examples/qt3d/geometry/quadplane.h index 07ed23012..3f1bb11f8 100644 --- a/examples/qt3d/geometry/quadplane.h +++ b/examples/qt3d/geometry/quadplane.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/load_model/load_model.cpp b/examples/qt3d/load_model/load_model.cpp index 121d03129..4b65da0ed 100644 --- a/examples/qt3d/load_model/load_model.cpp +++ b/examples/qt3d/load_model/load_model.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/load_model/load_model.h b/examples/qt3d/load_model/load_model.h index eae7442e0..fc44e84c8 100644 --- a/examples/qt3d/load_model/load_model.h +++ b/examples/qt3d/load_model/load_model.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -51,21 +51,21 @@ QT_END_NAMESPACE class LoadModelView : public QGLView { Q_OBJECT - Q_PROPERTY(qreal angleTeapot READ angleTeapot WRITE setAngleTeapot) - Q_PROPERTY(qreal angleTeapotOrbit READ angleTeapotOrbit WRITE setAngleTeapotOrbit) - Q_PROPERTY(qreal angleLander READ angleLander WRITE setAngleLander) + Q_PROPERTY(float angleTeapot READ angleTeapot WRITE setAngleTeapot) + Q_PROPERTY(float angleTeapotOrbit READ angleTeapotOrbit WRITE setAngleTeapotOrbit) + Q_PROPERTY(float angleLander READ angleLander WRITE setAngleLander) public: LoadModelView(QWindow *parent = 0); ~LoadModelView(); - qreal angleTeapot() const { return m_AngleTeapot; } - void setAngleTeapot(qreal angle) { m_AngleTeapot = angle; update(); } + float angleTeapot() const { return m_AngleTeapot; } + void setAngleTeapot(float angle) { m_AngleTeapot = angle; update(); } - qreal angleTeapotOrbit() const { return m_AngleTeapotOrbit; } - void setAngleTeapotOrbit(qreal angle) { m_AngleTeapotOrbit = angle; update(); } + float angleTeapotOrbit() const { return m_AngleTeapotOrbit; } + void setAngleTeapotOrbit(float angle) { m_AngleTeapotOrbit = angle; update(); } - qreal angleLander() const { return m_AngleLander; } - void setAngleLander(qreal angle) { m_AngleLander = angle; update(); } + float angleLander() const { return m_AngleLander; } + void setAngleLander(float angle) { m_AngleLander = angle; update(); } protected: void paintGL(QGLPainter *painter); @@ -75,12 +75,12 @@ private: QGLAbstractScene* m_pTeapotScene; QGLTexture2D* m_pTeapotTexture; - qreal m_AngleTeapot; - qreal m_AngleTeapotOrbit; + float m_AngleTeapot; + float m_AngleTeapotOrbit; QGLAbstractScene* m_pLanderScene; QGLTexture2D* m_pLanderTexture; - qreal m_AngleLander; + float m_AngleLander; }; #endif diff --git a/examples/qt3d/load_model/load_model.pro b/examples/qt3d/load_model/load_model.pro index d235a33be..b9d289229 100644 --- a/examples/qt3d/load_model/load_model.pro +++ b/examples/qt3d/load_model/load_model.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = load_model -CONFIG += qt warn_on QT += 3d diff --git a/examples/qt3d/load_model/load_model_main.cpp b/examples/qt3d/load_model/load_model_main.cpp index 028f2d240..3854368a2 100644 --- a/examples/qt3d/load_model/load_model_main.cpp +++ b/examples/qt3d/load_model/load_model_main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/nesting/cubeview.cpp b/examples/qt3d/nesting/cubeview.cpp index ae7b8a7b2..f7c060405 100644 --- a/examples/qt3d/nesting/cubeview.cpp +++ b/examples/qt3d/nesting/cubeview.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/nesting/cubeview.h b/examples/qt3d/nesting/cubeview.h index a128a0dac..443dc210f 100644 --- a/examples/qt3d/nesting/cubeview.h +++ b/examples/qt3d/nesting/cubeview.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -53,21 +53,21 @@ QT_END_NAMESPACE class CubeView : public QGLView { Q_OBJECT - Q_PROPERTY(qreal teapotAngle READ teapotAngle WRITE setTeapotAngle) - Q_PROPERTY(qreal cubeAngle READ cubeAngle WRITE setCubeAngle) - Q_PROPERTY(qreal orbitAngle READ orbitAngle WRITE setOrbitAngle) + Q_PROPERTY(float teapotAngle READ teapotAngle WRITE setTeapotAngle) + Q_PROPERTY(float cubeAngle READ cubeAngle WRITE setCubeAngle) + Q_PROPERTY(float orbitAngle READ orbitAngle WRITE setOrbitAngle) public: CubeView(QWindow *parent = 0); ~CubeView(); - qreal teapotAngle() const { return tangle; } - void setTeapotAngle(qreal angle) { tangle = angle; update(); } + float teapotAngle() const { return tangle; } + void setTeapotAngle(float angle) { tangle = angle; update(); } - qreal cubeAngle() const { return cangle; } - void setCubeAngle(qreal angle) { cangle = angle; update(); } + float cubeAngle() const { return cangle; } + void setCubeAngle(float angle) { cangle = angle; update(); } - qreal orbitAngle() const { return oangle; } - void setOrbitAngle(qreal angle) { oangle = angle; update(); } + float orbitAngle() const { return oangle; } + void setOrbitAngle(float angle) { oangle = angle; update(); } protected: void initializeGL(QGLPainter *painter); @@ -81,9 +81,9 @@ private: QOpenGLFramebufferObject *fbo; QGLFramebufferObjectSurface fboSurface; QGLCamera *innerCamera; - qreal tangle; - qreal cangle; - qreal oangle; + float tangle; + float cangle; + float oangle; void drawCube1(QGLPainter *painter, const QVector3D &posn); void drawCube2(QGLPainter *painter, const QVector3D &posn); diff --git a/examples/qt3d/nesting/main.cpp b/examples/qt3d/nesting/main.cpp index e56e92c1c..7463c821a 100644 --- a/examples/qt3d/nesting/main.cpp +++ b/examples/qt3d/nesting/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro index fc1aba7da..2e4212a49 100644 --- a/examples/qt3d/nesting/nesting.pro +++ b/examples/qt3d/nesting/nesting.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = nesting -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/qt3d.svg b/examples/qt3d/qt3d.svg index 4b25ec50c..25c08688a 100644 --- a/examples/qt3d/qt3d.svg +++ b/examples/qt3d/qt3d.svg @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- Converted with SVG Converter - Version 0.9.5 (Compiled Mon May 30 09:08:51 2011) - Copyright (C) 2011 Nokia --> +<!-- Converted with SVG Converter - Version 0.9.5 (Compiled Mon May 30 09:08:51 2011) -Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). --> <svg xmlns="http://www.w3.org/2000/svg" width="287" version="1.1" height="286" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" id="svg2"> <defs id="defs4"> <linearGradient id="linearGradient4309"> diff --git a/examples/qt3d/solarsystem/main.cpp b/examples/qt3d/solarsystem/main.cpp index f27f3f583..3f94792f8 100644 --- a/examples/qt3d/solarsystem/main.cpp +++ b/examples/qt3d/solarsystem/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/solarsystem/resources/solar.fsh b/examples/qt3d/solarsystem/resources/solar.fsh index 7aff99f52..be2bcb258 100644 --- a/examples/qt3d/solarsystem/resources/solar.fsh +++ b/examples/qt3d/solarsystem/resources/solar.fsh @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/solarsystem/resources/solar.vsh b/examples/qt3d/solarsystem/resources/solar.vsh index c4b93cd76..2d029600e 100644 --- a/examples/qt3d/solarsystem/resources/solar.vsh +++ b/examples/qt3d/solarsystem/resources/solar.vsh @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/solarsystem/solarsystem.cpp b/examples/qt3d/solarsystem/solarsystem.cpp index baa1e9826..253275d02 100644 --- a/examples/qt3d/solarsystem/solarsystem.cpp +++ b/examples/qt3d/solarsystem/solarsystem.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/solarsystem/solarsystem.h b/examples/qt3d/solarsystem/solarsystem.h index 53c89674a..13b70e539 100644 --- a/examples/qt3d/solarsystem/solarsystem.h +++ b/examples/qt3d/solarsystem/solarsystem.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -53,34 +53,34 @@ QT_END_NAMESPACE class SolarSystemView : public QGLView { Q_OBJECT - Q_PROPERTY(qreal angle1 READ angle1 WRITE setAngle1) - Q_PROPERTY(qreal angle2 READ angle2 WRITE setAngle2) - Q_PROPERTY(qreal angle3 READ angle3 WRITE setAngle3) - Q_PROPERTY(qreal glowFactor READ glowFactor WRITE setGlowFactor) + Q_PROPERTY(float angle1 READ angle1 WRITE setAngle1) + Q_PROPERTY(float angle2 READ angle2 WRITE setAngle2) + Q_PROPERTY(float angle3 READ angle3 WRITE setAngle3) + Q_PROPERTY(float glowFactor READ glowFactor WRITE setGlowFactor) public: SolarSystemView(QWindow *parent = 0); ~SolarSystemView(); - qreal angle1() const { return m_angle1; } - void setAngle1(qreal angle) { m_angle1 = angle; update(); } + float angle1() const { return m_angle1; } + void setAngle1(float angle) { m_angle1 = angle; update(); } - qreal angle2() const { return m_angle2; } - void setAngle2(qreal angle) { m_angle2 = angle; update(); } + float angle2() const { return m_angle2; } + void setAngle2(float angle) { m_angle2 = angle; update(); } - qreal angle3() const { return m_angle3; } - void setAngle3(qreal angle) { m_angle3 = angle; update(); } + float angle3() const { return m_angle3; } + void setAngle3(float angle) { m_angle3 = angle; update(); } - qreal glowFactor() const { return m_glowFactor; } - void setGlowFactor(qreal arg) { m_glowFactor = arg; update(); } + float glowFactor() const { return m_glowFactor; } + void setGlowFactor(float arg) { m_glowFactor = arg; update(); } protected: void initializeGL(QGLPainter *painter); void paintGL(QGLPainter *painter); private: - qreal m_angle1; - qreal m_angle2; - qreal m_angle3; + float m_angle1; + float m_angle2; + float m_angle3; float m_glowFactor; QGraphicsRotation3D *sunRotation; QGraphicsRotation3D *planetRotation; diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro index 53fe5106c..ec311c3c3 100644 --- a/examples/qt3d/solarsystem/solarsystem.pro +++ b/examples/qt3d/solarsystem/solarsystem.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = solarsystem -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) @@ -9,7 +8,6 @@ SOURCES = solarsystem.cpp \ main.cpp HEADERS = solarsystem.h RESOURCES += solarsystem.qrc -DEPENDPATH += resources OTHER_FILES += \ resources/moon-texture.jpg \ diff --git a/examples/qt3d/tank/main.cpp b/examples/qt3d/tank/main.cpp index a48b57992..2dc278daf 100644 --- a/examples/qt3d/tank/main.cpp +++ b/examples/qt3d/tank/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/tank/quadplane.cpp b/examples/qt3d/tank/quadplane.cpp index 16935c912..3e62712bd 100644 --- a/examples/qt3d/tank/quadplane.cpp +++ b/examples/qt3d/tank/quadplane.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -86,12 +86,12 @@ QuadPlane::QuadPlane(QObject *parent, QSizeF size, int level) QGeometryData zip2; for (int yy = 0; yy <= divisions; ++yy) { - qreal y = half.height() - float(yy) * div.height(); - qreal texY = float(yy) / divisions; + float y = half.height() - float(yy) * div.height(); + float texY = float(yy) / divisions; for (int xx = 0; xx <= divisions; ++xx) { - qreal x = half.width() - float(xx) * div.width(); - qreal texX = float(xx) / divisions; + float x = half.width() - float(xx) * div.width(); + float texX = float(xx) / divisions; zip.appendVertex(QVector3D(x, y, 0)); zip.appendTexCoord(QVector2D(1.0f - texX, 1.0f - texY)); } diff --git a/examples/qt3d/tank/quadplane.h b/examples/qt3d/tank/quadplane.h index 0bb3f122a..f0465bf4c 100644 --- a/examples/qt3d/tank/quadplane.h +++ b/examples/qt3d/tank/quadplane.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/tank/tank.cpp b/examples/qt3d/tank/tank.cpp index f10daee42..9ab56018b 100644 --- a/examples/qt3d/tank/tank.cpp +++ b/examples/qt3d/tank/tank.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -61,7 +61,7 @@ static inline int rval() { // return an int 64 <--> 192 inclusive - return (qreal(qrand()) / qreal(RAND_MAX)) * 128 + 64; + return (float(qrand()) / float(RAND_MAX)) * 128 + 64; } static QGLMaterial *qCreateFluid() diff --git a/examples/qt3d/tank/tank.h b/examples/qt3d/tank/tank.h index da939bdab..e08867a29 100644 --- a/examples/qt3d/tank/tank.h +++ b/examples/qt3d/tank/tank.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro index 820feb798..19441ee9b 100644 --- a/examples/qt3d/tank/tank.pro +++ b/examples/qt3d/tank/tank.pro @@ -1,6 +1,5 @@ TARGET = tank TEMPLATE = app -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/tank/tankview.cpp b/examples/qt3d/tank/tankview.cpp index 02d462144..584aeff53 100644 --- a/examples/qt3d/tank/tankview.cpp +++ b/examples/qt3d/tank/tankview.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -62,7 +62,7 @@ TankView::TankView(QWindow *parent) // TODO: setToolTip not implemented in QWindow // setToolTip(tr("Double-click to add more tanks")); - setWindowTitle(tr("Double-click Me!")); + setTitle(tr("Double-click Me!")); } TankView::~TankView() diff --git a/examples/qt3d/tank/tankview.h b/examples/qt3d/tank/tankview.h index 17b4c1f65..08d576578 100644 --- a/examples/qt3d/tank/tankview.h +++ b/examples/qt3d/tank/tankview.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/teapot/main.cpp b/examples/qt3d/teapot/main.cpp index 0bed569ae..882ea3216 100644 --- a/examples/qt3d/teapot/main.cpp +++ b/examples/qt3d/teapot/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro index 13c3dc89e..d76721ae9 100644 --- a/examples/qt3d/teapot/teapot.pro +++ b/examples/qt3d/teapot/teapot.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = teapot -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/teapot/teapotview.cpp b/examples/qt3d/teapot/teapotview.cpp index ffaa17edf..142ea3a7a 100644 --- a/examples/qt3d/teapot/teapotview.cpp +++ b/examples/qt3d/teapot/teapotview.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/qt3d/teapot/teapotview.h b/examples/qt3d/teapot/teapotview.h index 35008f3f0..7cb5fdea6 100644 --- a/examples/qt3d/teapot/teapotview.h +++ b/examples/qt3d/teapot/teapotview.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/quick3d/animations/animations.pro b/examples/quick3d/animations/animations.pro index 0165164fe..860ed54db 100644 --- a/examples/quick3d/animations/animations.pro +++ b/examples/quick3d/animations/animations.pro @@ -1,7 +1,6 @@ TEMPLATE = app TARGET = animations_qml QT += qml quick 3dquick -CONFIG += qt warn_on SOURCES += main.cpp @@ -21,7 +20,6 @@ CATEGORY = examples include(../../../pkg.pri) OTHER_FILES += \ - mt.qml \ animations_qml.rc \ $$QML_INFRA_FILES diff --git a/examples/quick3d/animations/main.cpp b/examples/quick3d/animations/main.cpp index f68429de2..37a1dd682 100644 --- a/examples/quick3d/animations/main.cpp +++ b/examples/quick3d/animations/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/quick3d/animations/qml/Animations.qml b/examples/quick3d/animations/qml/Animations.qml index 72db2693b..c0af43d9f 100644 --- a/examples/quick3d/animations/qml/Animations.qml +++ b/examples/quick3d/animations/qml/Animations.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 Viewport { width: parent.width; diff --git a/examples/quick3d/animations/qml/desktop.qml b/examples/quick3d/animations/qml/desktop.qml index 00759a672..ffa708f83 100644 --- a/examples/quick3d/animations/qml/desktop.qml +++ b/examples/quick3d/animations/qml/desktop.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 import "." Item { diff --git a/examples/quick3d/basket/basket.pro b/examples/quick3d/basket/basket.pro index 49c94a596..6a6c02391 100644 --- a/examples/quick3d/basket/basket.pro +++ b/examples/quick3d/basket/basket.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = basket_qml -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp @@ -22,7 +21,6 @@ CATEGORY = examples include(../../../pkg.pri) OTHER_FILES += \ - mt.qml \ basket_qml.rc \ $$QML_INFRA_FILES diff --git a/examples/quick3d/basket/info.json b/examples/quick3d/basket/info.json deleted file mode 100644 index c8a2045d5..000000000 --- a/examples/quick3d/basket/info.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Basket QML", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qt3d.basket", - "Summary": "Basket QML Demo" - } -} diff --git a/examples/quick3d/basket/main.cpp b/examples/quick3d/basket/main.cpp index f68429de2..37a1dd682 100644 --- a/examples/quick3d/basket/main.cpp +++ b/examples/quick3d/basket/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/quick3d/basket/mt.qml b/examples/quick3d/basket/mt.qml deleted file mode 100644 index f776354db..000000000 --- a/examples/quick3d/basket/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Basket { - } -} diff --git a/examples/quick3d/basket/qml/Basket.qml b/examples/quick3d/basket/qml/Basket.qml index 5b1553302..f30d0e798 100644 --- a/examples/quick3d/basket/qml/Basket.qml +++ b/examples/quick3d/basket/qml/Basket.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -40,7 +40,7 @@ //! [1] import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 Viewport { width: parent.width; height: parent.height @@ -62,7 +62,7 @@ Viewport { Rotation3D { axis: Qt.vector3d(0, 1, 0) NumberAnimation on angle { - running: true + running: Qt.application.active loops: Animation.Infinite from: 0 to: 360 diff --git a/examples/quick3d/basket/qml/desktop.qml b/examples/quick3d/basket/qml/desktop.qml index ea9550f50..3e2365537 100644 --- a/examples/quick3d/basket/qml/desktop.qml +++ b/examples/quick3d/basket/qml/desktop.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/examples/quick3d/cube/cube.pro b/examples/quick3d/cube/cube.pro index c150ac65c..a2512a628 100644 --- a/examples/quick3d/cube/cube.pro +++ b/examples/quick3d/cube/cube.pro @@ -1,7 +1,6 @@ TEMPLATE = app TARGET = cube_qml QT += qml quick 3dquick -CONFIG += qt warn_on SOURCES += main.cpp @@ -19,7 +18,6 @@ CATEGORY = examples include(../../../pkg.pri) OTHER_FILES += \ - mt.qml \ cube_qml.rc \ $$QML_INFRA_FILES diff --git a/examples/quick3d/cube/info.json b/examples/quick3d/cube/info.json deleted file mode 100644 index ab6e14028..000000000 --- a/examples/quick3d/cube/info.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Cube_QML", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qt3d.cube_qml", - "Summary": "Cube QML Demo" - } -} diff --git a/examples/quick3d/cube/main.cpp b/examples/quick3d/cube/main.cpp index f68429de2..37a1dd682 100644 --- a/examples/quick3d/cube/main.cpp +++ b/examples/quick3d/cube/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/quick3d/cube/mt.qml b/examples/quick3d/cube/mt.qml deleted file mode 100644 index fbd293e1a..000000000 --- a/examples/quick3d/cube/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Cube { - } -} diff --git a/examples/quick3d/cube/qml/Cube.qml b/examples/quick3d/cube/qml/Cube.qml index 9a586bf00..ff6553fbf 100644 --- a/examples/quick3d/cube/qml/Cube.qml +++ b/examples/quick3d/cube/qml/Cube.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ //! [1] import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Viewport { width: parent.width; height: parent.height diff --git a/examples/quick3d/cube/qml/desktop.qml b/examples/quick3d/cube/qml/desktop.qml index c5a979345..1996432e9 100644 --- a/examples/quick3d/cube/qml/desktop.qml +++ b/examples/quick3d/cube/qml/desktop.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/examples/quick3d/forest/forest.pro b/examples/quick3d/forest/forest.pro index 1ecbd0a9e..b921a44ae 100644 --- a/examples/quick3d/forest/forest.pro +++ b/examples/quick3d/forest/forest.pro @@ -1,7 +1,6 @@ TEMPLATE = app TARGET = forest_qml QT += qml quick 3dquick -CONFIG += qt warn_on SOURCES += main.cpp @@ -24,7 +23,6 @@ CATEGORY = examples include(../../../pkg.pri) OTHER_FILES += \ - mt.qml \ forest.rc \ $$QML_INFRA_FILES diff --git a/examples/quick3d/forest/info.json b/examples/quick3d/forest/info.json deleted file mode 100644 index b4ad3e5d4..000000000 --- a/examples/quick3d/forest/info.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Forest", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qt3d.forest", - "Summary": "Forest QML Demo" - } -} diff --git a/examples/quick3d/forest/main.cpp b/examples/quick3d/forest/main.cpp index f68429de2..37a1dd682 100644 --- a/examples/quick3d/forest/main.cpp +++ b/examples/quick3d/forest/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/quick3d/forest/mt.qml b/examples/quick3d/forest/mt.qml deleted file mode 100644 index a8667e2cf..000000000 --- a/examples/quick3d/forest/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Forest { - } -} diff --git a/examples/quick3d/forest/qml/Forest.qml b/examples/quick3d/forest/qml/Forest.qml index 3a3bb5066..001bce16a 100644 --- a/examples/quick3d/forest/qml/Forest.qml +++ b/examples/quick3d/forest/qml/Forest.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -40,7 +40,7 @@ //![1] import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 Viewport { id: viewport diff --git a/examples/quick3d/forest/qml/Tree.qml b/examples/quick3d/forest/qml/Tree.qml index fbc313f66..9d493855b 100644 --- a/examples/quick3d/forest/qml/Tree.qml +++ b/examples/quick3d/forest/qml/Tree.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -40,7 +40,7 @@ //![1] import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 BillboardItem3D { id: tree diff --git a/examples/quick3d/forest/qml/desktop.qml b/examples/quick3d/forest/qml/desktop.qml index 34968f353..d03f77d13 100644 --- a/examples/quick3d/forest/qml/desktop.qml +++ b/examples/quick3d/forest/qml/desktop.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/examples/quick3d/lander/info.json b/examples/quick3d/lander/info.json deleted file mode 100644 index d8569eb89..000000000 --- a/examples/quick3d/lander/info.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Lander", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qt3d.lander", - "Summary": "Lander QML Demo" - } -} diff --git a/examples/quick3d/lander/lander.pro b/examples/quick3d/lander/lander.pro index 16c8d56e9..cd4449317 100644 --- a/examples/quick3d/lander/lander.pro +++ b/examples/quick3d/lander/lander.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = lander -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp @@ -32,7 +31,6 @@ CATEGORY = examples include(../../../pkg.pri) OTHER_FILES += \ - mt.qml \ lander.rc \ $$QML_INFRA_FILES diff --git a/examples/quick3d/lander/main.cpp b/examples/quick3d/lander/main.cpp index f68429de2..37a1dd682 100644 --- a/examples/quick3d/lander/main.cpp +++ b/examples/quick3d/lander/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/quick3d/lander/mt.qml b/examples/quick3d/lander/mt.qml deleted file mode 100644 index f4c7da9d2..000000000 --- a/examples/quick3d/lander/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Lander { - } -} diff --git a/examples/quick3d/lander/qml/Jet.qml b/examples/quick3d/lander/qml/Jet.qml index dff8de6d9..aa2432db7 100644 --- a/examples/quick3d/lander/qml/Jet.qml +++ b/examples/quick3d/lander/qml/Jet.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Item3D { // We want to scale the flame, but keep the top constant so it diff --git a/examples/quick3d/lander/qml/Lander.qml b/examples/quick3d/lander/qml/Lander.qml index b38522873..cbdd3d9c3 100644 --- a/examples/quick3d/lander/qml/Lander.qml +++ b/examples/quick3d/lander/qml/Lander.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 //! [1] Image { diff --git a/examples/quick3d/lander/qml/desktop.qml b/examples/quick3d/lander/qml/desktop.qml index ae6339a26..58eb0f05e 100644 --- a/examples/quick3d/lander/qml/desktop.qml +++ b/examples/quick3d/lander/qml/desktop.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/examples/quick3d/matrix_animation/info.json b/examples/quick3d/matrix_animation/info.json deleted file mode 100644 index 9e73fc67a..000000000 --- a/examples/quick3d/matrix_animation/info.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "MatrixAnim", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qt3d.matrixanimation", - "Summary": "Matrix Animation QML Demo" - } -} diff --git a/examples/quick3d/matrix_animation/main.cpp b/examples/quick3d/matrix_animation/main.cpp index f68429de2..37a1dd682 100644 --- a/examples/quick3d/matrix_animation/main.cpp +++ b/examples/quick3d/matrix_animation/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/quick3d/matrix_animation/matrix_animation.pro b/examples/quick3d/matrix_animation/matrix_animation.pro index e4ba730fd..bfa4183e3 100644 --- a/examples/quick3d/matrix_animation/matrix_animation.pro +++ b/examples/quick3d/matrix_animation/matrix_animation.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = matrix_animation -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp @@ -22,7 +21,6 @@ CATEGORY = examples include(../../../pkg.pri) OTHER_FILES += \ - mt.qml \ matrix_animation.rc \ $$QML_INFRA_FILES diff --git a/examples/quick3d/matrix_animation/mt.qml b/examples/quick3d/matrix_animation/mt.qml deleted file mode 100644 index bd83c7bda..000000000 --- a/examples/quick3d/matrix_animation/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - MatrixAnimation { - } -} diff --git a/examples/quick3d/matrix_animation/qml/MatrixAnimation.qml b/examples/quick3d/matrix_animation/qml/MatrixAnimation.qml index 490c8fc3e..d67d9afde 100644 --- a/examples/quick3d/matrix_animation/qml/MatrixAnimation.qml +++ b/examples/quick3d/matrix_animation/qml/MatrixAnimation.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 Viewport { width: parent.width @@ -58,7 +58,7 @@ Viewport { transform: Rotation3D { NumberAnimation on angle{ - running: true + running: Qt.application.active loops: Animation.Infinite from: 0 to: 360 @@ -86,7 +86,7 @@ Viewport { 0.0, 0.0, 0.0, 1.0 ] SequentialAnimation on translationY { - running: true + running: Qt.application.active loops: Animation.Infinite PauseAnimation { duration: 2000 } NumberAnimation { from: 1.0; to: 0.001; duration: 1500; easing.type:"OutBounce" } @@ -95,7 +95,7 @@ Viewport { } SequentialAnimation on customInt { - running: true + running: Qt.application.active loops: Animation.Infinite PauseAnimation { duration: 2500 } NumberAnimation { from: 1.0; to: 0.001; duration: 1500; easing.type:"OutBounce" } diff --git a/examples/quick3d/matrix_animation/qml/desktop.qml b/examples/quick3d/matrix_animation/qml/desktop.qml index 576d55085..ec383b092 100644 --- a/examples/quick3d/matrix_animation/qml/desktop.qml +++ b/examples/quick3d/matrix_animation/qml/desktop.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/examples/quick3d/monkeygod/info.json b/examples/quick3d/monkeygod/info.json deleted file mode 100644 index e11b32491..000000000 --- a/examples/quick3d/monkeygod/info.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "MonkeyGod", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qt3d.monkeygod", - "Summary": "MonkeyGod QML Demo" - } -} diff --git a/examples/quick3d/monkeygod/main.cpp b/examples/quick3d/monkeygod/main.cpp index f68429de2..37a1dd682 100644 --- a/examples/quick3d/monkeygod/main.cpp +++ b/examples/quick3d/monkeygod/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/quick3d/monkeygod/monkeygod.pro b/examples/quick3d/monkeygod/monkeygod.pro index b2f722658..74ff5c121 100644 --- a/examples/quick3d/monkeygod/monkeygod.pro +++ b/examples/quick3d/monkeygod/monkeygod.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = monkeygod -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp @@ -24,7 +23,6 @@ CATEGORY = examples include(../../../pkg.pri) OTHER_FILES += \ - mt.qml \ $$QML_INFRA_FILES \ monkeygod.rc diff --git a/examples/quick3d/monkeygod/mt.qml b/examples/quick3d/monkeygod/mt.qml deleted file mode 100644 index 5a09479d7..000000000 --- a/examples/quick3d/monkeygod/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Monkeygod { - } -} diff --git a/examples/quick3d/monkeygod/qml/Monkeygod.qml b/examples/quick3d/monkeygod/qml/Monkeygod.qml index 53f955a7e..a99ed48ed 100644 --- a/examples/quick3d/monkeygod/qml/Monkeygod.qml +++ b/examples/quick3d/monkeygod/qml/Monkeygod.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 //! [1] Viewport { @@ -79,7 +79,7 @@ Viewport { ] SequentialAnimation { - running: true + running: Qt.application.active loops: Animation.Infinite NumberAnimation {target: swivel1; property: "angle"; to: 20; duration: 1200; easing.type: "OutQuad"} NumberAnimation {target: swivel1; property: "angle"; to: -20; duration: 1200; easing.type: "OutQuad"} @@ -113,7 +113,7 @@ Viewport { ] SequentialAnimation { - running: true + running: Qt.application.active loops: Animation.Infinite NumberAnimation {target: swivel2; property: "angle"; to: -20; duration: 1200; easing.type: "OutQuad"} NumberAnimation {target: swivel2; property: "angle"; to: 20; duration: 1200; easing.type: "OutQuad"} diff --git a/examples/quick3d/monkeygod/qml/Penguin.qml b/examples/quick3d/monkeygod/qml/Penguin.qml index 5d18b20dd..f13cacadc 100644 --- a/examples/quick3d/monkeygod/qml/Penguin.qml +++ b/examples/quick3d/monkeygod/qml/Penguin.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 Item3D { id: penguin @@ -62,14 +62,14 @@ Item3D { mesh: Mesh { source: "meshes/penguin.3ds" } SequentialAnimation { - running: true + running: Qt.application.active loops: Animation.Infinite NumberAnimation {target: penguinTilt; property: "angle"; to: -30; duration: 600; easing.type: "OutQuad"} NumberAnimation {target: penguinTilt; property: "angle"; to: 10; duration: 600; easing.type: "OutQuad"} } SequentialAnimation on y { - running: true + running: Qt.application.active loops: Animation.Infinite NumberAnimation {to: 0.5; duration: 200; easing.type: "OutQuad"} NumberAnimation {to: 0.0; duration: 200; easing.type: "OutQuad"} diff --git a/examples/quick3d/monkeygod/qml/desktop.qml b/examples/quick3d/monkeygod/qml/desktop.qml index 2f33e2dd8..6eb798112 100644 --- a/examples/quick3d/monkeygod/qml/desktop.qml +++ b/examples/quick3d/monkeygod/qml/desktop.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/examples/quick3d/moon/info.json b/examples/quick3d/moon/info.json deleted file mode 100644 index 6fc3c527b..000000000 --- a/examples/quick3d/moon/info.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Moon", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qt3d.moon", - "Summary": "Moon QML Demo" - } -} diff --git a/examples/quick3d/moon/main.cpp b/examples/quick3d/moon/main.cpp index f68429de2..37a1dd682 100644 --- a/examples/quick3d/moon/main.cpp +++ b/examples/quick3d/moon/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/quick3d/moon/moon.pro b/examples/quick3d/moon/moon.pro index fc859d925..041fbc7b6 100644 --- a/examples/quick3d/moon/moon.pro +++ b/examples/quick3d/moon/moon.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = moon -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp @@ -19,7 +18,6 @@ CATEGORY = examples include(../../../pkg.pri) OTHER_FILES += \ - mt.qml \ moon.rc \ $$QML_INFRA_FILES diff --git a/examples/quick3d/moon/qml/Moon.qml b/examples/quick3d/moon/qml/Moon.qml index 0d3565a49..20bfa9325 100644 --- a/examples/quick3d/moon/qml/Moon.qml +++ b/examples/quick3d/moon/qml/Moon.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Viewport { width: parent.width @@ -51,7 +51,7 @@ Viewport { } NumberAnimation { - running: true + running: Qt.application.active target: rot; loops: Animation.Infinite property: "angle"; diff --git a/examples/quick3d/moon/qml/desktop.qml b/examples/quick3d/moon/qml/desktop.qml index 0b0e75aa5..a64733756 100644 --- a/examples/quick3d/moon/qml/desktop.qml +++ b/examples/quick3d/moon/qml/desktop.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/examples/quick3d/photoroom/info.json b/examples/quick3d/photoroom/info.json deleted file mode 100644 index 77ee65bb2..000000000 --- a/examples/quick3d/photoroom/info.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Photo Room", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qt3d.photoroom", - "Summary": "Photo Room QML Demo" - } -} diff --git a/examples/quick3d/photoroom/main.cpp b/examples/quick3d/photoroom/main.cpp index f68429de2..37a1dd682 100644 --- a/examples/quick3d/photoroom/main.cpp +++ b/examples/quick3d/photoroom/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/quick3d/photoroom/mt.qml b/examples/quick3d/photoroom/mt.qml deleted file mode 100644 index 6e3ab4025..000000000 --- a/examples/quick3d/photoroom/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - PhotoRoom { - } -} diff --git a/examples/quick3d/photoroom/photoroom.pro b/examples/quick3d/photoroom/photoroom.pro index dc53da3ef..3982bfb29 100644 --- a/examples/quick3d/photoroom/photoroom.pro +++ b/examples/quick3d/photoroom/photoroom.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = photoroom -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp @@ -28,7 +27,6 @@ CATEGORY = examples include(../../../pkg.pri) OTHER_FILES += \ - mt.qml \ photoroom.rc \ $$QML_INFRA_FILES diff --git a/examples/quick3d/photoroom/qml/PhotoPane.qml b/examples/quick3d/photoroom/qml/PhotoPane.qml index 523625805..135afcc5d 100644 --- a/examples/quick3d/photoroom/qml/PhotoPane.qml +++ b/examples/quick3d/photoroom/qml/PhotoPane.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 Item3D { id: photo diff --git a/examples/quick3d/photoroom/qml/PhotoRoom.qml b/examples/quick3d/photoroom/qml/PhotoRoom.qml index 6e562d7eb..d178d7294 100644 --- a/examples/quick3d/photoroom/qml/PhotoRoom.qml +++ b/examples/quick3d/photoroom/qml/PhotoRoom.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 Viewport { id: viewport diff --git a/examples/quick3d/photoroom/qml/desktop.qml b/examples/quick3d/photoroom/qml/desktop.qml index e551f42cd..25893880d 100644 --- a/examples/quick3d/photoroom/qml/desktop.qml +++ b/examples/quick3d/photoroom/qml/desktop.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/examples/quick3d/animations/mt.qml b/examples/quick3d/positional_lighting/main.cpp index fbd293e1a..37a1dd682 100644 --- a/examples/quick3d/animations/mt.qml +++ b/examples/quick3d/positional_lighting/main.cpp @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** This file is part of the examples of the Qt Toolkit. +** This file is part of the Qt3D module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -38,15 +38,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 +#include <qmlres.h> - Cube { - } +int main(int argc, char *argv[]) +{ + return q_quick3d_main("qml/desktop.qml", "examples", argc, argv); } diff --git a/examples/quick3d/positional_lighting/positional_lighting.pro b/examples/quick3d/positional_lighting/positional_lighting.pro new file mode 100644 index 000000000..6a0ff1853 --- /dev/null +++ b/examples/quick3d/positional_lighting/positional_lighting.pro @@ -0,0 +1,32 @@ +TEMPLATE = app +TARGET = positional_lighting +QT += qml quick 3d 3dquick + +SOURCES += main.cpp + +ICON_FILE = ../icon.png + +QML_FILES = \ + qml/desktop.qml \ + qml/Maze.qml \ + qml/PositionalLighting.qml + +QML_INFRA_FILES = \ + $$QML_FILES + +QML_MESHES_FILES = \ + qml/meshes/subdivided_cube.3ds \ + qml/meshes/grid.3ds + +CATEGORY = examples +include(../../../pkg.pri) + +OTHER_FILES += \ + mt.qml \ + $$QML_INFRA_FILES \ + $$QML_MESHES_FILES \ + postitional_lighting.rc + +RC_FILE = positional_lighting.rc + +HEADERS += diff --git a/examples/quick3d/positional_lighting/positional_lighting.rc b/examples/quick3d/positional_lighting/positional_lighting.rc new file mode 100644 index 000000000..1b6228c97 --- /dev/null +++ b/examples/quick3d/positional_lighting/positional_lighting.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" diff --git a/examples/quick3d/positional_lighting/qml/Maze.qml b/examples/quick3d/positional_lighting/qml/Maze.qml new file mode 100644 index 000000000..b2ed436a2 --- /dev/null +++ b/examples/quick3d/positional_lighting/qml/Maze.qml @@ -0,0 +1,289 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 +import "." + +Item3D { + id: maze + + property int mazeWidth: 1 + + property variant solution: [{x:0, y:0}, {x:1,y:0}, {x:1, y:1}] + + signal wallFinished; + signal creationFinished; + signal destinationChanged; + + property int xDestination: Math.round(Math.random() * (maze.mazeWidth -1)) * 2 -maze.mazeWidth + 1; + property int zDestination: Math.round(Math.random() * (maze.mazeWidth -1)) * 2 -maze.mazeWidth + 1; + + Timer { + id: creationTimer + // the 400 is the dropping animation duration + interval: maze.wallCreationDuration + maze.innerCreationDuration + 400 + onTriggered: { + maze.creationFinished(); + } + } + + Timer { + id: wallCreatedTimer + // the 400 is the dropping animation duration + interval: maze.wallCreationDuration + 400 + onTriggered: { + maze.wallFinished(); + } + } + + property real wallCreationDuration: 1500 + property real innerCreationDuration: 10000 + + SequentialAnimation on x { + id: shakeAnimation + running: false + property real amplitude: 0.5 + property real period: 50.0 + NumberAnimation { + from: 0 + to: shakeAnimation.amplitude + duration: shakeAnimation.period / 4.0 + } + NumberAnimation { + from: shakeAnimation.amplitude + to: -shakeAnimation.amplitude + duration: shakeAnimation.period / 2.0 + } + NumberAnimation { + to: 0.0 + duration: shakeAnimation.period / 4.0 + } + } + + Effect { + id: wallEffect + material: Material { + // bronze + ambientColor: Qt.rgba(0.125 * 2.0, 0.1275* 2.0, 0.054* 2.0, 1.0) + diffuseColor: Qt.rgba(0.714* 2.0, + 0.4284* 2.0, + 0.18144* 2.0, 1.0) + specularColor: Qt.rgba(0.393548, + 0.271906, + 0.166721, 1.0) + shininess: 25.6 + } + } + // Positional lighting needs a fair number of vertices to look good, + // so we use these two meshes instead of the stock meshes. + Mesh { + id: subdividedCube + source: "meshes/subdivided_cube.3ds"; + options: "ForceFaceted" + } + + Item3D { + id: floorGrid + mesh: Mesh { + source: "meshes/grid.3ds"; + options: "ForceFaceted" + } + effect: Effect { + material: Material { + // bronze + ambientColor: Qt.rgba(0.125 * 2.0, 0.1275* 2.0, 0.054* 2.0, 1.0) + diffuseColor: Qt.rgba(0.714* 2.0, + 0.4284* 2.0, + 0.18144* 2.0, 1.0) + specularColor: Qt.rgba(0.393548, + 0.271906, + 0.166721, 1.0) + shininess: 25.6 + } + } + // Make the grid cover the whole bottom of the maze + scale: maze.mazeWidth + 0.5 + // add a tiny bit to avoid artefacts with the bottoms of boxes going + // trough the floor + y: -0.501 + + } + + Component { + id: wallComponent + Item3D { + id: wallComponentItem + scale: 0.0 + x: 0 + y: 0 + z: 0 + property real startUpPause: 0 + mesh: subdividedCube + effect: wallEffect + SequentialAnimation { + id: dropInAnimation + running: startUpPause != 0 + property int dropDuration: 400 + PauseAnimation { + id: startUp; + duration: wallComponentItem.startUpPause + } + ParallelAnimation { + NumberAnimation { + target: wallComponentItem; + properties: "scale"; duration: 250; + from: 0.0 ; to: 0.5 + } + NumberAnimation { + target: wallComponentItem; property: "y"; + duration: dropInAnimation.dropDuration; + from: 10; to: 0 + } + } + ScriptAction { + script: shakeAnimation.start() + } + } + } + } + + Component.onCompleted: { + if (wallComponent.status == Component.Ready) + generateMaze(); + else + console.log("PANIC"); + } + + function maybeGenerateMaze() { + if (wallComponent.status == Component.Ready) + generateMaze(); + } + + function generateMaze() { + + var i,j; + var westEdge = -mazeWidth; + var northEdge = -mazeWidth; + var newWall; + + var pause = 1; + var numberOfBlocks = 4 * 2 *mazeWidth; + var cumulativePauseFactor = Math.max(1, Math.floor(maze.wallCreationDuration / numberOfBlocks)); + + // Create the outer wall + + // North Wall + for (i = 0; i < 2 * mazeWidth; i++) + { + newWall = wallComponent.createObject(maze); + newWall.x = westEdge + i; + newWall.z = northEdge; + newWall.startUpPause = pause; + pause += cumulativePauseFactor; + } + // East Wall + for (i = 0; i < 2 * mazeWidth + 1; i++) + { + newWall = wallComponent.createObject(maze); + newWall.x = westEdge + 2 * mazeWidth; + newWall.z = northEdge + i; + newWall.startUpPause = pause; + pause += cumulativePauseFactor; + } + // Southwall + for (i = 2 * mazeWidth -1; i >= 1 ; i--) + { + newWall = wallComponent.createObject(maze); + newWall.x = westEdge + i; + newWall.z = northEdge + 2 * mazeWidth; + newWall.startUpPause = pause; + pause += cumulativePauseFactor; + } + // West wall + for (i = 2 * mazeWidth; i >= 1; i--) + { + newWall = wallComponent.createObject(maze); + newWall.x = westEdge; + newWall.z = northEdge + i; + newWall.startUpPause = pause; + pause += cumulativePauseFactor; + } + + // Create the inner pillars + for (i = 1; i < mazeWidth; i++) + { + for (j = 1; j < mazeWidth; j++) + { + newWall = wallComponent.createObject(maze); + newWall.x = westEdge + i * 2 + newWall.z = northEdge + j * 2 + newWall.startUpPause = pause + Math.random() * maze.innerCreationDuration; + } + } + + // Setup notifications + creationTimer.start(); + wallCreatedTimer.start(); + return; + } + + function calculateNewLightDestination() { + var xRange = 2 * (maze.mazeWidth - 1); + var xMax = maze.mazeWidth - 1; + + maze.xDestination = Math.round(Math.random() * (maze.mazeWidth -1)) * 2 -maze.mazeWidth + 1; + maze.zDestination = Math.round(Math.random() * (maze.mazeWidth -1)) * 2 -maze.mazeWidth + 1; + destinationChanged(); + } + + Material { + id: bronze + ambientColor: Qt.rgba(0.2125, 0.1275, 0.054, 1.0) + diffuseColor: Qt.rgba(0.714, + 0.4284, + 0.18144, 1.0) + specularColor: Qt.rgba(0.393548, + 0.271906, + 0.166721, 1.0) + shininess: 25.6 + } +} diff --git a/examples/quick3d/positional_lighting/qml/PositionalLighting.qml b/examples/quick3d/positional_lighting/qml/PositionalLighting.qml new file mode 100644 index 000000000..5b9e8fc50 --- /dev/null +++ b/examples/quick3d/positional_lighting/qml/PositionalLighting.qml @@ -0,0 +1,196 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 + +Viewport { + id: viewport + width: parent.width + height: parent.height + fillColor: "black" + + camera: Camera { eye: Qt.vector3d(21,70,300)} + + property color lightColor: Qt.hsla(hue, saturation, lightness, 1.0) + property real hue: 0 + property real saturation: 1.0 + property real lightness: 1.0 + + // This is the actual light + light: Light { + id: mazeLight + position: lightProxy.localToWorld() + // A dimmer ambient light, so it doesn't light up the "wrong" + // side of the blocks + ambientColor: "#888888" + specularColor: viewport.lightColor + diffuseColor: viewport.lightColor + constantAttenuation: 1 + linearAttenuation: 0 + quadraticAttenuation: 0 + } + + Maze { + // Maze is an Item3D based element encompassing all the blocks and the + // floor, so that there is something to light + scale: 10 + id: maze + y: 0.5 + mazeWidth: 6 + // We use this item3D to position the light relative to the Maze, + // and update the light to follow it's position as it moves around. + Item3D { + id: lightProxy + scale: 0.5 + y: 0 + x: 1 + z: -maze.mazeWidth + 1 + + // Unfortunately, we need to use this signal rather than + // QML bindings because localToWorld() is not a property. + onPositionChanged: mazeLight.position = localToWorld(); + + // We'll add a sphere here to be a visible source for the light + // It's fine to combine this with the lightProxy, + // They are only separated here to try and make the position + // proxy easier to understand. + Sphere { + effect: Effect { + color: viewport.lightColor + useLighting: false + } + } + + SequentialAnimation { + id: lightAnimation + running: true + + NumberAnimation { + id: xAnimation + target: lightProxy; + property: "x"; duration: 1200; easing.type: Easing.InOutQuad + to: maze.xDestination; + } + NumberAnimation { + id: zAnimation + target: lightProxy; + property: "z"; duration: 1200; easing.type: Easing.InOutQuad + to: maze.zDestination; + } + // It seems like we need this indirection to load the new values + onCompleted: maze.calculateNewLightDestination() + } + } + + onWallFinished: dimmerAnimation.running = true + onDestinationChanged: lightAnimation.restart() + } + + // This is the initial dimming animation. + // At 0 quadratic attenuation, the light goes on forever, but as it + // increases, the light tapers off faster. + NumberAnimation { + id: dimmerAnimation + target: mazeLight + property: "quadraticAttenuation" + from: 0 + to: lightPulse.upperBound + duration: 1500 + onCompleted: lightPulse.running = true; + } + + // Animating the lighting attenuation to make the light pulse. + // Note that there is no easing curve (although there could be), the + // exponential nature of the attenuation co-efficient just makes it + // look like it's changing at different rates. + SequentialAnimation { + id: lightPulse + property real period: 2500 + property real upperBound: 0.001 + property real lowerBound: 0.005 + loops: Animation.Infinite + NumberAnimation { + target: mazeLight + property: "quadraticAttenuation" + from: lightPulse.upperBound + to: lightPulse.lowerBound + duration: lightPulse.period / 2.0 + } + NumberAnimation { + target: mazeLight + property: "quadraticAttenuation" + from: lightPulse.lowerBound + to: lightPulse.upperBound + duration: lightPulse.period / 2.0 + } + } + + // Animating the light color for no good reason. + SequentialAnimation { + id: hsvColorAnimation + running: false + NumberAnimation { + target: viewport + property: "lightness" + from:1.0; to:0.5; + duration: 1000; + } + NumberAnimation { + target: viewport + property: "hue" + from:0; to: 1.0; + duration: 6000; + } + NumberAnimation { + target: viewport + property: "lightness" + from:0.5; to:1.0; + duration: 1000; + } + } + + // Trigger the disco mode on keyboard input + focus: true + Keys.onPressed: { + hsvColorAnimation.running = !hsvColorAnimation.running; + } +} diff --git a/examples/quick3d/moon/mt.qml b/examples/quick3d/positional_lighting/qml/desktop.qml index b0302ac74..17aa547aa 100644 --- a/examples/quick3d/moon/mt.qml +++ b/examples/quick3d/positional_lighting/qml/desktop.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,14 +39,14 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" +import Qt3D 2.0 +import Qt3D.Shapes 2.0 +import "." Item { - width: 320 - height: 480 + width: 1000 + height: 800 - Moon { + PositionalLighting { } } diff --git a/examples/quick3d/positional_lighting/qml/meshes/grid.3ds b/examples/quick3d/positional_lighting/qml/meshes/grid.3ds Binary files differnew file mode 100644 index 000000000..00ce7fed3 --- /dev/null +++ b/examples/quick3d/positional_lighting/qml/meshes/grid.3ds diff --git a/examples/quick3d/positional_lighting/qml/meshes/subdivided_cube.3ds b/examples/quick3d/positional_lighting/qml/meshes/subdivided_cube.3ds Binary files differnew file mode 100644 index 000000000..d1657be0d --- /dev/null +++ b/examples/quick3d/positional_lighting/qml/meshes/subdivided_cube.3ds diff --git a/examples/quick3d/positional_lighting/qtquick3d.ico b/examples/quick3d/positional_lighting/qtquick3d.ico Binary files differnew file mode 100644 index 000000000..b3b85e37b --- /dev/null +++ b/examples/quick3d/positional_lighting/qtquick3d.ico diff --git a/examples/quick3d/qtquick3d.svg b/examples/quick3d/qtquick3d.svg index f5981b2d3..428a15a56 100644 --- a/examples/quick3d/qtquick3d.svg +++ b/examples/quick3d/qtquick3d.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Converted with SVG Converter - Version 0.9.5 (Compiled Mon May 30 09:08:51 2011) - Copyright (C) 2011 Nokia --> +<!-- Converted with SVG Converter - Version 0.9.5 (Compiled Mon May 30 09:08:51 2011) - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" diff --git a/examples/quick3d/quick3d.pro b/examples/quick3d/quick3d.pro index c06e7b1bb..de6b09596 100644 --- a/examples/quick3d/quick3d.pro +++ b/examples/quick3d/quick3d.pro @@ -5,6 +5,7 @@ SUBDIRS += \ forest \ lander \ matrix_animation \ + positional_lighting \ monkeygod \ moon \ photoroom \ diff --git a/examples/quick3d/shaders/info.json b/examples/quick3d/shaders/info.json deleted file mode 100644 index 98ecd2971..000000000 --- a/examples/quick3d/shaders/info.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Shaders", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qt3d.shaders", - "Summary": "Shaders QML Demo" - } -} diff --git a/examples/quick3d/shaders/main.cpp b/examples/quick3d/shaders/main.cpp index f68429de2..37a1dd682 100644 --- a/examples/quick3d/shaders/main.cpp +++ b/examples/quick3d/shaders/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/quick3d/shaders/mt.qml b/examples/quick3d/shaders/mt.qml deleted file mode 100644 index dd1cdab89..000000000 --- a/examples/quick3d/shaders/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Shaders { - } -} diff --git a/examples/quick3d/shaders/qml/Bouncing.qml b/examples/quick3d/shaders/qml/Bouncing.qml index 7e4f0fdc6..9825a820a 100644 --- a/examples/quick3d/shaders/qml/Bouncing.qml +++ b/examples/quick3d/shaders/qml/Bouncing.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,14 +39,13 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 Viewport { width: 640; height: 480 property string name: "Animation Shader" property string icon: "teapot-logo.png" - property bool run: true //! [1] Item3D { @@ -55,7 +54,7 @@ Viewport { transform: Rotation3D { NumberAnimation on angle{ - running: run + running: Qt.application.active loops: Animation.Infinite from: 0 to: 360 @@ -70,7 +69,7 @@ Viewport { id: program property real qt_Custom : 1.0 SequentialAnimation on qt_Custom { - running: run + running: Qt.application.active loops: Animation.Infinite PauseAnimation { duration: 700 } NumberAnimation { from: 1.0; to: 0.001; duration: 1500; easing.type:"OutBounce" } @@ -81,7 +80,7 @@ Viewport { texture: "qtlogo.png" SequentialAnimation on color { - running: run + running: Qt.application.active loops: Animation.Infinite ColorAnimation { from: "#00008a" diff --git a/examples/quick3d/shaders/qml/Collapsing.qml b/examples/quick3d/shaders/qml/Collapsing.qml index 714f8fead..7e47db3bc 100644 --- a/examples/quick3d/shaders/qml/Collapsing.qml +++ b/examples/quick3d/shaders/qml/Collapsing.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 Viewport { property string name: "Collapsing Shader" @@ -53,7 +53,7 @@ Viewport { transform: Rotation3D { NumberAnimation on angle{ - running: true + running: Qt.application.active loops: Animation.Infinite from: 0 to: 360 @@ -67,7 +67,7 @@ Viewport { property real collapseFactor : 0.0 SequentialAnimation on collapseFactor { - running: true + running: Qt.application.active loops: Animation.Infinite PauseAnimation { duration: 700 } NumberAnimation { from: 0.0; to: 1.0; duration: 1500; easing.type:"OutBounce" } @@ -77,7 +77,7 @@ Viewport { texture: "qtlogo.png" SequentialAnimation on color{ - running: true + running: Qt.application.active loops: Animation.Infinite ColorAnimation { from: "#00008a" diff --git a/examples/quick3d/shaders/qml/Images.qml b/examples/quick3d/shaders/qml/Images.qml index 7a008455f..d06e0a502 100644 --- a/examples/quick3d/shaders/qml/Images.qml +++ b/examples/quick3d/shaders/qml/Images.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 Rectangle { property string name: "Images Shader" @@ -101,7 +101,7 @@ Rectangle { property string image : imageUrl SequentialAnimation on textureOffsetX { - running: true + running: Qt.application.active loops: Animation.Infinite PauseAnimation { duration: 2500 } NumberAnimation { from: 0.0; to: 1.0; duration: 1500; easing.type:"OutBounce" } diff --git a/examples/quick3d/shaders/qml/Interpolate.qml b/examples/quick3d/shaders/qml/Interpolate.qml index 3e0dac117..f321eca00 100644 --- a/examples/quick3d/shaders/qml/Interpolate.qml +++ b/examples/quick3d/shaders/qml/Interpolate.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 Viewport { property string name: "Interpolate Shader" @@ -53,7 +53,7 @@ Viewport { transform: Rotation3D { NumberAnimation on angle{ - running: true + running: Qt.application.active loops: Animation.Infinite from: 0 to: 360 @@ -69,7 +69,7 @@ Viewport { property real interpolationFactor : 0.0 SequentialAnimation on interpolationFactor { - running: true + running: Qt.application.active loops: Animation.Infinite NumberAnimation { to : 1.0; duration: 750; } PauseAnimation { duration: 550 } @@ -78,7 +78,7 @@ Viewport { } SequentialAnimation on color{ - running: true + running: Qt.application.active loops: Animation.Infinite ColorAnimation { from: "#aaca00" diff --git a/examples/quick3d/shaders/qml/Shaders.qml b/examples/quick3d/shaders/qml/Shaders.qml index 37b87ec09..752259f3e 100644 --- a/examples/quick3d/shaders/qml/Shaders.qml +++ b/examples/quick3d/shaders/qml/Shaders.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/quick3d/shaders/qml/desktop.qml b/examples/quick3d/shaders/qml/desktop.qml index 16b3d6824..7b9d394f8 100644 --- a/examples/quick3d/shaders/qml/desktop.qml +++ b/examples/quick3d/shaders/qml/desktop.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/examples/quick3d/shaders/shaders.pro b/examples/quick3d/shaders/shaders.pro index 6b2ad5acf..207ebc3e8 100644 --- a/examples/quick3d/shaders/shaders.pro +++ b/examples/quick3d/shaders/shaders.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = shaders -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp @@ -28,7 +27,6 @@ CATEGORY = examples include(../../../pkg.pri) OTHER_FILES += \ - mt.qml \ shaders.rc \ $$QML_INFRA_FILES diff --git a/examples/quick3d/solarsystem_qml/mt.qml b/examples/quick3d/solarsystem_qml/mt.qml deleted file mode 100644 index 233af303a..000000000 --- a/examples/quick3d/solarsystem_qml/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - SolarSystem { - } -} diff --git a/examples/quick3d/solarsystem_qml/qml/SolarSystem.qml b/examples/quick3d/solarsystem_qml/qml/SolarSystem.qml index db7eccbe4..f6e3ba1ad 100644 --- a/examples/quick3d/solarsystem_qml/qml/SolarSystem.qml +++ b/examples/quick3d/solarsystem_qml/qml/SolarSystem.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ //! [1] import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Viewport { width: 800; height: 600 diff --git a/examples/quick3d/solarsystem_qml/qml/desktop.qml b/examples/quick3d/solarsystem_qml/qml/desktop.qml index 7ee166666..141b918b8 100644 --- a/examples/quick3d/solarsystem_qml/qml/desktop.qml +++ b/examples/quick3d/solarsystem_qml/qml/desktop.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/examples/quick3d/solarsystem_qml/solarsystem_qml.pro b/examples/quick3d/solarsystem_qml/solarsystem_qml.pro index 0baedc0ca..6b6ef2a3e 100644 --- a/examples/quick3d/solarsystem_qml/solarsystem_qml.pro +++ b/examples/quick3d/solarsystem_qml/solarsystem_qml.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = solarsystem_qml -CONFIG += qt warn_on INSTALL_DIRS = qml CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg diff --git a/examples/quick3d/sphere/info.json b/examples/quick3d/sphere/info.json deleted file mode 100644 index c1e758557..000000000 --- a/examples/quick3d/sphere/info.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Sphere", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qt3d.sphere", - "Summary": "Sphere QML Demo" - } -} diff --git a/examples/quick3d/sphere/main.cpp b/examples/quick3d/sphere/main.cpp index f68429de2..37a1dd682 100644 --- a/examples/quick3d/sphere/main.cpp +++ b/examples/quick3d/sphere/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/examples/quick3d/sphere/mt.qml b/examples/quick3d/sphere/mt.qml deleted file mode 100644 index d2f830ac9..000000000 --- a/examples/quick3d/sphere/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Sphere { - } -} diff --git a/examples/quick3d/sphere/qml/Sphere.qml b/examples/quick3d/sphere/qml/Sphere.qml index e735083ca..47dc5760c 100644 --- a/examples/quick3d/sphere/qml/Sphere.qml +++ b/examples/quick3d/sphere/qml/Sphere.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Viewport { width: parent.width; height: parent.height diff --git a/examples/quick3d/sphere/qml/desktop.qml b/examples/quick3d/sphere/qml/desktop.qml index 7ee166666..141b918b8 100644 --- a/examples/quick3d/sphere/qml/desktop.qml +++ b/examples/quick3d/sphere/qml/desktop.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt3D examples of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/examples/quick3d/sphere/sphere.pro b/examples/quick3d/sphere/sphere.pro index 0c38da94a..6c84d9e38 100644 --- a/examples/quick3d/sphere/sphere.pro +++ b/examples/quick3d/sphere/sphere.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = sphere -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp @@ -18,7 +17,6 @@ CATEGORY = examples include(../../../pkg.pri) OTHER_FILES += \ - mt.qml \ sphere.rc \ $$QML_INFRA_FILES |
