marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move all viewport drawing to QOpenGLWidget::paintGL 

Unfortunately, this still doesn't fix rendering. Note that the paintGL()
isn't called periodically yet, only when resizing the window.
qteditor
Lukas Werling 2016-03-22 16:50:38 +01:00
parent eefa8749a8
commit 4290038909
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/editor/C4ConsoleQtViewport.cpp
View File

@ -307,7 +307,17 @@ void C4ConsoleQtViewportView::leaveEvent(QEvent *)
::Console.EditCursor.SetMouseHover(false);
}
void C4ConsoleQtViewportView::initializeGL() { }
void C4ConsoleQtViewportView::initializeGL()
{
// init extensions
glewExperimental = GL_TRUE;
GLenum err = glewInit();
if (GLEW_OK != err)
{
// Problem: glewInit failed, something is seriously wrong.
LogF("glewInit: %s", reinterpret_cast<const char*>(glewGetErrorString(err)));
}
}
void C4ConsoleQtViewportView::resizeGL(int w, int h)
{
@ -316,8 +326,7 @@ void C4ConsoleQtViewportView::resizeGL(int w, int h)
void C4ConsoleQtViewportView::paintGL()
{
// Painting is done regularily elsewhere anyways.
/* cvp->Execute(); */
cvp->Execute();
}

4
src/editor/C4ViewportWindow.cpp
View File

@ -170,13 +170,13 @@ bool C4Viewport::TogglePlayerLock() {return 0;}
void C4ViewportWindow::PerformUpdate()
{
#ifndef WITH_QT_EDITOR // done by callback
if (cvp)
{
#ifndef WITH_QT_EDITOR // done by callback
cvp->UpdateOutputSize();
#endif
cvp->Execute();
}
#endif
}
C4Window * C4ViewportWindow::Init(int32_t Player)

29
src/graphics/C4DrawGLCtx.cpp
View File

@ -683,17 +683,17 @@ bool CStdGLCtxQt::Init(C4Window *window, C4AbstractApp *app)
context = new QOpenGLContext();
if (!context->create())
return false;
}
if (!Select(true)) return false;
if (!Select(true)) return false;
// init extensions
glewExperimental = GL_TRUE;
GLenum err = glewInit();
if (GLEW_OK != err)
{
// Problem: glewInit failed, something is seriously wrong.
return pGL->Error(reinterpret_cast<const char*>(glewGetErrorString(err)));
// init extensions
glewExperimental = GL_TRUE;
GLenum err = glewInit();
if (GLEW_OK != err)
{
// Problem: glewInit failed, something is seriously wrong.
return pGL->Error(reinterpret_cast<const char*>(glewGetErrorString(err)));
}
}
this_context = contexts.insert(contexts.end(), this);
@ -708,7 +708,10 @@ bool CStdGLCtxQt::Select(bool verbose)
return false;
}
else
pWindow->glwidget->makeCurrent();
{
// done automatically
/* pWindow->glwidget->makeCurrent(); */
}
SelectCommon();
// update clipper - might have been done by UpdateSize
// however, the wrong size might have been assumed
@ -726,7 +729,10 @@ void CStdGLCtxQt::Deselect()
if (context)
context->doneCurrent();
else
pWindow->glwidget->doneCurrent();
{
// done automatically
/* pWindow->glwidget->doneCurrent(); */
}
if (pGL && pGL->pCurrCtx == this)
{
pGL->pCurrCtx = 0;
@ -741,7 +747,6 @@ bool CStdGLCtxQt::PageFlip()
if (!pWindow) return false;
if (context)
return false;
pWindow->glwidget->update();
return true;
}