kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Qt5OpenGL: Framebufferobject rendering works and handles transparency and anti-aliasing

Browse Source
This commit is contained in:
wmayer
2017-03-11 14:35:19 +01:00
parent 6e026fd67b
commit 0bec4dbd63
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Gui/View3DInventorViewer.cpp
View File

@@ -931,7 +931,7 @@ void View3DInventorViewer::savePicture(int w, int h, const QColor& bg, QImage& i
#if !defined(HAVE_QT5_OPENGL)
bool useCoinOffscreenRenderer = !QGLPixelBuffer::hasOpenGLPbuffers();
#else
bool useCoinOffscreenRenderer = !QtGLFramebufferObject::hasOpenGLFramebufferObjects();
bool useCoinOffscreenRenderer = true;
#endif
useCoinOffscreenRenderer = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/Document")->
@@ -1331,13 +1331,24 @@ void View3DInventorViewer::setRenderType(const RenderType type)
gl->makeCurrent();
#if !defined(HAVE_QT5_OPENGL)
framebuffer = new QtGLFramebufferObject(width, height, QtGLFramebufferObject::Depth);
renderToFramebuffer(framebuffer);
#else
QOpenGLFramebufferObjectFormat fboFormat;
//fboFormat.setSamples(getNumSamples());
fboFormat.setSamples(getNumSamples());
fboFormat.setAttachment(QtGLFramebufferObject::Depth);
framebuffer = new QtGLFramebufferObject(width, height, fboFormat);
QtGLFramebufferObject* fbo = new QtGLFramebufferObject(width, height, fboFormat);
if (fbo->format().samples() > 0) {
renderToFramebuffer(fbo);
framebuffer = new QtGLFramebufferObject(fbo->size());
// this is needed to be able to render the texture later
QOpenGLFramebufferObject::blitFramebuffer(framebuffer, fbo);
delete fbo;
}
else {
renderToFramebuffer(fbo);
framebuffer = fbo;
}
#endif
renderToFramebuffer(framebuffer);
}
break;
case Image: