Merge branch 'patchRender' of…

QTProject/mainwidget.cpp

@@ -27,8 +27,17 @@ void MainWidget::wheelEvent(QWheelEvent *event )
         cam->move(QVector3D(0.0,0.0,10));
     else
         cam->move(QVector3D(0.0,0.0,-10));
+}
 
-
+void MainWidget::keyPressEvent(QKeyEvent *event){
+    if(event->key() == Qt::Key_Minus){
+        cam->move(QVector3D(0.0,0.0,-10));
+    }
+    else if (event->key() == Qt::Key_Plus){
+        cam->move(QVector3D(0.0,0.0,10));
+    } else{
+        QOpenGLWidget::keyPressEvent(event);
+    }
 }
 
 void MainWidget::mousePressEvent(QMouseEvent *event ){

QTProject/mainwidget.h

@@ -13,6 +13,7 @@
 #include "mesh.h"
 #include "camera.h"
 #include "subdivision.h"
+#include "logcategories.h"
 
 
 class MainWidget : public QOpenGLWidget, public QOpenGLFunctions_4_3_Core
@@ -44,6 +45,7 @@ protected:
     void mousePressEvent(QMouseEvent *event ) ;
     void mouseMoveEvent(QMouseEvent *event ) ;
     void wheelEvent(QWheelEvent *event ) ;
+    void keyPressEvent(QKeyEvent *event ) ;
 
 private:
     Camera *cam;

QTProject/mainwindow.cpp

@@ -52,7 +52,8 @@ MainWindow::MainWindow(QWidget *parent) :
 
 
     this->setCentralWidget(m_centralWidget);
-
+    m_centralWidget->setFocusPolicy(Qt::StrongFocus);
+    m_centralWidget->setFocus();
     //  showMaximized();
 }
 

QTProject/subdivision.h

@@ -80,9 +80,6 @@ private:
      */
     bool matchAndCompleteTriangleIndices(unsigned int sx, unsigned int sy, unsigned int sz, unsigned int tx, unsigned int ty, unsigned int& tz);
 
-    //same as matchandcomplete. doesn't rely on only one index per vertex location
-    //needs indices to fill tz
-
     /**
      * @brief matchAndCompleteTriangle if vertices at indices tx ty matches vertices at indices sxsy, sysz or szsy,
      * fill tz with third source vertex index.