diff --git a/src/ViewportWidget.cpp b/src/ViewportWidget.cpp index 1aa54a2..dc19b44 100644 --- a/src/ViewportWidget.cpp +++ b/src/ViewportWidget.cpp @@ -42,10 +42,8 @@ void ViewportWidget::paintGL() glMatrixMode(GL_MODELVIEW); glLoadMatrixf(model.constData()); - drawCube(); - // View cube rendering - QMatrix4x4 viewCubeModel; + QMatrix4xá4 viewCubeModel; viewCubeModel.rotate(xRot / 16.0f, 1, 0, 0); viewCubeModel.rotate(yRot / 16.0f, 0, 1, 0); m_viewCube->paintGL(viewCubeModel, width(), height()); @@ -92,50 +90,3 @@ void ViewportWidget::wheelEvent(QWheelEvent *event) } update(); } - -void ViewportWidget::drawCube() -{ - glBegin(GL_QUADS); - // Front face - glColor3f(1.0, 0.0, 0.0); - glVertex3f(-0.5, -0.5, 0.5); - glVertex3f(0.5, -0.5, 0.5); - glVertex3f(0.5, 0.5, 0.5); - glVertex3f(-0.5, 0.5, 0.5); - - // Back face - glColor3f(0.0, 1.0, 0.0); - glVertex3f(-0.5, -0.5, -0.5); - glVertex3f(-0.5, 0.5, -0.5); - glVertex3f(0.5, 0.5, -0.5); - glVertex3f(0.5, -0.5, -0.5); - - // Top face - glColor3f(0.0, 0.0, 1.0); - glVertex3f(-0.5, 0.5, -0.5); - glVertex3f(-0.5, 0.5, 0.5); - glVertex3f(0.5, 0.5, 0.5); - glVertex3f(0.5, 0.5, -0.5); - - // Bottom face - glColor3f(1.0, 1.0, 0.0); - glVertex3f(-0.5, -0.5, -0.5); - glVertex3f(0.5, -0.5, -0.5); - glVertex3f(0.5, -0.5, 0.5); - glVertex3f(-0.5, -0.5, 0.5); - - // Right face - glColor3f(1.0, 0.0, 1.0); - glVertex3f(0.5, -0.5, -0.5); - glVertex3f(0.5, 0.5, -0.5); - glVertex3f(0.5, 0.5, 0.5); - glVertex3f(0.5, -0.5, 0.5); - - // Left face - glColor3f(0.0, 1.0, 1.0); - glVertex3f(-0.5, -0.5, -0.5); - glVertex3f(-0.5, -0.5, 0.5); - glVertex3f(-0.5, 0.5, 0.5); - glVertex3f(-0.5, 0.5, -0.5); - glEnd(); -} diff --git a/src/ViewportWidget.h b/src/ViewportWidget.h index a3207ed..400d609 100644 --- a/src/ViewportWidget.h +++ b/src/ViewportWidget.h @@ -26,8 +26,6 @@ protected: void wheelEvent(QWheelEvent *event) override; private: - void drawCube(); - QMatrix4x4 projection; ViewCube* m_viewCube;