Commit Graph

5711 Commits

Author SHA1 Message Date
erwincoumans
6644157815 Merge remote-tracking branch 'bp/master' 2017-09-26 19:55:36 -07:00
erwincoumans
e72ebc95de Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-09-26 19:54:57 -07:00
erwincoumans
8a265b8af2 expose gear erp/relative position target to C-API/pybullet
finish much better C++ vrSyncPlugin, running in-the-loop with the physics at high frequency, see also vr_kuka_setup_vrSyncPlugin.py
2017-09-26 19:54:36 -07:00
erwincoumans
44fc48314e Merge pull request #1339 from erwincoumans/master
add experimental vrSyncPlugin, that syncs the position/orientation of…
2017-09-26 11:42:21 -07:00
Erwin Coumans
b03e5dec5f return -1 for debugDrawItems in DIRECT mode, instead of failing the API 2017-09-26 11:40:38 -07:00
erwincoumans
b1f8eb74a4 bump up shared memory version number
add option to recompute forward kinematics, to be consistent with link velocities in pybullet.getLinkState (..., computeForwardKinematics=0/1), thanks to Jeff Bingham for bringing up this inconsistency
2017-09-26 10:05:17 -07:00
erwincoumans
270a036cd7 add experimental vrSyncPlugin, that syncs the position/orientation of a vr controller to a gripper (through a constraint)
This is in C++ and the sync runs at the simulation speed (240 Hz), so there is less lag than in Python.
Modify the pybullet/examples/vr_kuka_setup.py at the end to do this:

