Commit de4f6e6d by Philipp Adolf

Change formatting of mainwidget.h

parent ad28fd9c
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
class MainWidget : public QOpenGLWidget, public QOpenGLFunctions_4_3_Core class MainWidget : public QOpenGLWidget, public QOpenGLFunctions_4_3_Core
{ {
Q_OBJECT Q_OBJECT
public: public:
MainWidget(Camera *cam); MainWidget(Camera *cam);
...@@ -35,8 +36,6 @@ public slots: ...@@ -35,8 +36,6 @@ public slots:
void subdivide(int level); void subdivide(int level);
void setdebugOutput(bool output); void setdebugOutput(bool output);
protected: protected:
void initializeGL(); void initializeGL();
void paintGL(); void paintGL();
...@@ -47,29 +46,23 @@ protected: ...@@ -47,29 +46,23 @@ protected:
void wheelEvent(QWheelEvent *event ) ; void wheelEvent(QWheelEvent *event ) ;
private: private:
QVector3D* trackballPoint(int x, int y);
void rotate(QVector3D *newPos );
void move(QPointF *newPos );
Camera *cam; Camera *cam;
QOpenGLShaderProgram* subdivisionShader; QOpenGLShaderProgram* subdivisionShader;
QOpenGLShaderProgram* regularShader; QOpenGLShaderProgram* regularShader;
QMatrix4x4 m_projection; QMatrix4x4 m_projection;
QTime startTime; QTime startTime;
QTime rotTime; QTime rotTime;
float camDistance; float camDistance;
QVector3D *lastSpeherePos; QVector3D *lastSpeherePos;
QPointF * lastScreenPos; QPointF * lastScreenPos;
Subdivision *subdivision; Subdivision *subdivision;
Mesh *mesh; Mesh *mesh;
QOpenGLShaderProgram* initShaderProgram(QString vertSource, QString tesselationControlSource, QString tesselationEvaluationSource, QString geometrySource, QString fragSource ); QOpenGLShaderProgram* initShaderProgram(QString vertSource, QString tesselationControlSource, QString tesselationEvaluationSource, QString geometrySource, QString fragSource );
QOpenGLShader* initGLShader(QString scource, QOpenGLShader::ShaderType type); QOpenGLShader* initGLShader(QString scource, QOpenGLShader::ShaderType type);
QVector3D* trackballPoint(int x, int y);
void rotate(QVector3D *newPos );
void move(QPointF *newPos );
}; };
#endif // MAINWIDGET_H #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