add wireframe paint option,

write file information on the screen,
bug fixes
This commit is contained in:
Anakin
2017-01-16 14:24:30 +01:00
parent 454ed45fa1
commit 86dfe32145
7 changed files with 45 additions and 7 deletions

View File

@@ -33,7 +33,7 @@ private:
public slots:
void loadFile(QString filePath);
void drawGeometry(QOpenGLShaderProgram *program);
void drawGeometry(QOpenGLShaderProgram *program, bool wireframe);
signals:
void requestResetView();

View File

@@ -1,8 +1,10 @@
#pragma once
#include <QtWidgets/QMainWindow>
#include <qwidget.h>
#include <QByteArray>
#include <QStringList>
#include <QLabel>
#include "ui_MainWindow.h"
struct Material;
@@ -20,7 +22,7 @@ private:
int m_curSeverity;
void setupWidgets();
QByteArray m_fileInfo;
QLabel* m_output;
private:
void openFile();
@@ -28,6 +30,9 @@ private:
void aboutTool();
void takeScreenShot();
protected:
virtual void resizeEvent(QResizeEvent * e) Q_DECL_OVERRIDE;
public slots:
void printMessage(QString message, int severity);
void setFileInfo(QString name, QVector<Material>* materials, int vertices, int triangle);

View File

@@ -44,6 +44,8 @@ private:
QVector3D m_translation;
QQuaternion m_rotation;
bool m_wireframe = false;
protected:
void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
@@ -66,5 +68,6 @@ private slots:
public slots:
void changeDirection(int direction);
void toggleWireframe();
};