diff options
Diffstat (limited to 'src/gldisc.cpp')
| -rw-r--r-- | src/gldisc.cpp | 12 |
1 files changed, 6 insertions, 6 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); } |