diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-20 13:18:59 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-22 10:08:51 +0000 |
commit | 31f9c57bc50ae053cfaf039a1dfdb128e2494458 (patch) | |
tree | 316138cb73c49877f5a80a8496c2f1b737122fb5 /tests/galaxy/star.cpp | |
parent | 4162ddeb02ee41fd4217d7f3d93d45cab3313ba8 (diff) |
Fix issues with COIN builds
-Fix miscellaneous compile errors
-Move manual tests to manual folder and enable export of autotests
-Added widgets requirement
-Fixed autotests
-Fixed renderer and controller synchronization in QML case
-Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL
Change-Id: If6619733725d079e339bef16262e5ea1450ab20f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Diffstat (limited to 'tests/galaxy/star.cpp')
-rw-r--r-- | tests/galaxy/star.cpp | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/tests/galaxy/star.cpp b/tests/galaxy/star.cpp deleted file mode 100644 index 3a7db28a..00000000 --- a/tests/galaxy/star.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Data Visualization module. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ - -#include "star.h" - -#include <QtCore/qmath.h> - -static const double DEG_TO_RAD = M_PI / 180.0; - -Star::Star() - : m_theta(0), - m_a(0), - m_b(0), - m_center(QVector2D(0.0f, 0.0f)) -{ -} - -const void Star::calcXY() -{ - qreal &a = m_a; - qreal &b = m_b; - qreal &theta = m_theta; - const QVector2D &p = m_center; - - qreal beta = -m_angle; - qreal alpha = theta * DEG_TO_RAD; - - // temporaries to save cpu time - qreal cosalpha = qCos(alpha); - qreal sinalpha = qSin(alpha); - qreal cosbeta = qCos(beta); - qreal sinbeta = qSin(beta); - - m_pos = QVector2D(p.x() + (a * cosalpha * cosbeta - b * sinalpha * sinbeta), - p.y() + (a * cosalpha * sinbeta + b * sinalpha * cosbeta)); -} |