From a44e2b932a5bbb2f0ee7c9c2142e5c01e72272da Mon Sep 17 00:00:00 2001 From: Linloir <3145078758@qq.com> Date: Mon, 12 Dec 2022 22:52:34 +0800 Subject: [PATCH] Minor changes --- FinalProject/sceneviewer.cpp | 17 ++++++++++++++--- FinalProject/sceneviewer.h | 1 + FinalProject/vao.cpp | 4 +--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/FinalProject/sceneviewer.cpp b/FinalProject/sceneviewer.cpp index c6b19a3..ecae50e 100644 --- a/FinalProject/sceneviewer.cpp +++ b/FinalProject/sceneviewer.cpp @@ -1,9 +1,15 @@ #include "sceneviewer.h" +#include +#include +#include + +using std::vector; + SceneViewer::SceneViewer(QWidget* parent) : QOpenGLWidget(parent) { - + } SceneViewer::~SceneViewer() { @@ -11,13 +17,18 @@ SceneViewer::~SceneViewer() { } void SceneViewer::initializeGL() { + initializeOpenGLFunctions(); + glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); } void SceneViewer::resizeGL(int w, int h) { - + } void SceneViewer::paintGL() { - + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + // } \ No newline at end of file diff --git a/FinalProject/sceneviewer.h b/FinalProject/sceneviewer.h index 22130e3..ebf604d 100644 --- a/FinalProject/sceneviewer.h +++ b/FinalProject/sceneviewer.h @@ -7,6 +7,7 @@ #include #include "renderable.h" +#include "vao.h" #include "utils.h" class SceneViewer : public QOpenGLWidget, protected QOpenGLFunctions diff --git a/FinalProject/vao.cpp b/FinalProject/vao.cpp index 429a143..8647685 100644 --- a/FinalProject/vao.cpp +++ b/FinalProject/vao.cpp @@ -2,9 +2,7 @@ #include "vao.h" -VertexArrayObject::VertexArrayObject() { - OPENGL_EXTRA_FUNCTIONS->glGenVertexArrays(1, &_id); -} +VertexArrayObject::VertexArrayObject() {} VertexArrayObject::VertexArrayObject(const VertexBufferObject& vbo) : _vbo(vbo) {