Commit Graph
100 Commits
Author SHA1 Message Date
erwincoumans ef19248daf Update URDFImporterInterface.h 2016-05-24 10:30:04 -07:00
Erwin Coumans 9bd88e5727 move some easy-to-use build files for Mac OSX, Linux and Windows
in the root directory.
2016-05-21 10:45:08 -07:00
erwincoumans 43fa1622aa Merge pull request #631 from artoowang/master
Fixed btAssert warning message on printf in MSVC.
2016-05-17 21:03:37 -07:00
erwincoumans fd5bca1bab Merge pull request #628 from erwincoumans/master
Small refactoring for ExampleBrowser, Remove unused ROS urdf (was replaced by Bullet UrdfParser.
2016-05-14 10:11:01 -07:00
Erwin Coumans 578e4fc795 compile fixes 2016-05-13 22:10:18 -07:00
Erwin Coumans f4a6b0cb9f move InProcessExampleBrowser.cpp into App instead of Lib 2016-05-13 21:10:16 -07:00
erwincoumans c5f2264a2b Merge pull request #627 from simotek/master
Fix bullet.pc when built with CMAKE_INSTALL_PREFIX #626
2016-05-12 20:26:49 -07:00
erwincoumans 257c1425d7 Merge pull request #625 from YunfeiBai/master
SDF parser
2016-05-11 19:22:43 -07:00
erwincoumans 119d47166d Update test.py 2016-05-10 01:28:45 -07:00
erwincoumans 15ce069c04 Update test.py 2016-05-10 01:26:13 -07:00
erwincoumans 9ba3a844c0 Update test.py 2016-05-10 01:24:40 -07:00
erwincoumans 94fe96e2b4 Update test.py 2016-05-10 01:13:19 -07:00
erwincoumans bad3ff9699 Merge pull request #624 from erwincoumans/master
Allow to compile pybullet on Windows, using CMake
2016-05-10 01:12:00 -07:00
erwincoumans fa043429fe Merge pull request #623 from erwincoumans/master
add initial SDF importer, work-in-progress (still too incomplete to b…
2016-05-09 21:37:36 -07:00
erwincoumans 95541cad4f Merge pull request #622 from erwincoumans/master
copy the data folder into the cmake build directory, for the ExampleB…
2016-05-09 14:21:11 -07:00
erwincoumans fe4fd4169c Merge pull request #620 from erwincoumans/master
Added new tutorial sources, thanks to Mobeen
2016-05-08 12:34:11 -07:00
erwincoumans 13734de2c2 Merge pull request #621 from benelot/master
Add missing m_callback call in SliderMove()
2016-05-08 11:47:33 -07:00
erwincoumans 8a68e27bb7 move the RigidBodyFromObj to Importers section. 2016-05-07 16:36:14 -07:00
erwincoumans db4fb750bc Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-05-07 16:19:43 -07:00
erwincoumans 5151519b94 https://github.com/bulletphysics/bullet3/pull/618 by Mobeen
Summary of changes:
1) Changed include paths to be relative to the current sources (affected
files: LoadMeshFromObj.cpp, Wavefront2GLInstanceGraphicsShape.h/cpp)
2) Added new tutorials in the ExtendedTutorials folder
3) Modified the main_opengl_single_example.cpp file to enable picking
support in standalone demos
2016-05-06 15:07:54 -07:00
erwincoumans d26ee33433 Merge pull request #619 from erwincoumans/master
make standalone versions (console, tinyrender, opengl) of InverseDynamics/InverseDynamicsExample
2016-05-06 14:38:12 -07:00
erwincoumans ec5806a979 Merge pull request #614 from erwincoumans/master
add BasicExampleGui for cmake, preliminary pybullet
2016-05-04 00:35:34 -07:00
erwincoumans 50d86b98ff Merge pull request #612 from cirosantilli/hello-world
Improve HelloWorld
2016-05-03 21:43:08 -07:00
erwincoumans 927d846bb0 Merge pull request #611 from erwincoumans/master
add initial Python pybullet module, using the shared memory C API
2016-05-01 15:59:30 -07:00
erwincoumans 5351b20f9d Merge pull request #609 from AndrewMeadows/ccd-fix-4
optimize CCD against btCompoundShapes with dynamicAabbTree
2016-04-30 11:22:36 -07:00
Erwin Coumans 1d0f038aad add initial pybullet module, using the shared memory API
(for now, start the example browser in 'physics server',
then compile using premake --python option,
then run python in the bin folder (so it finds pybullet.so)
and run the test.py script in examples/pybullet folder.
The robotics shared memory C API is very suitable for this.
2016-04-30 11:18:54 -07:00
erwincoumans f646ea8f31 Merge pull request #610 from erwincoumans/master
expose the local inertial frame for each link in the shared memory API
2016-04-29 15:21:27 -07:00
Erwin Coumans 1635a9d594 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-04-28 23:13:43 -07:00
Erwin Coumans ec914b08e7 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-04-28 23:13:35 -07:00
Erwin Coumans 0cef8347c5 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-04-28 23:04:29 -07:00
erwincoumans cc9b5ff479 Merge pull request #608 from erwincoumans/master
add example to use BasicDemo with an OpenGL Window, without example b…
2016-04-27 14:30:11 -07:00
erwincoumans d5d8e16fb0 Merge pull request #607 from erwincoumans/master
add TinyRenderer software renderer
2016-04-26 21:31:23 -07:00
Erwin Coumans 924456548e fix build, add premake4.lua 2016-04-26 21:08:02 -07:00
erwincoumans a080a568f2 Update main.cpp
remove unused variable
2016-04-25 09:42:16 -07:00
erwincoumans 66bfb7e708 Update PhysicsClientC_API.cpp
fix a copy/paste bug -> pos+quat = 7, but pos is just 3
2016-04-25 09:37:04 -07:00
erwincoumans 190622ed9e Merge pull request #606 from erwincoumans/master
expose multibody link world transform in the shared memory API
2016-04-23 17:53:45 -07:00
erwincoumans 765da64e59 Merge pull request #605 from erwincoumans/master
fix text rendering (uninitialized uniforms)
2016-04-23 15:38:22 -07:00
Erwin Coumans 16cbc191bd Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-04-23 11:06:49 -07:00
Erwin Coumans d8da00aa35 re-enable Wavefront .obj loader 2016-04-23 11:06:34 -07:00
erwincoumans fe5899ebfc Merge pull request #604 from erwincoumans/master
rename m_jointForce -> m_jointMotorForce to separate the name from m_…
2016-04-19 13:06:12 -07:00
erwincoumans 05845d7df9 Merge pull request #602 from erwincoumans/master
handle window closing in InProcessPhysicsClientSharedMemoryMainThread
2016-04-19 10:58:13 -07:00
erwincoumans 9fa7356d28 Merge pull request #603 from YunfeiBai/master
Add measured joint motor force to joint sensor state.
2016-04-19 10:57:56 -07:00
erwincoumans f05bef2ea3 Merge pull request #601 from erwincoumans/master
fix scaling in URDF importer
2016-04-18 21:57:01 -07:00
erwincoumans 889a113cca Merge pull request #598 from erwincoumans/master
run GUI on main thread for Mac OSX/__APPLE__, due to OS limitation
2016-04-14 12:56:44 -07:00
erwincoumans 4dfbd2525f Merge pull request #597 from erwincoumans/master
add joint damping in PhysicsServerCommandProcessor, add some comments
2016-04-13 17:35:44 -07:00
erwincoumans 5181592459 Merge pull request #595 from erwincoumans/master
add a few lines of documentation and some error checks in SharedMemor…
2016-04-13 13:43:52 -07:00
erwincoumans 31eb3ea7c3 Merge pull request #594 from erwincoumans/master
fix some memory leaks in ImportURDF / PhysicsServerCommandProcessor
2016-04-11 17:00:13 -07:00
erwincoumans 920af5e127 Merge pull request #591 from erwincoumans/master
re-enable command log and playback in physics server, report applied motor torque
2016-04-08 18:29:01 -07:00
erwincoumans 0c1a4551c4 Merge pull request #587 from erwincoumans/master
fix char -> int, to allow check with -1, some build systems fail
2016-03-31 16:28:43 -07:00
erwincoumans d5aa09cee5 Merge pull request #586 from erwincoumans/master
premake: disable linking system OpenGL and X11 by default,
2016-03-30 22:00:17 -07:00
erwincoumans df3ddaca5e Merge pull request #585 from erwincoumans/master
btMultiBody joint friction/damping infrastructure
2016-03-17 16:29:40 -07:00
Erwin Coumans 937b6d84e5 re-enable --enable_experimental_opencl flag for
premake build of App_BulletExampleBrowser
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
2016-03-16 09:02:39 -07:00
Erwin Coumans 6c9815c8f9 fix axis in r2d2.urdf
enable SimpleOpenGL3 demo for CMake
2016-03-16 08:13:53 -07:00
erwincoumans 857a4e98e8 Merge pull request #584 from erwincoumans/master
turn test/SharedMemory/test.c into a gtest for CI unit testing in github
2016-03-15 23:15:18 -07:00
erwincoumans bc0717e3de Merge pull request #583 from erwincoumans/master
fixes in SharedMemory unit test, premake build issue on Linux
2016-03-15 19:08:27 -07:00
erwincoumans 2ef8669e75 Merge pull request #581 from erwincoumans/master
Use higher precision GJK/EPA collision tolerances in double precision mode. Fix Lua example
2016-03-12 08:58:16 -08:00
erwincoumans de3b6c31c1 Merge pull request #560 from bmcorser/patch-1
Typo in README
2016-03-10 23:42:20 -08:00
erwincoumans 4113293301 Merge pull request #580 from hujiajie/master
Fix ternary selection operator on float scalars in OpenCL kernels.
2016-03-10 23:37:55 -08:00
erwincoumans c30c10b906 Merge pull request #579 from erwincoumans/master
Allow InProcessExampleBrowser to use a malloc allocated memory block,…
2016-03-10 15:07:40 -08:00
erwincoumans 67c538413f Merge pull request #576 from hujiajie/master
The 'static' storage-class specifier is not supported in OpenCL.
2016-03-10 14:34:06 -08:00
erwincoumans 7a48b2d481 Merge pull request #578 from erwincoumans/master
quick draft implementation for SharedMemoryInProcessPhysicsC_API
2016-03-07 16:49:44 -08:00
erwincoumans 51970941b4 Merge pull request #577 from MichaelKorn/patch-1
fix for issue in getAngleShortestPath()
2016-03-04 15:03:04 -08:00
erwincoumans 03e85ad5a8 Merge pull request #575 from erwincoumans/master
add InProcessExampleBrowser to make it easy to instantiate the Exampl…
2016-03-03 11:31:07 -08:00
erwincoumans 23f39afc62 Merge pull request #574 from erwincoumans/master
only enable Wavefront obj support for URDF when ENABLE_URDF_OBJ is defined. enable CrossSplitter.cpp
2016-03-01 10:12:19 -08:00
erwincoumans a8d9582023 Merge pull request #572 from erwincoumans/master
fix some warnings
2016-02-29 17:47:24 -08:00
erwincoumans 8764357fa8 Merge pull request #570 from erwincoumans/master
re-quantize for before using the data in quantize method
2016-02-24 18:22:31 -08:00
erwincoumans 3d95133ed1 Merge pull request #568 from erwincoumans/master
allow soft (compliant) contact for btRigidBody and btMultiBody using ERP/CFM.
2016-02-23 08:38:09 -08:00
erwincoumans d196cec51f Update RigidBodySoftContact.cpp
fix typo
2016-02-23 08:02:28 -08:00
erwin coumans 645a88176d Enable softness for btRigidBody contacts. This is implemented by some value (CFM, constraint force mixing) to the main diagonal of A.
CFM for contacts use world CFM value by default, and can override with custom CFM value using the
BT_CONTACT_FLAG_HAS_CONTACT_CFM stored in m_contactPointFlags.
Boolean m_lateralFrictionInitialized is replaced 'BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED' flag stored in int m_contactPointFlags in btManifoldPoint.
Enable successive over-relaxation parameter (SOR) for contacts. btMLCPSolver uses global CFM.
In one of the next commits, contact softness will be enabled btMultiBody contacts.
Also need to review use of CFM in btMLCPSolvers (only world CFM is used at the moment)
2016-01-22 17:43:36 -08:00
erwincoumans 2fb92bc40c Merge pull request #557 from erwincoumans/master
add a Pendulum example that is also used as unit test.
2016-01-08 14:36:41 -08:00
Erwin Coumans 6bc3f94f52 add a Pendulum example that is also used as unit test.
Gold data is created by numerically solving a second-order non-linear differential equation.
(see examples/MultiBody/pendulum_gold.h)
2016-01-06 18:08:49 -08:00
erwincoumans e136c29a5a Merge pull request #551 from erwincoumans/master
fixes in test/SharedMemory
2015-12-15 14:00:57 -08:00
erwincoumans c52abafb89 Merge pull request #549 from erwincoumans/master
minor cmake fixes for Linux related to X11/OpenGL headers
2015-12-08 14:29:28 -08:00
Erwin Coumans 46ddfa39d7 remove unused function in btRigidBody (btSetCrossMatrixMinus)
thanks to Stefan for reporting.
2015-12-08 07:54:19 -08:00
erwincoumans ab283251d3 Merge pull request #546 from erwincoumans/master
typo fixes in InverseDynamicsExample
2015-12-07 15:07:24 -08:00
erwincoumans 83c560262b Merge pull request #548 from AndrewMeadows/fix-cmake-whitespace
fix whitespace formatting in cmake files
2015-12-07 15:06:59 -08:00
erwincoumans 4894cb3a38 Merge pull request #547 from AndrewMeadows/fix-cmake-sans-bullet3
fix cmake to succeed with -DBUILD_BULLET3=0
2015-12-07 15:06:32 -08:00
erwincoumans aaf4e1acfa Merge pull request #491 from nicokruithof/master
Fixed missing include directories
2015-12-04 21:49:47 -08:00
erwincoumans 6c67426b6d Merge pull request #544 from AndrewMeadows/premake-cleanup
cleanup main premake script
2015-12-04 08:45:56 -08:00
erwincoumans 01c4720d62 Merge pull request #543 from erwincoumans/master
remove dependency on gflags, C++11 in test_invdyn_bullet
2015-12-03 09:16:44 -08:00
erwincoumans 88d504d946 Merge pull request #542 from erwincoumans/master
show inverse dynamics demo to use floating base
2015-12-02 10:08:46 -08:00
erwincoumans 7d49b65939 Merge pull request #538 from erwincoumans/master
add BT_DECLARE_ALIGNED_ALLOCATOR() for btTypedConstraint
2015-12-01 18:58:31 -08:00
Erwin Coumans 5da9e37a05 add BT_DECLARE_ALIGNED_ALLOCATOR() for btTypedConstraint 2015-11-26 12:43:10 -08:00
erwincoumans 0f8d94b3ef Merge pull request #536 from erwincoumans/master
joint trajectory curves use different colors for each DOF
2015-11-26 11:06:45 -08:00
Erwin Coumans 4c88681479 joint trajectory curves use different colors for each DOF
use fewer notch counts in slider GUI
2015-11-26 10:45:51 -08:00
erwincoumans 346308120a Merge pull request #535 from erwincoumans/master
add collision and inverse dynamics unit tests to cmake, .travis.yml a…
2015-11-24 18:06:18 -08:00
erwincoumans 0e247264ff use BT_ID_MAX as std::max is not portable (older Visual Studio versions break) 2015-11-24 17:34:43 -08:00
erwincoumans ff74884f9f more appveyor fun 2015-11-24 17:15:35 -08:00
erwincoumans d8ee7e4dbc attempt to fix appveyor.yml (both build project for premake4 and build_script for cmake, does that work? 2015-11-24 17:13:58 -08:00
erwincoumans 1826f11fbc add pthread dependency for gtest-based tests for non-Windows platforms 2015-11-24 16:54:04 -08:00
erwincoumans 4c3d32bf48 tab->space 2015-11-24 16:15:23 -08:00
erwincoumans e387baf213 add collision and inverse dynamics unit tests to cmake, .travis.yml and appveyor.yml
(more unit tests will follow, once this setup works)
2015-11-24 16:13:21 -08:00
erwincoumans a14a695bc7 Merge pull request #534 from erwincoumans/master
fix shared lib build
2015-11-24 12:32:14 -08:00
Erwin Coumans 1f4148d322 fix shared lib build 2015-11-24 12:05:50 -08:00
erwincoumans 22e8dc9911 Merge pull request #533 from erwincoumans/master
fix example issues
2015-11-24 11:50:08 -08:00
Erwin Coumans 5f97a56f93 portability issues fixed 2015-11-24 11:40:33 -08:00
Erwin Coumans 460998c472 fix example issues 2015-11-24 11:34:17 -08:00
erwincoumans af142de5b8 Merge pull request #532 from erwincoumans/master
add InverseDynamics example for example browser
2015-11-24 11:27:34 -08:00
erwincoumans c755299861 Merge pull request #531 from erwincoumans/master
add physics server loopback (same process, using shared memory) and direct (same process, directly executing commands not using shared memory)
2015-11-23 08:09:46 -08:00
erwincoumans bd4c4eb3c5 rename API->Api 2015-11-22 21:32:20 -08:00