Commit Graph

1102 Commits

Author SHA1 Message Date
erwincoumans
049d9a5ca6 Update OpenGLExampleBrowser.cpp
revert original width/height to 1024x768
2017-03-21 17:41:11 -07:00
erwincoumans
a30b887595 Merge pull request #1025 from olegklimov/master
URDF loader improvement 2
2017-03-21 17:12:22 -07:00
Oleg Klimov
80a0b51a1d MJCF: fix cylinders in MJCF, also (possibly) fixes capsules in tiny renderer 2017-03-22 00:36:28 +03:00
erwincoumans
cb08d077f0 Merge pull request #1030 from erwincoumans/master
friction anchors, arm64 premake
2017-03-20 11:48:44 -07:00
Erwin Coumans
0b017b0f53 fix issue with btMultiBody friction in combination with soft contacts (friction should not re-use normal contact cfm/erp)
implement friction anchors, position friction correction, disabled by default. Use colObj->setCollisionFlag(flag | CF_HAS_FRICTION_ANCHOR); See test/RobotClientAPI/SlopeFrictionMain.cpp. In URDF or SDF, add <friction_anchor/> in <contact> section of <link> to enable.
PhysicsServer: properly restore old activation state after releasing picked object
btMultiBodyConstraintSolver: disable flip/flop of contact/friction constraint solving by default (it breaks some internal flaky unit tests)
2017-03-20 10:58:07 -07:00
yunfeibai
6695268fba Fix the issue with indentation in pr2 setup. 2017-03-20 09:52:24 -07:00
Oleg Klimov
41df15a464 MJCF: fix B3_PI, fix colors, fix capsule without 'fromto' 2017-03-19 00:19:04 +03:00
Oleg Klimov
4526b0a94a MJCF: support for default joint limited="true" 2017-03-18 04:10:07 +03:00
Oleg Klimov
e8da7bb6f8 URDF loader: fix MuJoCo xml load, also closes #993 2017-03-17 02:11:47 +03:00
Erwin Coumans
32b9eacb34 fix compile issue 2017-03-16 13:26:44 -07:00
erwincoumans
86bec45247 Merge pull request #1024 from erwincoumans/master
expose video capture as logging command
2017-03-16 11:02:58 -07:00
erwincoumans
a89d3cfb95 Merge pull request #1019 from erikogenvik/kinematic_controller_initialization
Kinematic controller initialization
2017-03-16 10:54:41 -07:00
Erwin Coumans
3d339af98d Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-03-16 09:13:55 -07:00
Erwin Coumans
59d16b2c42 expose video capture as logging command in b3RobotSimulatorClientAPI (C++) and pybullet (use STATE_LOGGING_VIDEO_MP4) 2017-03-16 09:13:33 -07:00
Erwin Coumans
e0a4393bd2 fix compile issue 2017-03-15 17:35:10 -07:00
Erwin Coumans
b7b46b12d3 update RobotSimulator/MinitaurSetup to use data/quadruped/minitaur.urdf
add b3RobotSimulatorClientAPI::getBaseVelocity and resetBaseVelocity
add b3Quaternion::getEulerZYX
2017-03-15 17:09:17 -07:00
Erwin Coumans
4db6fa9e29 update minitaur.py to use minitaur.urdf (instead of quadruped.urdf), also sort the legs in the same order as real hardware
added test urdf files for minitaur with all fixed joints, or fixed knees.
added some stiffness/damping to minitaur legs (testing)
tiny_obj_loader, don't crash on invalid texture coordinates
btMultiBodyConstraintSolver: sweep back and forward to reduce asymmetry
2017-03-15 15:38:50 -07:00
Erwin Coumans
a613911c84 Merge remote-tracking branch 'bp/master' 2017-03-15 11:05:16 -07:00
erwincoumans
6f171f90dc Merge pull request #1015 from JulianYG/master
Fixed shaking issue, and hopefully the offset should be gone.
2017-03-15 09:15:00 -07:00
Erwin Coumans
6e2850e08a fix names (case) for Linux for MPL/hand 2017-03-14 17:03:11 -07:00
Julian
bb9601bf64 fixed numpy dependency and gripper 2017-03-14 14:43:08 -07:00
Erik Ogenvik
b0aef44668 Make it compile on Linux.
I simply copied from BasicDemo/CMakeList.txt
2017-03-14 22:08:55 +01:00
Erwin Coumans
66919cc66a fix unreachable code 2017-03-14 13:13:16 -07:00
Erwin Coumans
3d2cb1cabf also allow absolute path in asset files (.obj, .stl, .dae etc) 2017-03-14 10:40:27 -07:00
Julian
b686d1274c fixed minor issues, added 1dof on end effector rotation. gripper is raw 2017-03-13 22:09:08 -07:00
Julian
7cc31e7c98 fixed minor issues, added 1dof on end effector rotation. gripper is raw 2017-03-13 22:08:17 -07:00
Julian
fabe09fe53 add 1 dof to kuka end effector 2017-03-13 22:04:28 -07:00
Julian
8145203222 add 1dof to kuka end effector 2017-03-13 22:04:16 -07:00
erwincoumans
b5eb19ce2a Merge pull request #1013 from erwincoumans/master
relax the UseTab, apply clang-format to pybullet.c
2017-03-13 19:17:16 -07:00
erwincoumans
c1c89e6fad Merge pull request #1000 from olegklimov/master
URDF loader improvement 1
2017-03-13 19:16:45 -07:00
Erwin Coumans
5009a55ee1 Merge remote-tracking branch 'bp/master' 2017-03-13 18:50:32 -07:00
erwincoumans
1a079ceb59 Merge pull request #1003 from JulianYG/master
pybullet VR controller controls the kuka arm
2017-03-13 18:32:48 -07:00
Oleg Klimov
fa60cc5f56 URDF loader: fix SDF branch, warn about unsupported geometry 2017-03-14 02:32:02 +03:00
Erwin Coumans
901b314a1e clang-format pybullet.c
move AccessModifierOffset to -4 (public:, private:, protected: are aligned to the left in Bullet)
2017-03-13 16:06:52 -07:00
erwincoumans
55361a184c Merge pull request #1011 from erwincoumans/master
clang-format style file, easier way to format according to Bullet code style (may need some tweaks)
2017-03-13 14:13:50 -07:00
Erwin Coumans
b088f7febe Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-03-13 11:02:10 -07:00
Erwin Coumans
e36b7e02aa Fix for issue 1007
_clang-format file and applied to HelloWorld.cpp
usage:
clang-format -style=file -i examples/HelloWorld/HelloWorld.cpp
THere are still some issues with clang-format and its style
2017-03-13 11:00:56 -07:00
Mohi
43b0a8b6fb Fixing a bug on Visualizer Camera and a few more
- resetDebugVisualizerCamera now accepts negative values for pitch and
yaw angles

