mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-14 13:50:04 +00:00
1452cae641
1) allow to render deformables in 'getCameraImage', for TinyRenderer (tested OK) and EGL (untested) 2) allow to have textures for deformables. See deformable_ball.py, deformable_anchor.py and deformable_torus.py for examples 3) deformables: allow to request simulation mesh data (even if there is a render mesh) See deformable_anchor.py for an example usage data = p.getMeshData(clothId, -1, flags=p.MESH_DATA_SIMULATION_MESH) 4) fix deletion of deformables, thanks to Fychuyan, https://github.com/bulletphysics/bullet3/pull/3048 5) allow to enable and disable double-sided rendering, p.changeVisualShape(objectUid, linkIndex, flags=p.VISUAL_SHAPE_DOUBLE_SIDED) 6) fix GripperGraspExample, model not found 7) Fix deformable anchor not attaching to multibody with object unique id of 0 8) Fix issue with assignment of unique ids in TinyRenderer/EGL renderer (always use broadphase uid) 9) Avoid crash/issue of simulation with pinned vertices (mass 0) in btDeformableBackwardEulerObjective::applyExplicitForce 10) Store uv/normal in btSoftBody::RenderNode to allow textured meshes 11) (uncomment in btSoftBodyHelpers.cpp): dump vertices and indices in obj wavefront format, when loading a VTK file, for quicker creation of a (textured) surface mesh 12) allow interpolateRenderMesh also for old position-based soft bodies (not only the shiny new FEM deformables) 13) fix a few premake targets 14) update build_visual_studio_vr_pybullet_double_cmake.bat so it suits c:\python37 and installs locally for local install of Bullet, see also this example https://github.com/erwincoumans/hello_bullet_cmake
222 lines
7.2 KiB
Lua
222 lines
7.2 KiB
Lua
|
|
project "App_InverseDynamicsExample"
|
|
|
|
if _OPTIONS["ios"] then
|
|
kind "WindowedApp"
|
|
else
|
|
kind "ConsoleApp"
|
|
end
|
|
defines {"B3_USE_STANDALONE_EXAMPLE"}
|
|
includedirs {"../../src"}
|
|
|
|
links {
|
|
"BulletInverseDynamicsUtils", "BulletInverseDynamics","Bullet3Common","BulletDynamics","BulletCollision", "LinearMath"
|
|
}
|
|
|
|
language "C++"
|
|
|
|
files {
|
|
"**.cpp",
|
|
"**.h",
|
|
"../StandaloneMain/main_console_single_example.cpp",
|
|
"../Utils/b3ResourcePath.cpp",
|
|
"../Utils/b3ResourcePath.h",
|
|
"../RenderingExamples/TimeSeriesCanvas.cpp",
|
|
"../RenderingExamples/TimeSeriesFontData.cpp",
|
|
"../MultiBody/InvertedPendulumPDControl.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinystr.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinyxml.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinyxmlerror.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinyxmlparser.cpp",
|
|
"../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp",
|
|
"../ThirdPartyLibs/Wavefront/tiny_obj_loader.h",
|
|
"../Importers/ImportColladaDemo/LoadMeshFromCollada.cpp",
|
|
"../Importers/ImportObjDemo/LoadMeshFromObj.cpp",
|
|
"../Importers/ImportObjDemo/Wavefront2GLInstanceGraphicsShape.cpp",
|
|
"../Importers/ImportURDFDemo/BulletUrdfImporter.cpp",
|
|
"../Importers/ImportURDFDemo/MyMultiBodyCreator.cpp",
|
|
"../Importers/ImportURDFDemo/URDF2Bullet.cpp",
|
|
"../Importers/ImportURDFDemo/UrdfParser.cpp",
|
|
"../Importers/ImportURDFDemo/urdfStringSplit.cpp",
|
|
"../Importers/ImportMeshUtility/b3ImportMeshUtility.cpp",
|
|
"../ThirdPartyLibs/stb_image/stb_image.cpp",
|
|
}
|
|
|
|
|
|
project "App_InverseDynamicsExampleGui"
|
|
|
|
if _OPTIONS["ios"] then
|
|
kind "WindowedApp"
|
|
else
|
|
kind "ConsoleApp"
|
|
end
|
|
defines {"B3_USE_STANDALONE_EXAMPLE"}
|
|
|
|
includedirs {"../../src"}
|
|
|
|
links {
|
|
"BulletInverseDynamicsUtils", "BulletInverseDynamics","BulletDynamics","BulletCollision", "LinearMath", "OpenGL_Window","Bullet3Common"
|
|
}
|
|
|
|
initOpenGL()
|
|
initGlew()
|
|
|
|
|
|
language "C++"
|
|
|
|
files {
|
|
"InverseDynamicsExample.cpp",
|
|
"*.h",
|
|
"../StandaloneMain/main_opengl_single_example.cpp",
|
|
"../ExampleBrowser/OpenGLGuiHelper.cpp",
|
|
"../ExampleBrowser/GL_ShapeDrawer.cpp",
|
|
"../ExampleBrowser/CollisionShape2TriangleMesh.cpp",
|
|
"../Utils/b3ResourcePath.cpp",
|
|
"../Utils/b3ResourcePath.h",
|
|
"../RenderingExamples/TimeSeriesCanvas.cpp",
|
|
"../RenderingExamples/TimeSeriesFontData.cpp",
|
|
"../MultiBody/InvertedPendulumPDControl.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinystr.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinyxml.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinyxmlerror.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinyxmlparser.cpp",
|
|
"../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp",
|
|
"../ThirdPartyLibs/Wavefront/tiny_obj_loader.h",
|
|
"../Importers/ImportColladaDemo/LoadMeshFromCollada.cpp",
|
|
"../Importers/ImportObjDemo/LoadMeshFromObj.cpp",
|
|
"../Importers/ImportObjDemo/Wavefront2GLInstanceGraphicsShape.cpp",
|
|
"../Importers/ImportURDFDemo/BulletUrdfImporter.cpp",
|
|
"../Importers/ImportURDFDemo/MyMultiBodyCreator.cpp",
|
|
"../Importers/ImportURDFDemo/URDF2Bullet.cpp",
|
|
"../Importers/ImportURDFDemo/UrdfParser.cpp",
|
|
"../Importers/ImportURDFDemo/urdfStringSplit.cpp",
|
|
"../Importers/ImportMeshUtility/b3ImportMeshUtility.cpp",
|
|
"../ThirdPartyLibs/stb_image/stb_image.cpp",
|
|
"../Utils/b3Clock.cpp",
|
|
}
|
|
|
|
if os.is("Linux") then initX11() end
|
|
|
|
if os.is("MacOSX") then
|
|
links{"Cocoa.framework"}
|
|
end
|
|
|
|
|
|
|
|
project "App_InverseDynamicsExampleGuiWithSoftwareRenderer"
|
|
|
|
if _OPTIONS["ios"] then
|
|
kind "WindowedApp"
|
|
else
|
|
kind "ConsoleApp"
|
|
end
|
|
defines {"B3_USE_STANDALONE_EXAMPLE"}
|
|
|
|
includedirs {"../../src"}
|
|
|
|
links {
|
|
"BulletInverseDynamicsUtils", "BulletInverseDynamics","BulletDynamics","BulletCollision", "LinearMath", "OpenGL_Window","Bullet3Common"
|
|
}
|
|
|
|
initOpenGL()
|
|
initGlew()
|
|
|
|
|
|
language "C++"
|
|
|
|
files {
|
|
"InverseDynamicsExample.cpp",
|
|
"*.h",
|
|
"../StandaloneMain/main_sw_tinyrenderer_single_example.cpp",
|
|
"../ExampleBrowser/OpenGLGuiHelper.cpp",
|
|
"../ExampleBrowser/GL_ShapeDrawer.cpp",
|
|
"../ExampleBrowser/CollisionShape2TriangleMesh.cpp",
|
|
"../TinyRenderer/geometry.cpp",
|
|
"../TinyRenderer/model.cpp",
|
|
"../TinyRenderer/tgaimage.cpp",
|
|
"../TinyRenderer/our_gl.cpp",
|
|
"../TinyRenderer/TinyRenderer.cpp",
|
|
"../Utils/b3ResourcePath.cpp",
|
|
"../Utils/b3ResourcePath.cpp",
|
|
"../Utils/b3ResourcePath.h",
|
|
"../RenderingExamples/TimeSeriesCanvas.cpp",
|
|
"../RenderingExamples/TimeSeriesFontData.cpp",
|
|
"../MultiBody/InvertedPendulumPDControl.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinystr.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinyxml.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinyxmlerror.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinyxmlparser.cpp",
|
|
"../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp",
|
|
"../ThirdPartyLibs/Wavefront/tiny_obj_loader.h",
|
|
"../Importers/ImportColladaDemo/LoadMeshFromCollada.cpp",
|
|
"../Importers/ImportObjDemo/LoadMeshFromObj.cpp",
|
|
"../Importers/ImportObjDemo/Wavefront2GLInstanceGraphicsShape.cpp",
|
|
"../Importers/ImportURDFDemo/BulletUrdfImporter.cpp",
|
|
"../Importers/ImportURDFDemo/MyMultiBodyCreator.cpp",
|
|
"../Importers/ImportURDFDemo/URDF2Bullet.cpp",
|
|
"../Importers/ImportURDFDemo/UrdfParser.cpp",
|
|
"../Importers/ImportURDFDemo/urdfStringSplit.cpp",
|
|
"../Importers/ImportMeshUtility/b3ImportMeshUtility.cpp",
|
|
"../ThirdPartyLibs/stb_image/stb_image.cpp",
|
|
}
|
|
|
|
if os.is("Linux") then initX11() end
|
|
|
|
if os.is("MacOSX") then
|
|
links{"Cocoa.framework"}
|
|
end
|
|
|
|
|
|
project "App_InverseDynamicsExampleTinyRenderer"
|
|
|
|
if _OPTIONS["ios"] then
|
|
kind "WindowedApp"
|
|
else
|
|
kind "ConsoleApp"
|
|
end
|
|
defines {"B3_USE_STANDALONE_EXAMPLE"}
|
|
|
|
includedirs {"../../src"}
|
|
|
|
links {
|
|
"BulletInverseDynamicsUtils", "BulletInverseDynamics","BulletDynamics","BulletCollision", "LinearMath", "Bullet3Common"
|
|
}
|
|
|
|
language "C++"
|
|
|
|
files {
|
|
"InverseDynamicsExample.cpp",
|
|
"*.h",
|
|
"../StandaloneMain/main_tinyrenderer_single_example.cpp",
|
|
"../OpenGLWindow/SimpleCamera.cpp",
|
|
"../ExampleBrowser/CollisionShape2TriangleMesh.cpp",
|
|
"../TinyRenderer/geometry.cpp",
|
|
"../TinyRenderer/model.cpp",
|
|
"../TinyRenderer/tgaimage.cpp",
|
|
"../TinyRenderer/our_gl.cpp",
|
|
"../TinyRenderer/TinyRenderer.cpp",
|
|
"../Utils/b3ResourcePath.cpp",
|
|
"../Utils/b3ResourcePath.cpp",
|
|
"../Utils/b3ResourcePath.h",
|
|
"../RenderingExamples/TimeSeriesCanvas.cpp",
|
|
"../RenderingExamples/TimeSeriesFontData.cpp",
|
|
"../MultiBody/InvertedPendulumPDControl.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinystr.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinyxml.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinyxmlerror.cpp",
|
|
"../ThirdPartyLibs/tinyxml2/tinyxmlparser.cpp",
|
|
"../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp",
|
|
"../ThirdPartyLibs/Wavefront/tiny_obj_loader.h",
|
|
"../Importers/ImportColladaDemo/LoadMeshFromCollada.cpp",
|
|
"../Importers/ImportObjDemo/LoadMeshFromObj.cpp",
|
|
"../Importers/ImportObjDemo/Wavefront2GLInstanceGraphicsShape.cpp",
|
|
"../Importers/ImportURDFDemo/BulletUrdfImporter.cpp",
|
|
"../Importers/ImportURDFDemo/MyMultiBodyCreator.cpp",
|
|
"../Importers/ImportURDFDemo/URDF2Bullet.cpp",
|
|
"../Importers/ImportURDFDemo/UrdfParser.cpp",
|
|
"../Importers/ImportURDFDemo/urdfStringSplit.cpp",
|
|
"../Importers/ImportMeshUtility/b3ImportMeshUtility.cpp",
|
|
"../ThirdPartyLibs/stb_image/stb_image.cpp",
|
|
}
|
|
|