Commit Graph

6552 Commits

Author SHA1 Message Date
Benelot
ea850d1bf1 Merge remote-tracking branch 'upstream/master' 2018-05-22 15:44:10 +02:00
erwincoumans
f74110a4c0
Merge pull request #1695 from erwincoumans/master
Fix Issue #1623, SphereTriangleDetector
2018-05-22 16:40:45 +10:00
Erwin Coumans
62d58259bc Fix Issue #1623, SphereTriangleDetector for cases with positive contactBreakingThreshold and where sphere was intersecting with multiple edges
(need to take the closest edge)

Thanks to Andrea Catania for the report and reproduction case!
2018-05-22 08:36:00 +10:00
erwincoumans
c491141a1f
Merge pull request #1692 from erwincoumans/master
fix HalfCheetahBulletEnv-v0, other PyBullet improvements
2018-05-20 15:04:24 +10:00
Erwin Coumans
2ac8c7009d bump up pybullet version to 1.9.9 2018-05-20 15:03:58 +10:00
Erwin Coumans
a7a6e20d9c Merge branch 'master' of https://github.com/erwincoumans/bullet3 2018-05-20 14:19:49 +10:00
Erwin Coumans
90939279f9 PyBullet: cmake build, enable DBUILD_PYBULLET_NUMPY=ON
fix issue with HalfCheetahBulletEnv-v0 in previous commit
2018-05-20 14:18:53 +10:00
Erwin Coumans
964f52f62d remove unsupported simpleHumanoid.py, use env = gym.make("HumanoidBulletEnv-v0") instead. 2018-05-20 12:35:33 +10:00
Erwin Coumans
0b2c9ea645 PyBullet: avoid a crash in SHARED_MEMORY_SERVER 2018-05-20 12:20:06 +10:00
erwincoumans
c8dc4dc756
Merge pull request #1690 from erwincoumans/master
Fix for issue #1643, bump up PyBullet version to 1.9.8
2018-05-18 17:29:59 -07:00
Erwin Coumans
ea10c59a3d bump up PyBullet version to 1.9.8 2018-05-18 16:26:45 -07:00
Erwin Coumans
bcd209fd93 Merge remote-tracking branch 'bp/master' 2018-05-18 16:25:40 -07:00
Erwin Coumans
701b50ec12 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2018-05-18 16:25:27 -07:00
Erwin Coumans
0abe4151e5 Fix for 1643, allow to instantiate multiple PyBullet Gym environments (Ant, Humanoid, Hopper, Pendula etc) in the same process (same or other thread). It uses the pybullet_utils.bullet_client to achieve this. 2018-05-18 16:23:54 -07:00
erwincoumans
f90bd1f713
Merge pull request #1688 from erwincoumans/master
workaround for an out-of-date tinyxml2 version
2018-05-17 13:49:49 -07:00
Erwin Coumans
ff646fbef2 workaround for an out-of-date tinyxml2 version 2018-05-17 12:18:17 -07:00
erwincoumans
83a34d8ae2
Merge pull request #1663 from vsaulue/fix-doxygen
Fix some Doxygen comments in btMatrix3x3.
2018-05-16 17:02:23 -07:00
erwincoumans
8f4d1e722e
Merge pull request #1686 from yuchenericwu2/master
Expose CFM parameters
2018-05-16 16:18:45 -07:00
erwincoumans
4c4cf11667
Merge pull request #1687 from erwincoumans/master
fix VR controllers only visible in one eye
2018-05-16 14:53:06 -07:00
erwincoumans
034dfba3ae fix VR controllers only visible in one eye (remove stray glClear for testing planar reflection)
PyBullet: force both contactStiffness and contactDamping (report error otherwise)
2018-05-16 14:24:12 -07:00
Yuchen Wu
f03ae5a857 Expose CFM parameters in PhysicsClient.
Add b3PhysicsParamSetDefaultGlobalCFM() and
b3PhysicsParamSetDefaultFrictionCFM().
2018-05-16 13:46:19 -07:00
Yuchen Wu
653f592ddc
Merge pull request #1 from bulletphysics/master
Merge from upstream
2018-05-16 13:44:15 -07:00
erwincoumans
b432daed65 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2018-05-16 12:11:29 -07:00
erwincoumans
0ca2c5f925 use Bullet3Common/b3AlignedObjectArray.h instead of LinearMath version in SharedMemory/PhysicsClientSharedMemory 2018-05-16 12:10:34 -07:00
erwincoumans
f99260413d
Merge pull request #1684 from erwincoumans/master
BulletInverseDynamics: Fix propagation of user_int and user_ptr when …
2018-05-16 09:08:30 -07:00
erwincoumans
382a08e373
Merge pull request #1682 from lunkhound/pr-solver-col-body-fix
constraint solvers: fix crash for collision-bodies with incorrect flags
2018-05-16 08:41:57 -07:00
Erwin Coumans
28b86ba0a4 fix some tsan issues (thread sanitizer) 2018-05-16 08:32:21 -07:00
Erwin Coumans
75bff86dba Merge remote-tracking branch 'bp/master' 2018-05-16 08:31:20 -07:00
Erwin Coumans
d17d496f97 fix potential asan/tsan issue 2018-05-15 13:24:28 -07:00
Erwin Coumans
703767c6f3 BulletInverseDynamics: Fix propagation of user_int and user_ptr when creating MultiBodyTree.
The user_ptr and user_int arguments passed to addBody were stored in the cache, but not propagated to the MultiBodyTree when finalizing it.

