Commit Graph

7525 Commits

Author SHA1 Message Date
erwincoumans
d0880a78d5 Merge pull request #2343 from erwincoumans/master
expose heightfield to pybullet, add pybullet_envs.deep_mimic pretrained humanoid3d policies
2019-07-30 09:07:02 -07:00
Erwin Coumans
4429c6dc9e avoid Mac OSX bus error -> no large static arrays 2019-07-29 22:20:45 -07:00
Erwin Coumans
38d56a42de Merge branch 'master' of https://github.com/erwincoumans/bullet3 2019-07-29 20:29:29 -07:00
Erwin Coumans
d58a85fec4 export btHeightfieldTerrainShape to PyBullet. Note that tinyrenderer doesn't support rendering it (it would be too slow on CPU)
fix rare getKeyboardEvents threading issue
change texture color to default plane.urdf blue
2019-07-29 20:29:07 -07:00
Erwin Coumans
51fba6f78d export btHeightfieldTerrainShape to PyBullet. Note that tinyrenderer doesn't support rendering it (it would be too slow on CPU)
fix rare getKeyboardEvents threading issue
change texture color to default plane.urdf blue
2019-07-29 20:23:38 -07:00
Erwin Coumans
4bb5d07e3e pybullet_envs.deep_mimic: add pretrained spinkick model (only trained for 20 million steps, may need more for nicer mimic) 2019-07-29 08:22:57 -07:00
Erwin Coumans
cc2d15cd89 pybullet_envs.deep_mimic add pretrained jump weights 2019-07-29 08:11:15 -07:00
Erwin Coumans
3ba34f45b7 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2019-07-28 18:13:48 -07:00
Erwin Coumans
020e569ece pybullet_envs.deep_mimic add pretrained crawl policy 2019-07-28 18:01:37 -07:00
Erwin Coumans
09bea429f7 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2019-07-28 17:24:37 -07:00
Erwin Coumans
1e21000d07 pybullet_envs.deep_mimic: update humanoid3d_cartwheel pretrained policy 2019-07-28 17:23:54 -07:00
Erwin Coumans
45c393e86e Merge remote-tracking branch 'bp/master' 2019-07-27 10:25:31 -07:00
erwincoumans
d2665d3d80 Merge pull request #2305 from BartMoyaers/parse_contact_bodies
parse fall contact bodies
2019-07-27 10:09:36 -07:00
Erwin Coumans
36f3adc03f copy/move heightfield files around (part of pybullet_data)
prepare for heightfield support in pybullet (first step, needs a bit more)
2019-07-25 13:01:26 -07:00
erwincoumans
c65ce8059f Merge pull request #2337 from erwincoumans/master
fix rotational friction between btMultiBody and btRigidBody
2019-07-25 07:59:42 -07:00
Erwin Coumans
3eedb2a6f2 fix rotational friction between btMultiBody and btRigidBody 2019-07-24 22:07:16 -07:00
erwincoumans
e96f068220 Merge pull request #2335 from erwincoumans/master
fixes for pybullet_envs.deep_mimic and  add example loading heightfield from image and csv
2019-07-23 18:16:13 -07:00
Erwin Coumans
654a91057b remove temp file 2019-07-23 18:15:15 -07:00
Erwin Coumans
a0b7b2a47c add friction_anchor to microtaur.urdf 2019-07-23 18:13:54 -07:00
Erwin Coumans
a42acfbe31 btHeightFieldTerrainShape, init new member
instead height of example terrain
2019-07-23 15:23:11 -07:00
Erwin Coumans
ebde9926a8 add example loading heightfield from image and csv, using assets from DeepLoco (thanks to Jason Peng) and
from this Blender tutorial https://www.beamng.com/threads/tutorial-adding-heightmap-roads-using-blender.16356/
2019-07-23 11:26:31 -07:00
Erwin Coumans
96b76dd107 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2019-07-23 08:51:34 -07:00
Erwin Coumans
bd9fe7afc0 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2019-07-23 07:27:55 -07:00
Erwin Coumans
2e85490b6b deep_mimic: replace retrained backflip policy 2019-07-23 07:27:17 -07:00
Erwin Coumans
bb962bdb6f remove some left-over debugging from deep_mimic
pybullet bump up to 2.5.3
2019-07-22 17:47:02 -07:00
Erwin Coumans
b9d4206053 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2019-07-22 17:19:33 -07:00
Erwin Coumans
b433e07d33 pybullet_envs.deep_mimic: use getLinkStates for faster 'getReward'
pybullet_envs.deep_mimic: add profile timers for each thread to optimize training
2019-07-22 17:18:41 -07:00
Erwin Coumans
6c73aa1e12 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2019-07-22 14:01:00 -07:00
Erwin Coumans
0630c245c8 update walk policy trained using latest PyBullet 2.5.2. Still need to update backflip policy. 2019-07-22 14:00:19 -07:00
Erwin Coumans
66f71256cf Merge remote-tracking branch 'bp/master' 2019-07-22 13:27:03 -07:00
erwincoumans
0aaae87245 Merge pull request #2332 from erwincoumans/master
add laikago urdf with toes (for inverse kinematics, and control over …
2019-07-22 10:28:50 -07:00
Erwin Coumans
213ae06e1f bump up version 2019-07-22 10:01:30 -07:00
erwincoumans
1d59db7c3d Merge pull request #2326 from biller23/patch-2
Fix GCC alignment macros for btScalar.h
2019-07-22 09:35:55 -07:00
Erwin Coumans
bf3696e5b4 fix a leak in previous commit 2019-07-22 09:28:27 -07:00
Erwin Coumans
7ead9cf8ba fix a memory leak in previous commit, in pybullet_resetJointStatesMultiDof 2019-07-22 09:07:19 -07:00
Erwin Coumans
b2825724d4 only if SPD is enabled 2019-07-21 22:03:23 -07:00
Erwin Coumans
8f220c1b23 fix memory leak in previous commit 2019-07-21 21:48:51 -07:00
Erwin Coumans
d82c2043f0 enable useArray for deep_mimic reward 2019-07-21 13:56:10 -07:00
Erwin Coumans
602f736640 Merge remote-tracking branch 'bp/master' 2019-07-21 13:13:52 -07:00
Erwin Coumans
0cf6685041 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2019-07-21 13:13:25 -07:00
Erwin Coumans
39a4e8dcd9 Implement faster array versions of PyBullet: getJointStatesMultiDof, getLinkStates, setJointMotorControlMultiDofArray, resetJointStatesMultiDof,
Implement StablePD in C++ through setJointMotorControlMultiDofArray method for pybullet_envs.deep_mimic, see testHumanoid.py and examples/pybullet/examples/humanoidMotionCapture.py
Minor fix in ChromeTraceUtil in case startTime>endTime (why would it happen?)
2019-07-21 13:08:22 -07:00
erwincoumans
1e6af4261e Update HeightfieldExample.cpp 2019-07-19 14:02:08 -07:00
Erwin Coumans
4732acfcb1 remove tabs from urdf 2019-07-17 12:57:44 -07:00
Erwin Coumans
ac0bfb0bfa remove trailing whitespace 2019-07-17 12:55:13 -07:00
Erwin Coumans
dff277ad7b add laikago urdf with toes (for inverse kinematics, and control over stiffness/damping to model rubber) 2019-07-17 12:30:49 -07:00
biller23
448f0b8bef Fix alignment macros for btScalar.h
As of the merged #2278, but for btScalar.h
2019-07-13 10:53:25 +00:00
erwincoumans
2502a83bd7 Merge pull request #2278 from biller23/patch-1
Fix GCC alignment macros on Windows
2019-07-12 08:39:00 -07:00
erwincoumans
a7a59e2795 Merge pull request #2325 from erwincoumans/master
fix in multi-endeffector IK, calculate jacobian uses dofs without bas…
2019-07-12 08:29:38 -07:00
Erwin Coumans
31688ffb34 fix in multi-endeffector IK, calculate jacobian uses dofs without base, fix premake build of some projects 2019-07-11 22:22:35 -07:00
erwincoumans
d503d1442a Merge pull request #2324 from sanchitgarg/updateReadmeAndGitignore
Update readme and gitignore
2019-07-11 16:08:05 -07:00