add exe icon,

signal-slot for openFile,
resetView on openFile,
cleanup when open a new file,
triangulate quad poly now correctly, more not working, bug from previous version,
next:
fix 5,6,.. triangulation,
triClothMan, IC Helmet, still buggy,
This commit is contained in:
Anakin
2017-01-02 12:21:32 +01:00
parent 0735ef996d
commit fa8808fea8
9 changed files with 54 additions and 30 deletions

View File

@@ -1,5 +1,5 @@
#include "..\Header\OglViewerWidget.h"
#include "..\Header\MainWindow.h"
#include <QMouseEvent>
#include <QDropEvent>
#include <QMimeData>
@@ -19,6 +19,7 @@ OglViewerWidget::OglViewerWidget(QWidget *parent) :
setFocus();
m_translation.setZ(DEFAULT_Z_DISTANCE);
setAcceptDrops(true);
}
OglViewerWidget::~OglViewerWidget()
@@ -101,14 +102,12 @@ void OglViewerWidget::keyPressEvent(QKeyEvent *e)
{
if (e->key() == Qt::Key_Space)
{
m_rotation = QQuaternion();
m_translation = { 0.0, 0.0, DEFAULT_Z_DISTANCE };
resetView();
}
else if (e->key() == Qt::Key_Escape)
{
parentWidget()->close();
}
update();
}
void OglViewerWidget::initializeGL()
@@ -126,6 +125,8 @@ void OglViewerWidget::initializeGL()
glEnable(GL_CULL_FACE);
m_dataEngine = new GeometryEngine;
connect(m_dataEngine, &GeometryEngine::requestResetView, this, &OglViewerWidget::resetView);
connect(parentWidget(), SIGNAL(loadFile(const char*)), m_dataEngine, SLOT(loadFile(const char*)));
}
@@ -186,9 +187,11 @@ void OglViewerWidget::initShaders()
/////////////////////////////////////////////////////////////////////////
// public functions
// private slots
void OglViewerWidget::openFile(const char * filePath)
void OglViewerWidget::resetView()
{
m_dataEngine->loadFile(filePath);
}
m_rotation = QQuaternion();
m_translation = { 0.0, 0.0, DEFAULT_Z_DISTANCE };
update();
}