Commit Graph
100 Commits
Author SHA1 Message Date
Erwin Coumans 97a62b33c0 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-09-13 12:07:59 -07:00
Erwin Coumans 2eaac410b5 remove memory of loadTexture. 2017-09-13 12:07:19 -07:00
erwincoumans cc9995d44b fix uninitialized camera position in 'VR' / 'camera rendering' mode (causing broken specular reflections in VR)
use debug visualizer camera viewmatrix/projection matrix if not provided, in ER_BULLET_HARDWARE_OPENGL mode.
fix broken changeRGBAColor implementation, thanks to Laura for the report!
2017-09-12 22:14:00 -07:00
erwincoumans 9d804cfb97 avoid crash if swRenderInstances are not available 2017-09-12 17:27:18 -07:00
Erwin Coumans 19057c2004 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-09-11 21:49:58 -07:00
Erwin Coumans 3d3e391b6a Support SDF capsule and cylinder. 2017-09-11 21:49:39 -07:00
Erwin Coumans a2322f7e3e trigger appveyor/travis tests 2017-09-10 21:40:33 -07:00
erwincoumans c56c5d74e7 Merge pull request #1306 from bulletphysics/revert-1303-patch-targets
Revert "Export targets in CMake and add include directories to target properties"
2017-09-10 21:33:58 -07:00
erwincoumans 6f51d81cbb Revert "Export targets in CMake and add include directories to target properties" 2017-09-10 21:20:54 -07:00
erwincoumans 7fd29ac0fe Merge pull request #1303 from roboticslibrary/patch-targets
Export targets in CMake and add include directories to target properties
2017-09-10 20:31:59 -07:00
Erwin Coumans 466c853489 add testMJCF.py script, to visualize MJCF file 2017-09-10 10:45:38 -07:00
erwincoumans 5bc9d6696c Merge pull request #1302 from erwincoumans/master
test travis2
2017-09-10 09:53:49 -07:00
Erwin Coumans 7c15767452 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-09-10 07:48:59 -07:00
Erwin Coumans ec18adbf0a fix MJCF visual shape capsule conversion code (fromto case) 2017-09-10 07:48:43 -07:00
erwincoumans 514afc6ca3 Merge pull request #1299 from erwincoumans/master
pybullet: improvements in Gym Ant environment, backwards compatibility fixes
2017-09-07 14:41:45 -07:00
Erwin Coumans 2d3b1e8eaa bump up pybullet version 2017-09-07 14:27:23 -07:00
Erwin Coumans cbe0d0aff2 pybullet fix: accidently enable self-collision 2017-09-07 14:27:00 -07:00
Erwin Coumans 9ecd345783 backwards compatibility... 2017-09-07 11:40:11 -07:00
Erwin Coumans c30e9aea92 revert minitaur.urdf to previous (backward compatibility) and add _v1 for better version. 2017-09-07 11:23:41 -07:00
Erwin Coumans b0e50d0d5a pybullet Gym envs: add more sleep in the enjoy functions to see what's happening. 2017-09-07 11:17:38 -07:00
Erwin Coumans 3d702879c5 pybullet: improvements in Gym Ant environment (work-in-progress) 2017-09-07 11:06:42 -07:00
erwincoumans 920031c488 Merge pull request #1297 from erwincoumans/master
Add Extras/BulletRobotics library for Roboschool, 	Re-enable Physics Server (Logging) and Physics Server (Replay Log), small fixes
2017-09-06 23:01:15 -07:00
Erwin Coumans 7a2de3ea08 fix cmake logic for BUILD_EXTRA_LIBS 2017-09-06 15:59:34 -07:00
Erwin Coumans 7878f7ace9 Add Extras/BulletRobotics, will be installed as 'Extra Libs' using CMake
Reduce size of command-logfile (used in PhysicsServer (Logging) and PhysicsServer (Log Replay))
Make Bullet3Common and BulletInverseDynamics part of core Bullet libraries (not optional)
2017-09-06 13:18:39 -07:00
Erwin Coumans a985d441bd Re-enable Physics Server (Logging) and Physics Server (Replay Log) 2017-09-04 19:00:50 -07:00
erwincoumans db8c0853b3 Merge pull request #1290 from lolengine/fix-const-removal
Make btHashString const-correct by changing a target pointer type.
2017-09-02 13:24:38 -07:00
erwincoumans ee64a39c7b Merge pull request #1291 from erwincoumans/master
improve minitaur urdf and quadruped.py test
2017-09-02 13:23:59 -07:00
Erwin Coumans 3f21e528f0 revert name 'v' -> 'u' (backward compatibility) and 'u' -> 't'
make vr_kuka_setup.py load faster, by disabling rendering during loading
allow to setRealTimeSimulation(0) in VR
2017-09-02 11:35:54 -07:00
erwincoumans 8319fa0380 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-09-02 01:06:47 -07:00
erwincoumans 1221c6d91d quadruped.py test, use generalized coordinates (not maximal coordinates) by default 2017-09-02 01:06:33 -07:00
erwincoumans eb97e06280 fix minitaur.urdf: move lower-leg inertia to center, add missing collision for one of the motors, add contact parameters for friction_anchor, spinning friction, compliance (stiffness/damping)
fix in indexing for maximal coordinates (unused by default, still experimental, requires many iterations for Minitaur due to extreme mass-ratio, hence use of reduces/generalized coordinates)
modify quadruped.py to test maximal coordinates
wrap angular servo (positional) target within [-PI,PI] in btGeneric6DofSpring2Constraint
add 'j' key to show body frames in wireframe/debug mode
2017-09-02 01:05:42 -07:00
erwincoumans 29271c53eb Merge pull request #1288 from erwincoumans/master
add option to log joint torques (due to user applied torques and/or m…
2017-08-30 20:45:56 -07:00
erwincoumans ee30479a28 add option to log joint torques (due to user applied torques and/or motor torques)
See quadruped.py for an example:
p.startStateLogging(p.STATE_LOGGING_GENERIC_ROBOT, "genericlogdata.bin", maxLogDof = 16, logFlags = p.STATE_LOG_JOINT_TORQUES)
Thanks to JulianYG, in pull request https://github.com/bulletphysics/bullet3/pull/1273
2017-08-30 19:41:15 -07:00
erwincoumans c4c3bc6473 Merge pull request #1287 from erwincoumans/master
implement pybullet.createUserConstraint for maximalCoordinates, bump up pybullet version to 1.3.0
2017-08-30 12:14:58 -07:00
erwincoumans 8dfa76e924 implement pybullet.createUserConstraint for maximalCoordinates (fixed, p2p, gear)
maximalCoordinates, make sure parent is bodyA, child is BodyB
2017-08-30 09:54:38 -07:00
erwincoumans 22658da02a Merge pull request #1285 from erwincoumans/master
enable motor control for maximal coordinates robots (btRigidBody, btT…
2017-08-29 21:34:17 -07:00
erwincoumans 1f7db4519e enable motor control for maximal coordinates robots (btRigidBody, btTypedConstraint) for force, velocity, position control. 2017-08-29 19:14:27 -07:00
erwincoumans dc38ec5c99 Merge pull request #1284 from erwincoumans/master
avoid flickering in visualizer window, when doing pybullet.getCameraI…
2017-08-29 13:28:21 -07:00
erwincoumans 4ff6befc6d avoid flickering in visualizer window, when doing pybullet.getCameraImage 2017-08-29 12:13:21 -07:00
erwincoumans bd39c7c657 Merge pull request #1282 from erwincoumans/master
fix in minitaur.py and add render function in minitaur_gym_env.py
2017-08-28 19:32:58 -07:00
erwincoumans 449c8afc11 Merge pull request #1280 from erwincoumans/master
pybullet a bit more refactoring, moving around files.
2017-08-27 21:58:19 -07:00
Erwin Coumans 1900966805 small rename 2017-08-27 19:54:20 -07:00
Erwin Coumans 3f00c7bd49 small tweak in vr_kuka_setup.py example 2017-08-27 19:53:38 -07:00
Erwin Coumans c8cb0a5f42 add missing sphere_small.urdf, add vr_kuka_setup.py example. 2017-08-27 19:41:40 -07:00
Erwin Coumans 1569f3845c more fixes in pybullet_gym envs/data.
implement pybullet.setAdditionalSearchPath
2017-08-27 19:34:00 -07:00
Erwin Coumans d9faea8c1c add more URDF files to pybullet_data 2017-08-27 19:26:53 -07:00
Erwin Coumans 793904fc89 fix windows 64bit openvr/lib/win64/openvr_api.lib to find openvr64pi.dll (different name from 32bit version, to co-exist) 2017-08-27 18:30:12 -07:00
Erwin Coumans 659e869b86 pybullet a bit more refactoring, moving around files.
pybullet: move data to pybullet_data package, with getDataPath() method
2017-08-27 18:08:46 -07:00
erwincoumans 079035d253 Merge pull request #1279 from erwincoumans/master
more fixes in the pybullet gym environments
2017-08-26 15:19:38 -07:00
erwincoumans dd9ecce79e Merge pull request #1274 from erwincoumans/master
all methods (except connect, obviously) have the physicsClientId argu…
2017-08-25 16:37:16 -07:00
Erwin Coumans bcc60224f0 all methods (except connect, obviously) have the physicsClientId argument, even if they don't use it. This makes it easier to create a wrapper API to store the physics client. This allows easier multi-threaded versions with multiple Bullet DIRECT instances (or SHARED_MEMORY, TCP, UDP etc).
See for example https://github.com/bulletphysics/bullet3/blob/master/examples/pybullet/gym/pybullet_envs/bullet/bullet_client.py and https://github.com/bulletphysics/bullet3/blob/master/examples/pybullet/gym/pybullet_envs/bullet/minitaur.py
2017-08-25 14:04:45 -07:00
erwincoumans be7ddfcc5c Merge pull request #1221 from Wugand/patch-1
Fix for memory leak at btCreateCompoundFromGimpactShape
2017-08-25 08:30:07 -07:00
erwincoumans 983da08da8 Merge pull request #1271 from erwincoumans/master
pybullet: remove 'data' from MANIFEST.in
2017-08-24 22:38:24 -07:00
erwincoumans ee3bb1efc5 Merge pull request #1272 from jonathantompson/exit_0_fix
OpenGL window error handling updates
2017-08-24 15:44:38 -07:00
erwincoumans a119a77bc7 Merge pull request #1270 from erwincoumans/master
pybullet fix leak for concave collision shapes.  Allow continuous control for MIT racecar gym environment
2017-08-24 10:09:04 -07:00
Erwin Coumans 5c5993edcb fix potential memory leaks for concave triangle meshes (<concave=true> or createCollisionShape with flags=1) 2017-08-24 09:16:11 -07:00
Erwin Coumans f0c32b84c0 allow continuous control for MIT racecar gym environment, use differential drive version 2017-08-23 23:12:26 -07:00
Erwin Coumans 8a4f51baa4 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-08-23 21:45:05 -07:00
erwincoumans 83510f0652 Merge pull request #1268 from erwincoumans/master
update minitaur gym env, 	fix pybullet racecarGymEnv to use thread-safe pybullet
2017-08-23 18:41:56 -07:00
Erwin Coumans 8866840712 Clarify in naming that the environment uses MJCF xml files with Bullet, it doesn't use MuJoCo. 2017-08-23 15:03:57 -07:00
erwincoumans a9fb0033a4 Merge pull request #1265 from erwincoumans/master
refactor pybullet/gym to allow instantiating environments directly fr…
2017-08-23 10:07:36 -07:00
erwincoumans bd28b212e1 Merge pull request #1263 from erwincoumans/master
improve the new pybullet gym environments, upgrade to OpenVR 1.0.9, add preliminary support for Mac OSX OpenVR
2017-08-20 20:28:08 -07:00
erwincoumans a4f28e1589 Merge pull request #1219 from lunkhound/pr-nncg
NNCG solver: apply rolling friction consistently
2017-08-18 13:31:54 -07:00
erwincoumans b940a83797 Merge pull request #1257 from erwincoumans/master
bump up pybullet setup.py version, make B3_NO_PYTHON_FRAMEWORK defaul…
2017-08-18 13:30:03 -07:00
erwincoumans c0984b80e5 Merge pull request #1231 from benelot/bullet-gym
Add nearly all gym environments using pybullet together with the…
2017-08-18 13:29:43 -07:00
erwincoumans bc1a039d26 Merge pull request #1256 from erwincoumans/master
revert API to be backward compatible, add b3CreateInProcessPhysicsSer…
2017-08-16 14:02:53 -07:00
Erwin Coumans a66576f034 revert API to be backward compatible, add b3CreateInProcessPhysicsServerAndConnectSharedMemory
same for BulletURDFImporter constructor
2017-08-16 12:33:25 -07:00
erwincoumans b7579cbdda Merge pull request #1254 from erwincoumans/master
Expose optional "globalScaling" factor to pybullet.loadURDF/SDF, and add pybullet.connect(p.GUI_SERVER option, that allows shared memory connections.
2017-08-16 09:30:23 -07:00
erwincoumans 2e0a987750 pybullet only allow one GUI/GUI_SERVER instance.
Fix LINK_FRAME/WORLD_FRAME coordinate issue in pybullet applyExternalForce
2017-08-15 14:15:30 -07:00
erwincoumans 9d0f875c5b fix compile issues due to API change (additional argument) 2017-08-15 09:34:44 -07:00
Erwin Coumans 60b60ef9fd add pybullet.connect(pybullet.GUI_SERVER) option. This allows shared memory connections, acting as a physics server. You can connect using SHARED_MEMORY to this GUI_SERVER. 2017-08-14 17:02:20 -07:00
Erwin Coumans aafaa7e33e Expose optional "globalScaling" factor to pybullet.loadURDF and pybullet.loadSDF. This will scale the visual, collision shapes and transform locations.
Fix two_cubes.sdf (was lacking collision shape for second cube)
2017-08-14 14:59:41 -07:00
erwincoumans dfaa717fed Merge pull request #1252 from erwincoumans/master
fix pybullet GUI performance issue on Mac OSX, fix potential memory leak in loadSDF when visuals have the same name.
2017-08-11 18:11:53 -07:00
erwincoumans 457312f94f fix leak in loadSDF in case of visuals with duplicate/identical names that have a material.
fix GUI performance issue on Mac OSX
fix issue introduced in previous commit (in btConvexHullComputer.cpp)
2017-08-11 17:14:52 -07:00
erwincoumans 0eb3898c76 Merge pull request #1244 from erwincoumans/master
add 'createObstacleCourse.py' example, helps reproducing
2017-07-29 13:20:14 +02:00
erwincoumans 53808e70ff Merge pull request #1235 from YunfeiBai/master
Add init function and module for pybullet with EGL.
2017-07-21 18:08:04 +02:00
erwincoumans 63ef78afe1 Merge pull request #1232 from erwincoumans/master
improve pybullet performance of loadURDF/SDF/MJCF and 'createCollisio…
2017-07-16 11:29:02 +01:00
erwincoumans afd6db7c40 Merge pull request #1217 from erwincoumans/master
texture check fix
2017-07-01 12:37:09 -07:00
Erwin Coumans b63023c692 add transparent plane 2017-07-01 11:47:57 -07:00
Erwin Coumans 5178ad4abc add proper pointer casts 2017-07-01 10:28:28 -07:00
erwincoumans 743d69ef69 Merge pull request #1216 from erwincoumans/master
implement pybullet.changeTexture, fix loadTexture for OpenGL
2017-06-30 21:07:28 -07:00
Erwin Coumans 88897cc744 implement pybullet.changeTexture. For now, the width/height has to match the target texture unique id, otherwise crashes may happen (a check for width/height match will be added)
See also examples\pybullet\examples\changeTexture.py
2017-06-30 19:11:43 -07:00
Erwin Coumans dd3d55610b fixes in pybullet.loadTexture, changeVisualShape replacing texture.
(also works for OpenGL3 renderer now)
2017-06-30 13:35:07 -07:00
Erwin Coumans dcaaed9238 also generate TinyRendererVisualShapeConverter for programmatically generated collision shapes
use similar random colors for TinyRenderer (if rgba colors are not specified)
2017-06-29 22:06:27 -07:00
erwincoumans 6dfb320b8f Merge pull request #1214 from erwincoumans/master
Added manually converted widowx.urdf from https://github.com/Robotnik…
2017-06-29 19:19:04 -07:00
Erwin Coumans bf800e30d5 Added manually converted widowx.urdf from https://github.com/RobotnikAutomation/widowx_arm
Added simple pybullet file in Bullet/examples/pybullet/examples/widows.py (preliminary, both URDF and py file needs more work to be useful)
https://github.com/RobotnikAutomation/widowx_arm/blob/master/widowx_arm_description/package.xml
See also http://www.trossenrobotics.com/widowxrobotarm
2017-06-29 17:54:04 -07:00
erwincoumans b4f21e77af Merge pull request #1206 from erwincoumans/master
Allow to create concave collision meshes. Transparency (only OpenGL 3.x renderer, not tinyrenderer/gl2)
2017-06-24 20:07:17 -07:00
erwincoumans d5fe67cf57 Add pybullet transparent.py example, transparency with global per-object sort in GLInstancingRenderer 2017-06-24 19:38:31 -07:00
erwincoumans a651cb9ab4 Implement first pass of transparent graphics object for GLInstancingRenderer
remove 'enableBlend' from API, graphics instances use alpha component instead
fix forward axis for SimpleCamera
2017-06-24 13:41:33 -07:00
erwincoumans c777e61d48 fix pybullet compilation on some WIN32 version of MSVC 2017-06-23 20:36:19 -07:00
Erwin Coumans 65e22ba3e9 allow auxilary link to be used for gear btMultiBodyGearConstraint. 2017-06-23 20:24:04 -07:00
Erwin Coumans 2ab56b4d62 Allow to create concave collision meshes. Note that this is only supported for static (mass 0) multibodies. 2017-06-23 14:43:28 -07:00
Erwin Coumans a136098120 add a few more discrete actions to cartpole_bullet.py so it trains faster + add option to train without rendering, enjoy with rendering. 2017-06-22 16:49:14 -07:00
erwincoumans 40dae99435 Merge pull request #1203 from erwincoumans/master
add kukaCamGymEnv.py with camera observations (preliminary)
2017-06-22 10:58:51 -07:00
Erwin Coumans fbff4c57ca update include after stb_image changes 2017-06-22 09:03:10 -07:00
Erwin Coumans 9e5e0da9f4 move stb_image/stb_truetype.h and stb_image/stb_image_write.h to ThirdPartyLibs/stb_image folder 2017-06-22 08:48:18 -07:00
Erwin Coumans 97f6a161f1 fix stb_image.h include path to be consistent. 2017-06-22 08:09:33 -07:00
Erwin Coumans 9213f944f1 add kukaCamGymEnv.py with camera observations (preliminary)
show camera position in example browser
disable per-vertex and per-fragment profile timings
2017-06-21 09:33:46 -07:00
erwincoumans e24d79a2c0 Merge pull request #1202 from erwincoumans/master
reduce stack usage (cause some crashes in low-stack tests)
2017-06-20 20:57:48 -07:00
Erwin Coumans 71170d6384 reduce stack usage (cause some crashes in low-stack tests)
fix crashing bug in changeVisualShape
add differential gear version of racecar (only 2 back wheels are powered)
2017-06-20 20:22:14 -07:00