- Defining kitchen model to be concave, so as to be able to put floating
objects inside

- Fixed an indention error in testrender_np.py
2017-03-13 10:41:54 -07:00
Jie Tan
8c27a62e04 remove the stub calls from rllab 2017-03-10 13:41:05 -08:00
Jie Tan
37a809f5d1 added the learning algorithm from RL-lab 2017-03-10 12:29:47 -08:00
Jie Tan
923fbe8588 add gym examples 2017-03-10 11:22:38 -08:00
Oleg Klimov
3a8199ec28 Fix formatting 2017-03-10 19:46:46 +03:00
Oleg Klimov
82495f3c84 URDF loader: reuse the same resources finder routine for TinyRendererVisualShapeConverter 2017-03-10 18:17:38 +03:00
Erwin Coumans
ca31bb2bbd pybullet.ER_BULLET_HARDWARE_OPENGL and ER_TINY_RENDERER exposed (for getCameraImage, renderer=pybullet.ER_BULLET_HARDWARE_OPENGL)
improve performance of getCameraImage when using ER_BULLET_HARDWARE_OPENGL
2017-03-09 17:42:59 -08:00
erwincoumans
4ea9fa54bb Merge pull request #995 from YunfeiBai/master
Bug fix: set logging unique id at initialization.
2017-03-09 11:40:43 -08:00
Julian
51dc3a1710 VR controller the kuka arm 2017-03-08 19:36:41 -08:00
Erwin Coumans
f2aa67d262 improve vrhand.py 2017-03-08 14:10:43 -08:00
Oleg Klimov
5b2a9d1a01 URDF loader: resources path, "package://" removal, error messages, zero material path in .obj loader 2017-03-08 15:14:54 +03:00
Erwin Coumans
af295b6eed optimize hand (hand.py, vrhand.py) MPL.xml STL meshes for better collision detection performance (using Blender decimation tool) 2017-03-07 19:07:45 -08:00
yunfeibai
3ad49ae5eb Set logging unique id at initialization. This fixed a bug that the second log couldn't be stopped properly. 2017-03-07 11:52:26 -08:00
erwincoumans
63dc57c7e6 add pybullet file to track VR controller attached to some robot (such as minitaur)
press button to toggle tracking, other button to reset orientation of controller, relative to robot.
2017-03-07 08:48:23 -08:00
erwincoumans
98e7519134 Update b3RobotSimulatorClientAPI.cpp 2017-03-06 18:54:52 -08:00
Erwin Coumans
f81211f3b0 fix quadruped.py, don't use 'realtime' and set timeout (in case connection to server is lost) to few seconds 2017-03-05 22:40:05 -08:00
erwincoumans
00361afea5 allow user to specify the maximum number of dofs to log in GenericRobotStateLogger (default = 12)
add minitaur quadruped playback of minitaur log files (real robot and simulated create the same log files)
add improved minitaur.urdf file, see https://youtu.be/lv7lybtOzeo for a preview.
2017-03-05 21:49:20 -08:00
erwincoumans
a7ad6c2860 Merge remote-tracking branch 'bp/master' 2017-03-04 15:31:02 -08:00
erwincoumans
c7579d7b82 fix quadruped, allow user to pick the maximum number of dofs to log 2017-03-04 15:30:57 -08:00
yunfeibai
e0c74a46ac Set renderer in pybullet. 2017-03-04 13:31:30 -08:00
yunfeibai
6e3cd26f11 Log time stamp and step count. 2017-03-04 13:19:43 -08:00
erwincoumans
44b140dd38 disable the gMaxNumCmdPer1ms experiment by default (-1)
fix minitaur_evaluate.py script, quadruped.py
2017-03-04 12:59:21 -08:00
Erwin Coumans
7cb5898db6 fix body name in GUI more
expose getBodyInfo to b3RobotSimulatorClientAPI
2017-03-03 11:33:20 -08:00
Erwin Coumans
34fc2fb589 create premake/cmake file for Bullet/Extras/obj2sdf
add missing 1.sdf for Bullet/data/kitchens/1.sdf
add support for getting keyboard events (pybullet.getKeyboardEvents and b3RobotSimulatorClientAPI::getKeyboardEvents)
2017-03-02 12:33:22 -08:00
erwincoumans
255b21a776 Merge pull request #979 from erwincoumans/master
fix lack of collision scaling in pybullet URDF/SDF files (only graphi…
2017-03-02 08:18:11 -08:00
yunfeibai
a33dcdb63d Modify logging and playback to handle fixed joint. 2017-03-01 23:37:01 -08:00
Erwin Coumans
6a40c1cca7 pybullet expose resetDebugVisualizerCamera
example: pybullet.resetDebugVisualizerCamera(cameraDistance=3,cameraYaw=30,cameraPitch=52,cameraTargetPosition=[0,0,0])
2017-03-01 15:04:07 -08:00
Erwin Coumans
2f3ba49357 expose some sleep timeout pybullet.setPhysicsEngineParameter(maxNumCmdPer1ms=100) or b3PhysicsParamSetMaxNumCommandsPer1ms,
if more commands than those are processed per millisecond, a 1ms sleep will follow, to avoid other threads being stalled.
2017-03-01 13:48:57 -08:00
Erwin Coumans
ac28f50fa5 vrhand.py first try to connect to SHARED_MEMORY if that fails use GUI fallback 2017-03-01 13:01:02 -08:00
Erwin Coumans
2eb019cdc3 Created Wavefront obj to sdf converter, to make it easier to import complex obj models with many materials. See kitchen for example.
Fix in tinyobj, make sure material is initialized
Add fatihrmutfak kitchen model, for Virtual Reality and some research
2017-03-01 10:06:10 -08:00
Erwin Coumans
89e8e30de6 fix lack of collision scaling in pybullet URDF/SDF files (only graphics meshes supported scaling, collision objects ignored scaling) 2017-02-28 16:30:57 -08:00
erwincoumans
e2bdf124a1 Merge pull request #975 from erwincoumans/master
Rewrite 'diagonalize' to use 'extractRotation', should fix Issue 846
///See http://dl.acm.org/citation.cfm?doid=2994258.2994269
tweak Minitaur/RobotSimulator, fix target value from int to double.
2017-02-26 07:01:42 -08:00
Erwin Coumans
88aa9e899e tweak Minitaur/RobotSimulator, fix target value from int to double 2017-02-24 21:40:43 -08:00
erwincoumans
77538b04c2 Update PhysicsServerCommandProcessor.cpp 2017-02-24 16:01:18 -08:00
erwincoumans
929eb49029 Merge pull request #974 from erwincoumans/master
expose timeout in pybullet/shared memory API
2017-02-24 15:50:26 -08:00
Erwin Coumans
a4f1e34899 expose timeout in pybullet/shared memory API
add RobotSimulator, a C++ API similar to pybullet. (work-in-progress, only part of API implemeted)
2017-02-24 15:34:11 -08:00
erwincoumans
f15722ffb1 Merge pull request #973 from erwincoumans/master
allow to compile/run 64bit version of VR, co-exist of 64bit and 32bit openvr_api.dll
2017-02-22 17:38:27 -08:00
Erwin Coumans
0b27edf172 allow to compile/run 64bit version of VR lib, workaround for issue that both 32bit and 64bit version is called openvr_api.dll
Now 64bit version is called openvr64pi.dll (patched the 64bit binary library openvr_api.lib)
See also https://github.com/ValveSoftware/openvr/issues/412
2017-02-22 15:50:09 -08:00
yunfeibai
2751b34894 Add maximum joint angle. 2017-02-22 14:01:03 -08:00
yunfeibai
6f2a7220a5 Modify controller constraint in the pybullet vr gripper setup. 2017-02-22 13:52:49 -08:00
yunfeibai
86f0067266 A bug fix for logging the orientation of the base of the object. 2017-02-22 13:30:28 -08:00
Erwin Coumans
bd30ba30ce Replace large timeout (1024*1024*1024) using real-time clock timeout (10 seconds default)
Change SHARED_MEMORY_MAGIC_NUMBER to make sure server/client are using the same version (shared memory)
add --realtimesimulation to physics server (GUI, VR)
remove --G Xcode from build_cmake_pybullet_double.sh
2017-02-22 09:33:30 -08:00
Erwin Coumans
35b92c43d3 remove some standalone-example from the premake build (re-enable using option --standalone-examples
move PhysicsServer and PhysicsClient into Physics Server-Client in its own ExampleBrowser section (out of Experiments)
2017-02-22 06:13:32 -08:00
Erwin Coumans
bf5f78f35a decouple some dependency using a callback. 2017-02-21 19:28:49 -08:00
Erwin Coumans
218f883211 make flag/enable required argument
update pybullet quickstart guide PDF from
https://docs.google.com/document/d/10sXEhzFRSnvFcl3XxNGhnD4N2SedqwdAvK3dsihxVUA/edit#
2017-02-21 17:53:49 -08:00
Erwin Coumans
926c83f2ab Merge remote-tracking branch 'bp/master' 2017-02-21 17:38:42 -08:00
Erwin Coumans
3988d363b3 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-02-21 17:38:32 -08:00
Erwin Coumans
37890e5a4d allow to enable/disable GUI, shadows, wireframe of OpenGL Visualizer from API
(pybullet.configureDebugVisualizer)
2017-02-21 17:36:54 -08:00
erwincoumans
61f05c7330 Update PhysicsServerCommandProcessor.cpp 2017-02-21 13:28:43 -08:00
Erwin Coumans
1cd65a324c update pybullet quickstart guide 2017-02-21 10:23:18 -08:00
erwincoumans
29772fc3b4 Merge pull request #965 from jietan/pullRequest
Pull request
2017-02-21 05:10:01 -08:00
erwincoumans
07bd911c36 Merge pull request #966 from erwincoumans/master
add tiny clsocket cross-platform TCP  library, update pybullet PDF doc
2017-02-20 21:17:22 -08:00
Erwin Coumans
5c74b0a199 add cmake support for TCP / clsocket in pybullet 2017-02-20 20:55:37 -08:00
Erwin Coumans
28146e816f export TCP connection mode to pybullet
made TCP disconnection detection more reliable
2017-02-20 20:34:05 -08:00
Erwin Coumans
942015df9d use TCP in main thread, accumulate bytes until size matches. 2017-02-20 18:54:12 -08:00
Erwin Coumans
3d73a9d788 shmem preliminary TCP implementation (not working yet) 2017-02-20 16:46:25 -08:00
Erwin Coumans
bfcdb8c408 add App_PhysicsServerTCP and App_PhysicsServerSharedMemoryBridgeTCP
(can be easier tunneled over SSH)
2017-02-20 14:43:01 -08:00
Erwin Coumans
55361e262e fix 6dof sensors for fixed joints (recent bug left fields uninitialized in getJointInfo)
add premake build support for Test_PhysicsClientUDP
2017-02-20 13:18:33 -08:00
yunfeibai
e12981fd45 Enable logging a specified list of objects for generic robot logging. 2017-02-20 12:17:12 -08:00
Erwin Coumans
3e94840340 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-02-19 12:09:12 -08:00
Erwin Coumans
3faab1b019 adjusted clsocket build and test, so there is an EchoServer and QueryDayTime sending a string to the EchoServer. 2017-02-19 12:08:58 -08:00
Erwin Coumans
4faa6613c9 first draft of premake/cmake build files for clsocket (tiny cross-platform TCP socket library) 2017-02-19 11:48:01 -08:00
Erwin Coumans
957266b121 add tiny cross-platform TCP socket library from https://github.com/DFHack/clsocket
(todo: hook-up to Bullet cmake/premake build systems, and implement TCP alternative for UDP server)
2017-02-19 10:25:55 -08:00