Added basic cube and removed unnecessary shapes.

to add more cubes, create a GlNode and add a Cube child to it. Then add
that GlNode to  the SceneGroup.

src/glnodes/shapes.cpp

@@ -2,43 +2,16 @@
 #include <QColor>
 #include <QVector4D>
 
-void Square::accept(Visitor &v) {
+void Cube::accept(Visitor &v) {
-	v.visit(*this);
-}
-
-void Circle::accept(Visitor &v) {
-	v.visit(*this);
-}
-
-void Triangle::accept(Visitor &v) {
 	v.visit(*this);
 }
 
 // ***
 
-void Square::setColor(QColor& c) {
+void Cube::setColor(QColor& c) {
 	color = QColor(c);
 }
 
-void Circle::setColor(QColor& c) {
+QColor Cube::getColor(){
-	color = QColor(c);
-}
-
-void Triangle::setColor(QColor& c) {
-	color = QColor(c);
-}
-
-
-QColor Triangle::getColor(){
-	return color;
-};
-
-
-QColor Circle::getColor(){
-	return color;
-};
-
-
-QColor Square::getColor(){
 	return color;
 };

src/glnodes/shapes.h

@@ -11,28 +11,10 @@ public:
 	virtual QColor getColor() = 0;
 };
 
-class Circle : public Shape
+class Cube : public Shape
 {
 public:
-    Circle(){}
+    Cube(){}
-	QColor color;
-    void accept(Visitor& v) override;
-	void setColor(QColor& c);
-	QColor getColor();
-};
-class Triangle : public Shape
-{
-public:
-    Triangle(){}
-	QColor color;
-    void accept(Visitor& v) override;
-	void setColor(QColor& c);
-	QColor getColor();
-};
-class Square : public Shape
-{
-public:
-    Square(){}
 	QColor color;
     void accept(Visitor& v) override;
 	void setColor(QColor& c);

src/interfaces/visitor.h

@@ -1,15 +1,11 @@
 #ifndef VISITOR_H
 #define VISITOR_H
 class SceneGroup;
-class Square;
+class Cube;
-class Circle;
-class Triangle;
 
 class Visitor {
 public:
     virtual void visit(SceneGroup &n) = 0;
-    virtual void visit(Square &s) = 0;
+    virtual void visit(Cube &s) = 0;
-    virtual void visit(Circle &s) = 0;
-    virtual void visit(Triangle &s) = 0;
 };
 #endif // VISITOR_H

src/main.cpp

@@ -20,9 +20,6 @@ int main(int argc, char *argv[])
 	// Instantiate and layout the viewer.
 	Viewer *v = new Viewer();
     w.addViewer(v);
-
-	//w.setFixedSize(dw.width() * 0.7, dw.height() * 0.7);
-
 	w.show();
 
 	return a.exec();

src/viewer/simpleViewer.cpp

@@ -41,9 +41,7 @@ using namespace std;
 
 namespace
 {
-const int numVerticesSquare = 5;
+const int numVerticesCube = 12*3;
-const int numVerticesTriangle = 3;
-const int numVerticesCircle = 26;
 const double frame_limit = 5;
 const double inc_mult = 5;
 const double inc_offset = 1.05;
@@ -78,7 +76,6 @@ void Viewer::cleanup()
 
 void Viewer::draw()
 {
-	// Bind our vertex/fragment shaders
     m_program->bind();
 
 	// Get projection and camera transformations
@@ -90,17 +87,24 @@ void Viewer::draw()
 	// Prepare a transformation stack
 
     //  stack<QMatrix4x4> modelStack;
-
-	modelViewMatrix.translate(-4.5, -4.5);
 	modelViewMatrix.scale(0.95);
+    modelViewMatrix.rotate(45, 0, 1, 0);
 
+    rot = QQuaternion::fromAxisAndAngle(1, 0, 1, 90/60 * frame);
+    // uncomment this and the cube translation in init()
+    // to see the cube spin
+    modelViewMatrix.rotate(rot);
+    projectionMatrix.translate(0, -5, 0);
+    projectionMatrix.rotate(15, 1, 0, 0);
     m_program->setUniformValue(m_projMatrixLocation, projectionMatrix);
     m_program->setUniformValue(m_mvMatrixLocation, modelViewMatrix);
 
     // Traverse the Scene in order to draw its components
 
     modelStack.push(modelViewMatrix);
-    //root.accept(*this);
+    root.accept(*this);
+    frame++;
+    update();
 }
 
 void Viewer::mouseMoveEvent(QMouseEvent* e) {
@@ -113,7 +117,7 @@ void Viewer::mousePressEvent(QMouseEvent* e) {
     // Auto Return, but old code left in as reference
     return;
 
-	cout << "Viewer::mouseMoveEvent(QMouseEvent* e) : " << e->button() << endl;
+    /*cout << "Viewer::mouseMoveEvent(QMouseEvent* e) : " << e->button() << endl;
 
 	if(e->button() == 1){ // LMB
 
@@ -179,7 +183,7 @@ void Viewer::mousePressEvent(QMouseEvent* e) {
 				emit shapeSelected(0);
 			}
 		}
-	}
+    }//*/
 }
 
 void Viewer::deselect(){
@@ -206,11 +210,11 @@ void Viewer::init()
 {
     // We want to restrict ourselves to a 2D viewer.
     //camera()->setType(qglviewer::Camera::ORTHOGRAPHIC);
-	/*setMouseBinding(Qt::NoModifier, Qt::LeftButton, CAMERA, SCREEN_ROTATE);
+    setMouseBinding(Qt::NoModifier, Qt::LeftButton, CAMERA, SCREEN_ROTATE);
-	setMouseBinding(Qt::AltModifier, Qt::LeftButton, CAMERA, NO_MOUSE_ACTION);*/
+    //setMouseBinding(Qt::AltModifier, Qt::LeftButton, CAMERA, NO_MOUSE_ACTION);//*/
-//	setMouseBinding(Qt::NoModifier, Qt::MouseButton(Qt::LeftButton + Qt::MidButton), CAMERA, NO_MOUSE_ACTION);
+    //setMouseBinding(Qt::NoModifier, Qt::MouseButton(Qt::LeftButton + Qt::MidButton), CAMERA, NO_MOUSE_ACTION);
-//	setMouseBinding(Qt::ControlModifier, Qt::MouseButton(Qt::LeftButton + Qt::MidButton), CAMERA, NO_MOUSE_ACTION);
+    //setMouseBinding(Qt::ControlModifier, Qt::MouseButton(Qt::LeftButton + Qt::MidButton), CAMERA, NO_MOUSE_ACTION);
-//	setMouseBinding(Qt::ShiftModifier, Qt::MouseButton(Qt::LeftButton + Qt::MidButton), CAMERA, NO_MOUSE_ACTION);
+    //setMouseBinding(Qt::ShiftModifier, Qt::MouseButton(Qt::LeftButton + Qt::MidButton), CAMERA, NO_MOUSE_ACTION);
 
 	// Our scene will be from -5 to 5 in X and Y (the grid will be 10x10).
 	setSceneRadius(5);
@@ -223,7 +227,15 @@ void Viewer::init()
 	// Init shaders & geometry
 	initShaders();
     initGeometries();
-    //initGrid();
+
+    Shape* cube = new Cube();
+    cube->setColor(*activeColor);
+    // uncomment this and the quaternion transformation in draw()
+    // to see the cube rotate.
+    // cube->transform.translate(3, 0, 0);
+    SceneGroup *c = new SceneGroup();
+    c->addChild(cube);
+    root.addChild(c);
 }
 
 void Viewer::initShaders()
@@ -261,8 +273,9 @@ void Viewer::initShaders()
 // Creates the basic shapes in memory. We only have 3, so we just prep them all in advance.
 void Viewer::initGeometries()
 {
-
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glEnable( GL_BLEND ); glClearColor(0.0,0.0,0.0,0.0);
+    glEnable( GL_BLEND );
+    glClearColor(0.0,0.0,0.0,0.0);
 
 	// Create our VertexArrays Objects and VertexBuffer Objects
 	glGenVertexArrays(NumVAOs, m_VAOs);
@@ -270,92 +283,47 @@ void Viewer::initGeometries()
 
 	// Create our pentagone object, store its vertices on the graphic card, and
 	// bind the data to the vPosition attribute of the shader
-	GLfloat verticesSquare[numVerticesSquare][3] = {
+    GLfloat verticesCube[numVerticesCube][3] = { // 12 triangles == 6 squares
-		{ -0.5,  0.5, 0 },
+        //Front, if Z is towards us
-		{ -0.5, -0.5, 0 },
+        { -0.5,  0.5, 0.5 }, { -0.5, -0.5, 0.5 }, {  0.5, -0.5, 0.5 },
-		{  0.5, -0.5, 0 },
+        {  0.5, -0.5, 0.5 }, {  0.5,  0.5, 0.5 }, { -0.5,  0.5, 0.5 },
-		{  0.5,  0.5, 0 },
+        //Back
-		{ -0.5,  0.5, 0 }
+        { -0.5,  0.5, -0.5 }, {  0.5,  0.5, -0.5 }, {  0.5, -0.5, -0.5 },
+        {  0.5, -0.5, -0.5 }, { -0.5, -0.5, -0.5 }, { -0.5,  0.5, -0.5 },
+        //Right
+        { -0.5,  0.5,  0.5 }, { -0.5,  0.5, -0.5 }, { -0.5, -0.5, -0.5 },
+        { -0.5, -0.5, -0.5 }, { -0.5, -0.5,  0.5 }, { -0.5,  0.5,  0.5 },
+        //Left
+        { 0.5,  0.5,  0.5 }, { 0.5, -0.5, -0.5 }, { 0.5,  0.5, -0.5 },
+        { 0.5, -0.5, -0.5 }, { 0.5,  0.5,  0.5 }, { 0.5, -0.5,  0.5 },
+        //Top
+        { -0.5, 0.5,  0.5 }, {  0.5, 0.5,  0.5 }, {  0.5, 0.5, -0.5 },
+        {  0.5, 0.5, -0.5 }, { -0.5, 0.5, -0.5 }, { -0.5, 0.5,  0.5 },
+        //Bottom
+        { -0.5, -0.5,  0.5 }, {  0.5, -0.5,  0.5 }, {  0.5, -0.5, -0.5 },
+        {  0.5, -0.5, -0.5 }, { -0.5, -0.5, -0.5 }, { -0.5, -0.5,  0.5 }
 	};
 
-	glBindVertexArray(m_VAOs[VAO_Square]);
+    glBindVertexArray(m_VAOs[VAO_Cube]);
-	glBindBuffer(GL_ARRAY_BUFFER, m_Buffers[VBO_Square]);
+    glBindBuffer(GL_ARRAY_BUFFER, m_Buffers[VBO_Cube]);
-	glBufferData(GL_ARRAY_BUFFER, sizeof(verticesSquare), verticesSquare, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(verticesCube), verticesCube, GL_STATIC_DRAW);
 
 	glVertexAttribPointer(m_vPositionLocation, 3, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(0));
 	glEnableVertexAttribArray(m_vPositionLocation);
+}
 
-	// Create our triangle object, store its vertices on the graphic card, and
+void Viewer::visit(Cube &s)
-	// bind the data to the vPosition attribute of the shader
+{
-	GLfloat verticesTriangle[numVerticesTriangle][3] = {
+	QMatrix4x4 modelViewMatrix = modelStack.top() * QMatrix4x4(s.transform);
-		{ -0.5, -0.5, 0.0 },
-		{  0.5, -0.5, 0.0 },
-		{  0.0,  0.5, 0.0 }
-	};
 
-	glBindVertexArray(m_VAOs[VAO_Triangle]);
+    int faces = floor(numVerticesCube/6);
-	glBindBuffer(GL_ARRAY_BUFFER, m_Buffers[VBO_Triangle]);
+    for(int i = 0; i < faces; i++){ // 6 vertexes par face
-	glBufferData(GL_ARRAY_BUFFER, sizeof(verticesTriangle), verticesTriangle, GL_STATIC_DRAW);
+        glBindVertexArray(m_VAOs[VAO_Cube]);
+        m_program->setUniformValue(m_mvMatrixLocation, modelViewMatrix);
+        m_program->setUniformValue(m_colorLocation, QColor::fromHsv(360/6*i, 255, 255, 200));
 
-	glVertexAttribPointer(m_vPositionLocation, 3, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(0));
+        glDrawArrays(GL_TRIANGLES, i*6, 6);
-	glEnableVertexAttribArray(m_vPositionLocation);
-
-	// Create our Circle Object, and store its vertices with its bindings
-
-	GLfloat verticesCircle[numVerticesCircle][3];
-
-	const float PI = 3.1415926f;
-	double increment = 2.0f * PI / (numVerticesCircle - 2);
-
-	verticesCircle[0][0] = 0;
-	verticesCircle[0][1] = 0;
-	verticesCircle[0][2] = 0;
-
-	for(int i = 1; i < numVerticesCircle; i++) {
-		double angle = increment * (i);
-
-		verticesCircle[i][0] = 0.5 * cos(angle);
-		verticesCircle[i][1] = 0.5 * sin(angle);
-		verticesCircle[i][2] = 0;
     }
-
-	glBindVertexArray(m_VAOs[VAO_Circle]);
-	glBindBuffer(GL_ARRAY_BUFFER, m_Buffers[VBO_Circle]);
-	glBufferData(GL_ARRAY_BUFFER, sizeof(verticesCircle), verticesCircle, GL_STATIC_DRAW);
-
-	glVertexAttribPointer(m_vPositionLocation, 3, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(0));
-	glEnableVertexAttribArray(m_vPositionLocation);
-}
-
-void Viewer::visit(Square &s)
-{
-	QMatrix4x4 modelViewMatrix = modelStack.top() * QMatrix4x4(s.transform);
-
-	glBindVertexArray(m_VAOs[VAO_Square]);
-	m_program->setUniformValue(m_mvMatrixLocation, modelViewMatrix);
-	m_program->setUniformValue(m_colorLocation, s.color);
-
-	glDrawArrays(GL_TRIANGLE_FAN, 0, numVerticesSquare);
-}
-void Viewer::visit(Circle &s)
-{
-	QMatrix4x4 modelViewMatrix = modelStack.top() * QMatrix4x4(s.transform);
-
-	glBindVertexArray(m_VAOs[VAO_Circle]);
-	m_program->setUniformValue(m_mvMatrixLocation, modelViewMatrix);
-	m_program->setUniformValue(m_colorLocation, s.color);
-
-	glDrawArrays(GL_TRIANGLE_FAN, 0, numVerticesCircle);
-}
-void Viewer::visit(Triangle &s)
-{
-	QMatrix4x4 modelViewMatrix = modelStack.top() * QMatrix4x4(s.transform);
-
-	glBindVertexArray(m_VAOs[VAO_Triangle]);
-	m_program->setUniformValue(m_mvMatrixLocation, modelViewMatrix);
-	m_program->setUniformValue(m_colorLocation, s.color);
-
-	glDrawArrays(GL_TRIANGLES, 0, numVerticesTriangle);
 }
 
 void Viewer::visit(SceneGroup &s)

src/viewer/simpleViewer.h

@@ -44,9 +44,7 @@ public:
 	~Viewer();
 
 	virtual void visit(SceneGroup &s);
-	virtual void visit(Square &s);
+    virtual void visit(Cube &s);
-	virtual void visit(Circle &s);
-	virtual void visit(Triangle &s);
 
 public slots:
 	void cleanup();
@@ -81,13 +79,16 @@ private:
 	QColor* activeColor;
 	int activeShape;
 
-	enum VAO_IDs { VAO_Square, VAO_Triangle, VAO_Circle, NumVAOs };
+    enum VAO_IDs { VAO_Cube, NumVAOs };
-	enum Buffer_IDs { VBO_Square, VBO_Triangle, VBO_Circle, NumBuffers };
+    enum Buffer_IDs { VBO_Cube, NumBuffers };
 
 	GLuint m_VAOs[NumVAOs];
 	GLuint m_Buffers[NumBuffers];
 
 	Shape* generateShapeFromIndex(int);
+
+    QQuaternion rot;
+    unsigned int frame;
 };
 
 #endif // SIMPLEVIEWER_H