Archive/openrw
0
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2025-04-28 21:08:05 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

rwviewer: wrap QOpenGLContext

Browse source
This commit is contained in:
Anonymous Maarten 2018-08-10 02:40:23 +02:00
parent 50bbfb40f3
commit d212a779c2
8 changed files with 92 additions and 458 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rwviewer/ViewerWidget.cpp
View file

@ -1,6 +1,7 @@
#include "ViewerWidget.hpp"
#include <QFileDialog>
#include <QMouseEvent>
#include "QOpenGLContextWrapper.hpp"
#include <engine/Animator.hpp>
#include <engine/GameData.hpp>
#include <engine/GameWorld.hpp>
@ -12,6 +13,9 @@
#include <render/ObjectRenderer.hpp>
#include <render/TextRenderer.hpp>
#include <QFileDialog>
#include <QMouseEvent>
constexpr float kViewFov = glm::radians(90.0f);
namespace {
@ -32,9 +36,9 @@ ViewCamera OrbitCamera (const glm::vec2& viewPort, const glm::vec2& viewAngles,
}
}
ViewerWidget::ViewerWidget(QOpenGLContext* context, QWindow* parent)
ViewerWidget::ViewerWidget(QOpenGLContextWrapper* context, QWindow* parent)
: QWindow(parent)
, context(context) {
, m_context(context) {
setSurfaceType(OpenGLSurface);
}
@ -335,7 +339,7 @@ void ViewerWidget::renderNow() {
return;
}
context->makeCurrent(this);
m_context->makeCurrent(this);
if (!initialised) {
initGL();
@ -343,7 +347,7 @@ void ViewerWidget::renderNow() {
}
paintGL();
context->swapBuffers(this);
m_context->swapBuffers(this);
requestUpdate();
}