Thanks to Thomas Buschmann for the fix.
2018-05-14 07:34:49 -07:00
Lunkhound
4254837170 solvers: remove erroneous 'break' statement that can occur with incorrectly flagged objects; also added asserts to warn when incorrectly flagged objects are detected 2018-05-12 19:54:39 -07:00
erwincoumans
5ed461f512
Merge pull request #1683 from erwincoumans/master
fix PyBullet.applyExternalTorque for links, expose jointFeedbackMode, improve  PyBullet combineUrdf.py performance
2018-05-11 20:40:46 -07:00
erwincoumans
e5a9b42f9a expose PyBullet.setPhysicsEngineParameter(jointFeedbackMode)
use p.JOINT_FEEDBACK_IN_JOINT_FRAME if you want the joint feedback expressed in joint frame (instead of link inertial frame)
use p.JOINT_FEEDBACK_IN_WORLD_SPACE if you want the joint feedback in world space coordinates, instead of local link/joint coordinates.
Example: p.setPhysicsEngineParameter(jointFeedbackMode=p.JOINT_FEEDBACK_IN_WORLD_SPACE+p.JOINT_FEEDBACK_IN_JOINT_FRAME)
2018-05-11 19:52:06 -07:00
erwincoumans
1ec24a0853 fix PyBullet.applyExternalTorque for links (instead of base) 2018-05-11 19:35:27 -07:00
Lunkhound
8d5cd1c324 constraint solvers: fix crash for collision-bodies with incorrect flags 2018-05-11 17:47:08 -07:00
Erwin Coumans
e86d11f7b9 PyBullet combineUrdf, make createMultiBody much faster, by temporarily disabling rendering 2018-05-10 20:52:51 -07:00
erwincoumans
282154f377
Merge pull request #1680 from erwincoumans/master
PyBullet TinyRenderer, fix cylinder, colors for programmatic created models (PyBullet.createMultiBody), UrdfEditor: fix indentation
2018-05-10 19:08:37 -07:00
erwincoumans
06a23ecd6d PyBullet TinyRenderer, fix cylinder (don't add caps like a capsule), also convert colors stored in visual shapes, if needed. 2018-05-10 18:37:48 -07:00
erwincoumans
e488603603 UrdfEditor: fix indentation, causing an issue when a link had no collision shape but visual shapes 2018-05-10 18:05:50 -07:00
erwincoumans
50cca1013b
Merge pull request #1679 from erwincoumans/master
fix MSVC 2010 compile issue, fix urdfEditor: scale  issues
2018-05-10 16:27:21 -07:00
erwincoumans
80bab22b9c urdfEditor: add euler -> quaternion conversions (otherwise orientations get silently ignored)
urdfEditor: move combine code into UrdfEditor.joinUrdf
urdfEditor: Fix geom_length
2018-05-10 15:08:00 -07:00
erwincoumans
3116cd82da fix MSVC 2010 compile issue
urdfEditor: fix scale incorrectly saved in urdfEditor.saveUrdf
urdfEditor: fix linkMeshScaleArray in wrong location
2018-05-10 12:04:13 -07:00
erwincoumans
928acbfe62
Merge pull request #1678 from erwincoumans/master
PyBullet urdfEditor improvements
2018-05-09 11:12:21 -07:00
Erwin Coumans
a0e72b2ae3 Merge branch 'master' of https://github.com/erwincoumans/bullet3
# Conflicts:
#	examples/pybullet/gym/pybullet_utils/examples/combineUrdf.py
2018-05-09 10:29:20 -07:00
Erwin Coumans
414b3ef9bb PyBullet urdfEditor improvements: saveUrdf mesh scale, fix incorrect index, add getCameraImage in examples/combineUrdf.py 2018-05-09 10:28:12 -07:00
Erwin Coumans
be7c6ac967 PyBullet add getCameraImage to debug urdfEditor/createMultiBody 2018-05-08 23:23:53 -07:00
Erwin Coumans
1e51e2b859 tweaks in urdfEditor.py and combineUrdf.py, put KUKA on top of Husky as test. 2018-05-08 23:14:39 -07:00
Erwin Coumans
2d1689cba5 add example to joint two URDF files, using the urdfEditor (combineUrdf.py) 2018-05-08 17:18:58 -07:00
Erwin Coumans
d436be1d79 add __init__.py for pybullet_utils examples 2018-05-08 13:31:30 -07:00
Erwin Coumans
ad43de285c add bullet_client.py to pybullet_utils, with simple example 2018-05-08 10:12:19 -07:00