plugin = p.loadPlugin("e:/develop/bullet3/bin/pybullet_vrSyncPlugin_vs2010_x64_release.dll")
controllerId = 3
p.executePluginCommand(plugin ,"bla", [controllerId,pr2_cid],[50])
2017-09-25 18:14:50 -07:00
erwincoumans
4655e9d83c Merge pull request #1338 from erwincoumans/master
pybullet changeVisualShape texture fix, MSVC compile error
2017-09-25 12:21:45 -07:00
erwincoumans
6d68a67c79 fix a bug in a changeVisualShape/texture selection, out-of-bounds check was using the wrong array.
May fix some internal texture mug bug.
2017-09-25 11:11:48 -07:00
erwincoumans
3f68b2ebf7 Merge pull request #1337 from erwincoumans/master
tweak pybullet examples, fix a few warnings
2017-09-25 09:33:28 -07:00
erwincoumans
0f30c95734 fix a compile error on Windows (variables need to be declared together at the start of a block in C) 2017-09-25 07:38:00 -07:00
Erwin Coumans
d3d1b51c3a fix compile warnings 2017-09-24 23:26:06 -07:00
Erwin Coumans
705a59ea73 Merge remote-tracking branch 'bp/master' 2017-09-24 22:50:55 -07:00
Erwin Coumans
a3552e4931 tMerge branch 'master' of https://github.com/erwincoumans/bullet3 2017-09-24 22:50:37 -07:00
erwincoumans
27674e5289 Update b3PluginManager.cpp
pre/post tick were wrong order in initializer list
2017-09-24 22:39:20 -07:00
Erwin Coumans
2d91e13886 tweak pybullet examples a bit (mac OSX OpenGL runs in mainloop, with python interpreter,
so it needs some 'ping' command
bump up pybullet to version 1.4.6
2017-09-24 21:37:31 -07:00
erwincoumans
83805da531 Merge pull request #1336 from bingjeff/fix_bugs_in_jacobian
[sharedmemory] Fill-out calculateJacobian command.
2017-09-24 21:15:42 -07:00
erwincoumans
f88973f832 Merge pull request #1286 from mendsley/clean_vbt_allocations
Optimize Dbvt trees in place
2017-09-24 20:35:57 -07:00
Jeffrey Bingham
ee30ca93c5 [sharedmemory] Fill-out calculateJacobian command.
The server command processor actually didn't do anything with
the local point that was passed along with the calculateJacobian
command. Added in the necessary bit of math to return the
corresponding jacobian.

Also, fixed a typo in pybullet that was returning the same
jacobian for translation and rotation.
2017-09-24 18:57:48 -07:00
erwincoumans
8eb69552d1 Merge pull request #1335 from erwincoumans/master
manually apply pull request 457 PR #457
2017-09-24 16:38:23 -07:00
Erwin Coumans
97509dc9d0 add some missing files for premake, thanks to Jeff Bingham for the report 2017-09-24 16:10:14 -07:00
Erwin Coumans
27b02bfa78 Merge remote-tracking branch 'bp/master' 2017-09-24 16:01:50 -07:00
erwincoumans
4ff22a710c Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-09-24 11:41:46 -07:00
erwincoumans
70974c76da add a few more contributors (the list is far from complete though) 2017-09-24 11:41:24 -07:00
Erwin Coumans
ebf78cb754 manually apply pull request 457 PR #457
Thanks to aaronmjacobs!
2017-09-24 10:45:08 -07:00
erwincoumans
fcc093ecae Merge pull request #1332 from erwincoumans/master
create a C/C++ plugin system for pybullet / C-API.
2017-09-24 10:28:14 -07:00
Erwin Coumans
70364445b8 Merge remote-tracking branch 'bp/master' 2017-09-24 09:49:53 -07:00
erwincoumans
17709ae690 Merge pull request #1333 from bingjeff/add_jacobians
[pybullet] Add calculateJacobian.
2017-09-24 09:44:27 -07:00
erwincoumans
b1d6f58981 Update pybullet.c
fix compile issue
2017-09-24 09:16:54 -07:00
erwincoumans
d7704eca3d Merge pull request #1334 from bulletphysics/revert-1331-cmake
Revert "Cmake pybullet fix"
2017-09-23 21:23:10 -07:00
Erwin Coumans
63ee841bea trigger build system 2017-09-23 21:01:56 -07:00
erwincoumans
e95a15dabe Revert "Cmake pybullet fix" 2017-09-23 20:58:14 -07:00
Jeffrey Bingham
1727e47beb [pybullet] Add calculateJacobian.
* Add the calculateJacobian method to the pybullet API.
* Adjust the shared memory interface to handle fixed/floating bases
  in the calculateJacobian method.
* Fix a few comments.
2017-09-23 19:58:59 -07:00
erwincoumans
8e496036c6 More work on the C/C++ plugin system for pybullet/C-API:
Add preTickPluginCallback/postTickPluginCallback
User pointer for b3PluginContext, to store objects (class/struct instances)
Pass ints and floats as optional argument for plugin executePluginCommand
2017-09-23 18:05:23 -07:00
erwincoumans
5373ca39e1 add example snippet for the testPlugin/testplugin.cpp 2017-09-23 09:26:51 -07:00
erwincoumans
815a56c9bc Allow to load a urdf file in the testplugin.cpp, as first quick test, example pybullet script:
import pybullet as p
p.connect(p.GUI)
pluginUid = p.loadPlugin("E:/develop/bullet3/bin/pybullet_testplugin_vs2010_x64_debug.dll")
commandUid = 0
argument = "plane.urdf"
p.executePluginCommand(pluginUid,commandUid,argument)
p.unloadPlugin(pluginUid)
2017-09-23 09:25:00 -07:00
erwincoumans
37cfce99b2 add arguments to plugin system 2017-09-23 07:52:10 -07:00
erwincoumans
5f6cd6a42b link against DL for dlopen 2017-09-23 07:26:03 -07:00
erwincoumans
240fff575d Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-09-23 07:22:50 -07:00
Erwin Coumans
3783dccaa3 create a C/C++ plugin system for pybullet / C-API. 2017-09-22 19:17:57 -07:00
erwincoumans
312e35964f make some code const correct. 2017-09-22 07:53:21 -07:00
erwincoumans
a506879d6c Merge pull request #1327 from erwincoumans/master
Quick first prototype/test to integrate pybullet into Unity,
2017-09-21 21:16:47 -07:00
erwincoumans
2ee89797ad Merge pull request #1331 from ahundt/cmake
Cmake pybullet fix
2017-09-21 21:16:10 -07:00
Andrew Hundt
b720bd6290 cmake python fix typos for linux #1322 2017-09-21 23:47:31 -04:00
Andrew Hundt
ff15f2e702 cmake python fix for linux #1322
Search did not cover inconsistent lib location defined within python under linux versions
https://stackoverflow.com/questions/20582270/distribution-independent-libpython-path
2017-09-21 23:42:52 -04:00
Erwin Coumans
5f3066e2b9 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-09-21 16:43:58 -07:00
Erwin Coumans
b9b1b2dbca add B3_SHARED_API to the remaining PhysicsClientC_API APIs 2017-09-21 16:40:19 -07:00
Erwin Coumans
37253443f9 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-09-21 14:24:44 -07:00
Erwin Coumans
cc0c46c4b0 re-update the VR camera 2017-09-21 14:24:22 -07:00
Erwin Coumans
77166b068a Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-09-21 12:44:18 -07:00