Commit de4f6e6d by Philipp Adolf

Change formatting of mainwidget.h

parent ad28fd9c
......@@ -17,6 +17,7 @@
class MainWidget : public QOpenGLWidget, public QOpenGLFunctions_4_3_Core
{
Q_OBJECT
public:
MainWidget(Camera *cam);
......@@ -35,41 +36,33 @@ public slots:
void subdivide(int level);
void setdebugOutput(bool output);
protected:
void initializeGL();
void paintGL();
void resizeGL(int width, int height);
void initializeGL();
void paintGL();
void resizeGL(int width, int height);
void mousePressEvent(QMouseEvent *event ) ;
void mouseMoveEvent(QMouseEvent *event ) ;
void wheelEvent(QWheelEvent *event ) ;
void mousePressEvent(QMouseEvent *event ) ;
void mouseMoveEvent(QMouseEvent *event ) ;
void wheelEvent(QWheelEvent *event ) ;
private:
QVector3D* trackballPoint(int x, int y);
void rotate(QVector3D *newPos );
void move(QPointF *newPos );
Camera *cam;
QOpenGLShaderProgram* subdivisionShader;
QOpenGLShaderProgram* regularShader;
QMatrix4x4 m_projection;
QTime startTime;
QTime rotTime;
float camDistance;
QVector3D *lastSpeherePos;
QPointF * lastScreenPos;
Subdivision *subdivision;
Mesh *mesh;
QOpenGLShaderProgram* initShaderProgram(QString vertSource, QString tesselationControlSource, QString tesselationEvaluationSource, QString geometrySource, QString fragSource );
QOpenGLShader* initGLShader(QString scource, QOpenGLShader::ShaderType type);
Camera *cam;
QOpenGLShaderProgram* subdivisionShader;
QOpenGLShaderProgram* regularShader;
QMatrix4x4 m_projection;
QTime startTime;
QTime rotTime;
float camDistance;
QVector3D *lastSpeherePos;
QPointF * lastScreenPos;
Subdivision *subdivision;
Mesh *mesh;
QOpenGLShaderProgram* initShaderProgram(QString vertSource, QString tesselationControlSource, QString tesselationEvaluationSource, QString geometrySource, QString fragSource );
QOpenGLShader* initGLShader(QString scource, QOpenGLShader::ShaderType type);
QVector3D* trackballPoint(int x, int y);
void rotate(QVector3D *newPos );
void move(QPointF *newPos );
};
#endif // MAINWIDGET_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment