master
Benjamin Kraft 3 years ago
parent 70c3c273a5
commit 660e8a1df2
  1. 3
      headers/OutputWidget.h
  2. 6
      src/OutputWidget.cpp

@ -29,8 +29,7 @@ private:
void initShader(); void initShader();
static std::vector<QVector2D> genVertices(); static std::vector<QVector2D> genVertices();
GLuint createVAO(); GLuint createVAO();
GLuint vao; GLuint vao{};
int vertCount;
QOpenGLShaderProgram shader; QOpenGLShaderProgram shader;
Mandelbrot mandelbrot; Mandelbrot mandelbrot;

@ -23,7 +23,7 @@ void OutputWidget::paintGL() {
} }
void OutputWidget::resizeGL(int w, int h) { void OutputWidget::resizeGL(int w, int h) {
} }
GLuint OutputWidget::createVAO() { GLuint OutputWidget::createVAO() {
@ -33,7 +33,6 @@ GLuint OutputWidget::createVAO() {
auto vertices = genVertices(); auto vertices = genVertices();
size_t size = vertices.size() * sizeof(QVector2D); size_t size = vertices.size() * sizeof(QVector2D);
vertCount = int(vertices.size());
glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)size, &vertices[0], GL_STATIC_DRAW); glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)size, &vertices[0], GL_STATIC_DRAW);
GLuint vaoId; GLuint vaoId;
@ -41,7 +40,7 @@ GLuint OutputWidget::createVAO() {
glBindVertexArray(vaoId); glBindVertexArray(vaoId);
glBindBuffer(GL_ARRAY_BUFFER, vboId); glBindBuffer(GL_ARRAY_BUFFER, vboId);
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(QVector2D), (GLvoid const*) 0); glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(QVector2D), (void*) nullptr);
glEnableVertexAttribArray(0); glEnableVertexAttribArray(0);
glBindVertexArray(0); glBindVertexArray(0);
@ -72,6 +71,7 @@ void OutputWidget::wheelEvent(QWheelEvent *e) {
void OutputWidget::mouseMoveEvent(QMouseEvent *e) { void OutputWidget::mouseMoveEvent(QMouseEvent *e) {
QPoint newMousePos = e->pos(); QPoint newMousePos = e->pos();
QPoint diff = newMousePos - mousePos; QPoint diff = newMousePos - mousePos;
auto m = getMandelbrot();
} }
void OutputWidget::mousePressEvent(QMouseEvent *e) { void OutputWidget::mousePressEvent(QMouseEvent *e) {

Loading…
Cancel
Save