Use the new GLSphere

2 files changed, 27 insertions, 3 deletions

diff --git a/src/mmscene.cpp b/src/mmscene.cpp
index d9cda29..f199563 100644
--- a/src/mmscene.cpp
+++ b/src/mmscene.cpp
@@ -7,6 +7,7 @@ MMScene::MMScene(QQuickItem *parent)
 {
     // Initialize with NULL
     m_cube = NULL;
+    m_sphere = NULL;
 
     // Stop rotation
     toggleMove();
@@ -24,6 +25,12 @@ MMScene::~MMScene()
         delete m_cube;
         m_cube = NULL;
     }
+
+    if (m_sphere != NULL)
+    {
+        delete m_sphere;
+        m_sphere = NULL;
+    }
 }
 
 void MMScene::paintUnderQmlScene()
@@ -37,16 +44,18 @@ void MMScene::paintUnderQmlScene()
 void MMScene::paintOnTopOfQmlScene()
 {
     m_renderer->pushMvMatrix();
-    drawAxes(10.0);
+    drawAxes(5.0);
     //drawTriangles();
     //drawF(5.0);
-    m_cube->draw(m_renderer);
+    //m_cube->draw(m_renderer);
+    m_sphere->draw(m_renderer);
     m_renderer->popMvMatrix();
 }
 
 void MMScene::setupGeometry()
 {
-    createCube(QVector3D(0.0, 0.0, 0.0), QVector3D(1.0, 1.0, 1.0));
+    //createCube(QVector3D(0.0, 0.0, 0.0), QVector3D(1.0, 1.0, 1.0));
+    createSphere();
     //createF(5.0);
     //m_colorArrayEnabled = true;
 
@@ -83,6 +92,14 @@ void MMScene::createCube(const QVector3D &lbb, const QVector3D &rtf)
     m_cube->makeSurface(&m_points, &m_indices);
 }
 
+void MMScene::createSphere()
+{
+    m_sphere = new GLSphere();
+
+    m_sphere->setDrawingMode(GL_POINTS);
+    m_sphere->makeSurface(&m_points, &m_indices);
+}
+
 void MMScene::createF(double height)
 {
     float stdLength = height / 5.0;
diff --git a/src/mmscene.h b/src/mmscene.h
index a70321e..3940104 100644
--- a/src/mmscene.h
+++ b/src/mmscene.h
@@ -3,6 +3,7 @@
 
 #include "glcube.h"
 #include "glitem.h"
+#include "glsphere.h"
 
 class MMScene : public GLItem
 {
@@ -46,6 +47,11 @@ protected:
     virtual void createCube(const QVector3D &lbb, const QVector3D &rtf);
 
     /**
+     * @brief createSphere Creates a sphere and apends it for drawing,
+     */
+    void createSphere();
+
+    /**
      * @brief createF Creates an 'F' with cubes.
      * @param height The height of the 'F'.
      */
@@ -60,6 +66,7 @@ protected:
 private:
     GLCube *m_cube;
 
+    GLSphere *m_sphere;
 };
 
 #endif // MMSCENE_H