Commit Graph

5274 Commits

Author SHA1 Message Date
Erwin Coumans
f090752cbb bump up VISUAL_SHAPE_MAX_PATH_LEN from 128 to 1024, some google3 directories are loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong :-) 2017-05-25 10:56:01 -07:00
Erwin Coumans
143a8dd239 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-05-24 19:57:53 -07:00
Erwin Coumans
40db4998b9 Merge remote-tracking branch 'bp/master' 2017-05-24 19:57:28 -07:00
Erwin Coumans
9743bb387c give some pure-virtual methods default empty implementation, avoid breaking some internal research code 2017-05-24 19:30:06 -07:00
Erwin Coumans
1af8939fd2 fix unused variables 2017-05-24 16:44:43 -07:00
erwincoumans
5103f3b72d Merge pull request #1146 from jietan/pullRequest
Pull request to update to the latest minitaur agent and env
2017-05-24 16:26:17 -07:00
erwincoumans
044ac8d10b Merge pull request #1145 from erwincoumans/master
Improve debug text/line rendering, can be use to draw frames and text  in local coordinate of an object / link.
2017-05-24 14:09:17 -07:00
Erwin Coumans
84d09cc18f Split CommonGfxVertex3D into two different ones, GfxVertexFormat0 and GfxVertexFormat1
Rewrite  GLInstancingRenderer::drawTexturedTriangleMesh
2017-05-24 13:05:16 -07:00
Jie Tan
1d0db4ec2e update to the latest agent and environment. 2017-05-24 11:20:42 -07:00
Erwin Coumans
344bb3f350 fix premake4.lua build file 2017-05-24 10:29:22 -07:00
Erwin Coumans
5e2599863d trackObject -> parentObject
trackLinkIndex -> parentLinkIndex
add example debugDrawItems.py
2017-05-24 09:06:15 -07:00
Erwin Coumans
9f7d7fecd5 more rendering fixes 2017-05-23 23:34:55 -07:00
Erwin Coumans
df1b5b6ca5 fix shader issue 2017-05-23 23:17:57 -07:00
Erwin Coumans
2d04d39fcf bump up pybullet version, include <string.h> for memset 2017-05-23 22:41:08 -07:00
Erwin Coumans
0f63e7a2f6 Merge remote-tracking branch 'bp/master' 2017-05-23 22:06:07 -07:00
Erwin Coumans
7bb802a91b Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-05-23 22:05:38 -07:00
Erwin Coumans
db008ab3c2 Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-23 22:05:26 -07:00
Jie Tan
18fd1a003f remove redundant and potentially confusing data 2017-05-23 16:34:13 -07:00
erwincoumans
4f3d60f4d0 Merge pull request #1142 from jietan/pullRequest
add back sonnet dependency. If sonnet is not installed, fall back to …
2017-05-23 10:05:36 -07:00
erwincoumans
f63ca87049 Merge pull request #1143 from YunfeiBai/master
Add kuka grasping block playback.
2017-05-23 10:05:15 -07:00
yunfeibai
dacdcb0508 Add the pybullet example. 2017-05-22 22:26:57 -07:00
yunfeibai
d383799d97 Merge remote-tracking branch 'upstream/master' 2017-05-22 22:23:55 -07:00
yunfeibai
3eb974f66f Add kuka grasping block playback. 2017-05-22 22:23:01 -07:00
Jie Tan
671c4bf10e add back sonnet dependency. If sonnet is not installed, fall back to simpleAgent that does not need sonnet. 2017-05-22 20:57:18 -07:00
erwincoumans
2f3844e5db Merge pull request #1131 from ahundt/cmake
cmake python config bugs fixed
2017-05-22 20:33:45 -07:00
Erwin Coumans
9420ecded3 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-05-21 19:49:26 -07:00
Erwin Coumans
2939c7ae36 Merge remote-tracking branch 'bp/master' 2017-05-21 19:49:09 -07:00
Erwin Coumans
19933a9454 Merge remote-tracking branch 'bp/master' 2017-05-21 12:16:34 -07:00
Erwin Coumans
1ce894b3e9 add main_imgui.cpp 2017-05-21 12:16:27 -07:00
Erwin Coumans
aa2787520b examples\pybullet\examples\humanoid_knee_position_control.py : allow both knees to be actuated against limit 2017-05-21 11:35:06 -07:00
erwincoumans
148716d0ff Merge pull request #1135 from erwincoumans/master
disable Grasp Soft Body/SoftBody coupling demo unless USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD is defined, fixed related hang in experimental 'loadBunny' command
2017-05-21 11:00:43 -07:00
Erwin Coumans
fd40ba424b test for knee joint limits under position control 2017-05-21 11:00:15 -07:00
erwincoumans
3c4fd2ce8c Merge pull request #1132 from ahundt/btsoftbody
btsoftbody fix #1106, compiler error in App_PhysicsServer_SharedMemory
2017-05-21 06:59:40 -07:00
erwincoumans
e0865ee8ed Merge pull request #1133 from lunkhound/pr-remove-dcast
fix a crash in example browser when enabling multi-threading
2017-05-21 06:56:14 -07:00
Erwin Coumans
4dcf2b82b6 bump up pybullet to version 1.0.7 2017-05-21 06:53:06 -07:00
Erwin Coumans
b19c209dbc The softbody/bunny test is very experimental and shouldn't be enabled in the example browser, unless USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD is defined. I fixed a few bugs that cause the hang. 2017-05-21 06:50:53 -07:00
Andrew Hundt
1e83630c1d cmake minor fixes 2017-05-21 09:32:00 -04:00
Lunkhound
5bc9d431a0 CommonRigidBodyMTBase: replace dynamic_cast (which crashes without RTTI) with static_cast 2017-05-21 03:14:09 -07:00
Andrew Hundt
655def023e python versions can vary by default unless EXACT_PYTHON_VERSION=ON
Still ensures library version matches interpreter version exactly.
2017-05-20 21:58:03 -04:00
Andrew Hundt
e719da3497 btsoftbody fix #1106, compiler error in App_PhysicsServer_SharedMemory
BulletSoftBody was not linking to App_PhysicsServer_SharedMemory when USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD was enabled.
2017-05-20 21:14:00 -04:00
Andrew Hundt
263ccec18a cmake python config bugs fixed
Python and pybullet remain optional with these changes.
A specific python version can now be selected by setting PYTHON_VERSION_PYBULLET.
The python library version must now match the interpreter version exactly.
If all required python dependencies are found, pybullet is now enabled by default.
Changes incorporate the following BSD licensed cmake code:
32bf5c7ad8/CMakeScripts/FindNumPy.cmake
https://github.com/NikolausDemmel/CMake/pull/2/files
86578eccf2/Modules/SelectLibraryConfigurations.cmake
2017-05-20 20:47:46 -04:00
erwincoumans
4ba4c11734 Merge pull request #1129 from jietan/pullRequest
remove sonnet dependency
2017-05-18 16:37:49 -07:00
Jie Tan
8a6a46d180 remove sonnet dependency 2017-05-18 16:12:38 -07:00
Erwin Coumans
00a5956dc2 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-05-18 15:10:45 -07:00
Erwin Coumans
16a8dceb73 fix warning 2017-05-18 08:31:40 -07:00
Erwin Coumans
b8e20d502b Merge remote-tracking branch 'bp/master' 2017-05-18 08:31:17 -07:00
Erwin Coumans
6722204296 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-05-18 08:31:08 -07:00
Erwin Coumans
88e81d6712 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-05-17 21:22:30 -07:00
Erwin Coumans
f5d7aac5cc bump up pybullet to 1.0.6, prepare to tag Bullet 2.87 release 2017-05-17 21:21:33 -07:00
erwincoumans
d40787f3fd Merge pull request #1128 from erwincoumans/master
.obj file caching, update VR camera even when setRealTimeSimulation(0) + position-only tracking
2017-05-17 21:19:01 -07:00