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

add option for newer Linux demos to dynamically load X11, glX and OpenGL 1 functions

Browse Source 
(and avoid having to link against X, glx and GL)
-DGLEW_INIT_OPENGL11_FUNCTIONS
-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS
-DDYNAMIC_LOAD_X11_FUNCTIONS
and link against libdl (for example usingi -ldl)
This commit is contained in:
Erwin Coumans (Google)
2014-07-11 14:25:32 -07:00
parent 72ae3b6afb
commit 433d349369
6 changed files with 537 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Demos3/BasicDemoCustomOpenGL2/main.cpp
View File

@@ -6,8 +6,8 @@ Copyright (c) 2003-2014 Erwin Coumans http://bulletphysics.org
This software is provided 'as-is', without any express or implied warranty.
In no event will the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it freely,
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it freely,
subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
@@ -133,7 +133,7 @@ int main(int argc, char* argv[])
window->setMouseMoveCallback(MyMouseMoveCallback);
window->setKeyboardCallback(MyKeyboardCallback);
//window->setWindowTitle("render test");
// window->setWindowTitle("render test");
int majorGlVersion, minorGlVersion;
@@ -153,7 +153,7 @@ int main(int argc, char* argv[])
#endif // _WIN32
glewInit();
#endif
//we ned to call glGetError twice, because of some Ubuntu/Intel/OpenGL issue
GLuint err = glGetError();
@@ -181,7 +181,7 @@ int main(int argc, char* argv[])
}
// glClearColor(0.2,0.2,0.2,1);
@@ -189,9 +189,9 @@ int main(int argc, char* argv[])
BasicDemoPhysicsSetup physicsSetup;
GraphicsPhysicsBridge br;
physicsSetup.initPhysics(br);
struct MyAppie : public DemoApplication
struct MyAppie : public DemoApplication
{
virtual void initPhysics()
{
@@ -210,7 +210,7 @@ int main(int argc, char* argv[])
if (isCtrlPressed)
m_modifierKeys |= BT_ACTIVE_CTRL;
if (isShiftPressed)
m_modifierKeys |= BT_ACTIVE_SHIFT;
@@ -228,8 +228,8 @@ int main(int argc, char* argv[])
physicsSetup.m_dynamicsWorld->setDebugDrawer(&draw);
btClock timer;
unsigned long prevTime = timer.getTimeMicroseconds();
do
do
{
unsigned long curTime = timer.getTimeMicroseconds();
if (!appie.isIdle())
@@ -242,7 +242,7 @@ int main(int argc, char* argv[])
appie.renderme();
physicsSetup.m_dynamicsWorld->debugDrawWorld();
window->endRendering();
} while (!window->requestedExit());
}
window->closeWindow();
@@ -252,4 +252,4 @@ int main(int argc, char* argv[])
printf("hello\n");
}
}