move texture to GeometryEngine
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
#include <QVector2D>
|
||||
#include <QBasicTimer>
|
||||
#include <QOpenGLShaderProgram>
|
||||
#include <QOpenGLTexture>
|
||||
|
||||
|
||||
class GeometryEngine;
|
||||
|
||||
@@ -31,8 +31,8 @@ protected:
|
||||
void resizeGL(int w, int h) Q_DECL_OVERRIDE;
|
||||
void paintGL() Q_DECL_OVERRIDE;
|
||||
|
||||
private:
|
||||
void initShaders();
|
||||
void initTextures();
|
||||
|
||||
private:
|
||||
struct {
|
||||
@@ -40,10 +40,9 @@ private:
|
||||
bool right = false;
|
||||
QVector2D position;
|
||||
} m_mouse;
|
||||
QOpenGLShaderProgram program;
|
||||
GeometryEngine *geometries;
|
||||
|
||||
QOpenGLTexture *texture;
|
||||
QOpenGLShaderProgram m_program;
|
||||
GeometryEngine *m_dataEngine;
|
||||
|
||||
QMatrix4x4 m_projection;
|
||||
QQuaternion m_rotation;
|
||||
|
||||
Reference in New Issue
Block a user