diff options
| author | Stefan Suhren <suhren.stefan@fh-swf.de> | 2016-01-12 10:58:21 +0100 |
|---|---|---|
| committer | Stefan Suhren <suhren.stefan@fh-swf.de> | 2016-01-12 10:58:21 +0100 |
| commit | 3c65cf89b31e4d75a4c19573facd65d620b0c191 (patch) | |
| tree | 3e7ccb1cd4793c20fc95ef49316c31361a9599b1 /src | |
| parent | 9028123524db8801b26fc0b51288e4ff0c999766 (diff) | |
| download | Multimedia-3c65cf89b31e4d75a4c19573facd65d620b0c191.tar.gz Multimedia-3c65cf89b31e4d75a4c19573facd65d620b0c191.zip | |
Make QVector2D a QVector3D
Diffstat (limited to 'src')
| -rw-r--r-- | src/gldisc.cpp | 12 | ||||
| -rw-r--r-- | src/gldisc.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gldisc.cpp b/src/gldisc.cpp index 9315e4c..05222a0 100644 --- a/src/gldisc.cpp +++ b/src/gldisc.cpp @@ -25,15 +25,15 @@ void GLDisc::makeSurface(QVector<GLPoint> *pointContainer, for (int side = 0; side < m_sides; side++) { - QVector2D tmp = calculatePoint(side * 2 * M_PI / m_sides); + QVector3D tmp = calculatePoint(side * 2 * M_PI / m_sides); - QVector2D tmpTextCoo = (0.5 * tmp) + QVector2D(0.5, 0.5); + QVector3D tmpTextCoo = (0.5 * tmp) + QVector3D(0.5, 0.5, 0.0); m_points->append(GLPoint(m_circleRadius * tmp, -v_Z, tmpTextCoo, m_color)); m_points->append(GLPoint(m_circleRadius * tmp, tmp, tmpTextCoo, m_color)); - m_points->append(GLPoint(QVector3D(m_circleRadius * tmp, m_height), tmp, + m_points->append(GLPoint(QVector3D(m_circleRadius * tmp .x(), m_circleRadius * tmp .y(), m_height), tmp, tmpTextCoo, m_color)); - m_points->append(GLPoint(QVector3D(m_circleRadius * tmp, m_height), v_Z, + m_points->append(GLPoint(QVector3D(m_circleRadius * tmp .x(), m_circleRadius * tmp .y(), m_height), v_Z, tmpTextCoo, m_color)); } @@ -151,12 +151,12 @@ bool GLDisc::isHit(QVector3D p1, QVector3D p2) return false; } -QVector2D GLDisc::calculatePoint(double sideAngle) +QVector3D GLDisc::calculatePoint(double sideAngle) { double x = sin(sideAngle); double y = cos(sideAngle); - return QVector2D(x, y); + return QVector3D(x, y, 0.0); } diff --git a/src/gldisc.h b/src/gldisc.h index 48ba62b..b997487 100644 --- a/src/gldisc.h +++ b/src/gldisc.h @@ -14,8 +14,8 @@ public: virtual void draw(GLESRenderer *renderer); virtual bool isHit(QVector3D p1, QVector3D p2); -private: - QVector2D calculatePoint(double sideAngle); +protected: + QVector3D calculatePoint(double sideAngle); double m_height; double m_circleRadius; |