diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-11-23 15:14:07 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-02 14:18:20 +0100 |
commit | 6c8378eaf1edbbefe6aaa3672b0127816a004fd7 (patch) | |
tree | 8ee08fb447e052f7a7a685fbeaaa04f04ea60126 /src/declarative/particles/qquickfriction.cpp | |
parent | e01219b77b1e889e70437635905d7ff820568e23 (diff) |
Say hello to QtQuick module
This change moves the QtQuick 2 types and C++ API (including
SceneGraph) to a new module (AKA library), QtQuick.
99% of this change is moving files from src/declarative to
src/quick, and from tests/auto/declarative to
tests/auto/qtquick2.
The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to
a plugin, src/imports/qtquick2, just like it's done for QtQuick 1.
All tools, examples, and tests that use QtQuick C++ API have gotten
"QT += quick" or "QT += quick-private" added to their .pro file.
A few additional internal QtDeclarative classes had to be exported
(via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the
QtQuick 2 implementation.
The old header locations (e.g. QtDeclarative/qquickitem.h) will
still be supported for some time, but will produce compile-time
warnings. (To avoid the QtQuick implementation using the
compatibility headers (since QtDeclarative's includepath comes
first), a few include statements were modified, e.g. from
"#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".)
There's a change in qtbase that automatically adds QtQuick to the
module list if QtDeclarative is used. Together with the compatibility
headers, this should help reduce the migration pain for existing
projects.
In theory, simply getting an existing QtDeclarative-based project
to compile and link shouldn't require any changes for now -- but
porting to the new scheme is of course recommended, and will
eventually become mandatory.
Task-number: QTBUG-22889
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Diffstat (limited to 'src/declarative/particles/qquickfriction.cpp')
-rw-r--r-- | src/declarative/particles/qquickfriction.cpp | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/src/declarative/particles/qquickfriction.cpp b/src/declarative/particles/qquickfriction.cpp deleted file mode 100644 index c060deb95f..0000000000 --- a/src/declarative/particles/qquickfriction.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Declarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickfriction_p.h" -QT_BEGIN_NAMESPACE -/*! - \qmlclass Friction QQuickFrictionAffector - \inqmlmodule QtQuick.Particles 2 - \inherits Affector - \brief The Friction affector slows down movement proportional to the particle's current speed. - -*/ - -/*! - \qmlproperty real QtQuick.Particles2::Friction::factor - - A drag will be applied to moving objects which is this factor of their current velocity. -*/ -/*! - \qmlproperty real QtQuick.Particles2::Friction::threshold - - The drag will only be applied to objects with a velocity above the threshold velocity. The - drag applied will bring objects down to the threshold velocity, but no further. - - The default threshold is 0 -*/ -static qreal sign(qreal a) -{ - return a >= 0 ? 1 : -1; -} - -static const qreal epsilon = 0.00001; - -QQuickFrictionAffector::QQuickFrictionAffector(QQuickItem *parent) : - QQuickParticleAffector(parent), m_factor(0.0), m_threshold(0.0) -{ -} - -bool QQuickFrictionAffector::affectParticle(QQuickParticleData *d, qreal dt) -{ - if (!m_factor) - return false; - qreal curVX = d->curVX(); - qreal curVY = d->curVY(); - if (!curVX && !curVY) - return false; - qreal newVX = curVX + (curVX * m_factor * -1 * dt); - qreal newVY = curVY + (curVY * m_factor * -1 * dt); - - if (!m_threshold) { - if (sign(curVX) != sign(newVX)) - newVX = 0; - if (sign(curVY) != sign(newVY)) - newVY = 0; - } else { - qreal curMag = sqrt(curVX*curVX + curVY*curVY); - if (curMag <= m_threshold + epsilon) - return false; - qreal newMag = sqrt(newVX*newVX + newVY*newVY); - if (newMag <= m_threshold + epsilon || //went past the threshold, stop there instead - sign(curVX) != sign(newVX) || //went so far past maybe it came out the other side! - sign(curVY) != sign(newVY)) { - qreal theta = atan2(curVY, curVX); - newVX = m_threshold * cos(theta); - newVY = m_threshold * sin(theta); - } - } - - d->setInstantaneousVX(newVX); - d->setInstantaneousVY(newVY); - return true; -} -QT_END_NAMESPACE |