Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/erwincoumans/bullet3

Browse Source
This commit is contained in:
Erwin Coumans
2017-01-15 11:22:38 -08:00
parent 310fabcd7e 8a6e40ff95
commit e3df00d5f1
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
examples/StandaloneMain/hellovr_opengl_main.cpp
View File

@@ -22,6 +22,7 @@
int gSharedMemoryKey = -1; int gSharedMemoryKey = -1;
int gDebugDrawFlags = 0; int gDebugDrawFlags = 0;
bool gDisplayDistortion = false; bool gDisplayDistortion = false;
bool gDisableDesktopGL = false;
//how can you try typing on a keyboard, without seeing it? //how can you try typing on a keyboard, without seeing it?
//it is pretty funny, to see the desktop in VR! //it is pretty funny, to see the desktop in VR!
@@ -834,23 +835,26 @@ void CMainApplication::RenderFrame()
} }
RenderStereoTargets(); RenderStereoTargets();
if (gDisplayDistortion) if (!gDisableDesktopGL)
{ {
B3_PROFILE("RenderDistortion"); if (gDisplayDistortion)
RenderDistortion(); {
} else B3_PROFILE("RenderDistortion");
{ RenderDistortion();
glBindFramebuffer( GL_FRAMEBUFFER, 0 ); } else
glDisable( GL_MULTISAMPLE ); {
glBindFramebuffer(GL_READ_FRAMEBUFFER, rightEyeDesc.m_nRenderFramebufferId ); glBindFramebuffer( GL_FRAMEBUFFER, 0 );
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); glDisable( GL_MULTISAMPLE );
glBindFramebuffer(GL_READ_FRAMEBUFFER, rightEyeDesc.m_nRenderFramebufferId );
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
glBlitFramebuffer( 0, 0, m_nRenderWidth, m_nRenderHeight, 0, 0, m_nRenderWidth, m_nRenderHeight, glBlitFramebuffer( 0, 0, m_nRenderWidth, m_nRenderHeight, 0, 0, m_nRenderWidth, m_nRenderHeight,
GL_COLOR_BUFFER_BIT, GL_COLOR_BUFFER_BIT,
GL_LINEAR ); GL_LINEAR );
glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0 ); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0 );
}
} }
vr::Texture_t leftEyeTexture = {(void*)leftEyeDesc.m_nResolveTextureId, vr::API_OpenGL, vr::ColorSpace_Gamma }; vr::Texture_t leftEyeTexture = {(void*)leftEyeDesc.m_nResolveTextureId, vr::API_OpenGL, vr::ColorSpace_Gamma };
@@ -873,7 +877,10 @@ void CMainApplication::RenderFrame()
// SwapWindow // SwapWindow
{ {
B3_PROFILE("m_app->swapBuffer"); B3_PROFILE("m_app->swapBuffer");
m_app->swapBuffer(); if (!gDisableDesktopGL)
{
m_app->swapBuffer();
}
//SDL_GL_SwapWindow( m_pWindow ); //SDL_GL_SwapWindow( m_pWindow );
} }
@@ -2216,6 +2223,11 @@ void CGLRenderModel::Draw()
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
b3CommandLineArgs args(argc,argv);
if (args.CheckCmdLineFlag("disable_desktop_gl"))
{
gDisableDesktopGL = true;
}
#ifdef BT_USE_CUSTOM_PROFILER #ifdef BT_USE_CUSTOM_PROFILER
b3SetCustomEnterProfileZoneFunc(dcEnter); b3SetCustomEnterProfileZoneFunc(dcEnter);