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

pybullet: allow programmatic creation of heightfield. See https://github.com/erwincoumans/bullet3/tree/master/examples/pybullet/examples/heightfield.py

Browse Source 
premake4: allow to build example browser without C++11, re-enable stable PD control plugin using --enable_stable_pd=True
This commit is contained in:
Erwin Coumans
2019-08-11 13:59:24 -07:00
parent f5ae8bd1af
commit f9b232b153
10 changed files with 192 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
examples/ExampleBrowser/premake4.lua
View File

@@ -145,12 +145,6 @@ project "App_BulletExampleBrowser"
"../SharedMemory/plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
"../SharedMemory/plugins/pdControlPlugin/pdControlPlugin.cpp",
"../SharedMemory/plugins/pdControlPlugin/pdControlPlugin.h",
"../SharedMemory/plugins/stablePDPlugin/SpAlg.cpp",
"../SharedMemory/plugins/stablePDPlugin/Shape.cpp",
"../SharedMemory/plugins/stablePDPlugin/RBDUtil.cpp",
"../SharedMemory/plugins/stablePDPlugin/RBDModel.cpp",
"../SharedMemory/plugins/stablePDPlugin/MathUtil.cpp",
"../SharedMemory/plugins/stablePDPlugin/KinTree.cpp",
"../SharedMemory/SharedMemoryCommands.h",
"../SharedMemory/SharedMemoryPublic.h",
"../SharedMemory/b3RobotSimulatorClientAPI_NoGUI.cpp",
@@ -211,6 +205,26 @@ project "App_BulletExampleBrowser"
"../ThirdPartyLibs/tinyxml2/tinyxml2.cpp",
"../ThirdPartyLibs/tinyxml2/tinyxml2.h",
}
if _OPTIONS["enable_stable_pd"] then
defines {"STATIC_LINK_SPD_PLUGIN"}
files {
"../SharedMemory/plugins/stablePDPlugin/SpAlg.cpp",
"../SharedMemory/plugins/stablePDPlugin/SpAlg.h",
"../SharedMemory/plugins/stablePDPlugin/Shape.cpp",
"../SharedMemory/plugins/stablePDPlugin/Shape.h",
"../SharedMemory/plugins/stablePDPlugin/RBDUtil.cpp",
"../SharedMemory/plugins/stablePDPlugin/RBDUtil.h",
"../SharedMemory/plugins/stablePDPlugin/RBDModel.cpp",
"../SharedMemory/plugins/stablePDPlugin/RBDModel.h",
"../SharedMemory/plugins/stablePDPlugin/MathUtil.cpp",
"../SharedMemory/plugins/stablePDPlugin/MathUtil.h",
"../SharedMemory/plugins/stablePDPlugin/KinTree.cpp",
"../SharedMemory/plugins/stablePDPlugin/KinTree.h",
"../SharedMemory/plugins/stablePDPlugin/BulletConversion.cpp",
"../SharedMemory/plugins/stablePDPlugin/BulletConversion.h",
}
end
if (hasCL and findOpenGL3()) then
files {
"../OpenCL/broadphase/*",