mirror of
https://github.com/bulletphysics/bullet3.git
synced 2026-06-08 08:13:55 +00:00
use mainthread on __APPLE__
remove duplicate SimpleCamera.cpp from cmakelists.txt
This commit is contained in:
@@ -20,8 +20,6 @@ SET(RobotSimulator_SRCS
|
||||
../../examples/ExampleBrowser/InProcessExampleBrowser.cpp
|
||||
../../examples/SharedMemory/plugins/tinyRendererPlugin/tinyRendererPlugin.cpp
|
||||
../../examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp
|
||||
../../examples/OpenGLWindow/SimpleCamera.cpp
|
||||
../../examples/OpenGLWindow/SimpleCamera.h
|
||||
../../examples/TinyRenderer/geometry.cpp
|
||||
../../examples/TinyRenderer/model.cpp
|
||||
../../examples/TinyRenderer/tgaimage.cpp
|
||||
|
||||
@@ -29,7 +29,12 @@ std::map<std::string, int> jointNameToId;
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
#ifdef __APPLE__
|
||||
kPhysClient = b3CreateInProcessPhysicsServerAndConnectMainThread(argc, argv);
|
||||
#else
|
||||
kPhysClient = b3CreateInProcessPhysicsServerAndConnect(argc, argv);
|
||||
#endif
|
||||
|
||||
if (!kPhysClient)
|
||||
return -1;
|
||||
// visualizer
|
||||
@@ -131,4 +136,4 @@ int main(int argc, char* argv[])
|
||||
}
|
||||
b3DisconnectSharedMemory(kPhysClient);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user