Commit Graph
8108 Commits
Author SHA1 Message Date
erwincoumans bfba4ac2b6 Merge pull request #2637 from drigz/tf-compat
Replace tensorflow with tf.compat.v1
2020-02-20 10:56:21 -08:00
erwincoumans e8e0673e34 Merge pull request #2626 from erwincoumans/master
unsupported: expose collisionMargin to changeDynamics/getDynamicsInfo
2020-02-20 10:55:42 -08:00
Rodrigo Queiro d18531cc6a Replace tensorflow with tf.compat.v1
This means they won't break when using TensorFlow 2.0.
2020-02-19 17:35:48 +01:00
Erwin Coumans 0617f4f3cd expose computeDofCount to pybullet
expose computeDofCount and calculateMassMatrix to BulletRobotics C++ API
(all untested)
2020-02-14 19:58:32 -08:00
Erwin Coumans 56e6893ed9 Merge remote-tracking branch 'bp/master' 2020-02-14 17:37:18 -08:00
Erwin Coumans 6afa0a463d unsupported: expose collisionMargin to changeDynamics/getDynamicsInfo.
add cube_convex.urdf for testing this collisionMargin. Test script:
import pybullet as p
import time
p.connect(p.GUI)
plane = p.loadURDF("plane_implicit.urdf")
cube = p.loadURDF("cube_convex.urdf",[0,0,1])
p.setGravity(0,0,-10)
while (1):
	p.stepSimulation()
	pts = p.getContactPoints()
	p.changeDynamics(plane,-1,collisionMargin=0.3)
	p.changeDynamics(cube,-1,collisionMargin=0.3)
	print("===================")
	print("cube pos=", p.getBasePositionAndOrientation(cube)[0])
	print("margin=", p.getDynamicsInfo(plane,-1)[11])
	#time.sleep(1./10.)
2020-02-14 17:36:40 -08:00
erwincoumans cbede4eb6c Merge pull request #2625 from xhan0619/master
swap->btSwap
2020-02-14 17:05:49 -08:00
Xuchen Han d72b8b50a0 swap->btSwap 2020-02-14 15:30:35 -08:00
erwincoumans 665c04fbed Merge pull request #2622 from marcel303/NoGL-fixes
NoGL fixes
2020-02-14 14:54:14 -08:00
erwincoumans f80806db49 Merge pull request #2623 from marcel303/TinyRender-namespace2
Put TinyRender functions and classes inside a TinyRender namespace.
2020-02-14 14:53:33 -08:00
erwincoumans 04f069ee2f Merge pull request #2624 from marcel303/LuaDemo-CompileFix
LuaDemo compile fix.
2020-02-14 14:52:24 -08:00
Marcel Smit bdb0cc2f3e LuaDemo compile fix. 2020-02-14 12:07:39 +01:00
Marcel Smit 40e44caedd Put TinyRender functions and classes inside a TinyRender namespace. The TinyRender library defines some classes with very generic names, such as vec, Matrix, Model, which in my case, when compiling the example browser using a different library for graphics, is giving me name clashes. 2020-02-14 11:54:25 +01:00
Marcel Smit 3b0f5812c9 NoGL: double to btScalar. 2020-02-14 11:30:45 +01:00
Marcel Smit 04f03d78af NoGL: Update ExampleBrowserInterface and EmptyBrowser, with interface methods added to the OpenGL example browser, but didn't get added to the interface and empty interface. Required to compile the in-process example browser without OpenGL dependency. 2020-02-14 11:23:28 +01:00
Marcel Smit df0910e5a8 NoGL: Cleanup inverse kinematics example. It was still including an OpenGL-related header file, even though not using any OpenGL. 2020-02-14 11:12:47 +01:00
erwincoumans b06cdd5fc1 Merge pull request #2612 from xhan0619/master
Improve intra-deformable collision and deformable self collision
2020-02-12 19:30:46 -08:00
Erwin Coumans b3ff3ebcb1 add pendulum of 5 links 2020-02-12 13:05:51 -08:00
Erwin Coumans e7ad8a9d67 add urdf file for testing 2020-02-11 15:10:22 -08:00
erwincoumans 8504dc7816 Merge pull request #2611 from erwincoumans/master
bump up pybullet version to 2.6.5, fix compile issue
2020-02-10 08:47:49 -08:00
Xuchen Han 60f73963a8 add poly34.cpp to setup.py 2020-02-08 21:21:43 -08:00
Xuchen Han c4eb4ad66c float->btScalar 2020-02-07 16:51:59 -08:00
Xuchen Han b9c0456d85 fix split impulse demo 2020-02-07 13:22:41 -08:00
Xuchen Han dafed01013 float->btScalar; add optional post collision damping 2020-02-07 13:22:15 -08:00
Xuchen Han 2f73c5130e fix roots sorting 2020-02-06 23:54:11 -08:00
Xuchen Han 3bc701c487 Improve intra-deformable collision and deformable self collision 2020-02-06 17:01:20 -08:00
Erwin Coumans b1e3668be5 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2020-02-06 17:12:33 +00:00
Erwin Coumans 6195f40c02 fix compile issue in pybullet.c 2020-02-06 09:11:18 -08:00
erwincoumans 92d794b387 bump up pybullet version to 2.6.5 2020-02-06 09:09:57 -08:00
erwincoumans b809cdef5b Merge pull request #2608 from erwincoumans/master
implement b3RobotSimulatorClientAPI_NoDirect::createVisualShape
2020-02-06 09:00:05 -08:00
Erwin Coumans d0f895fbbd Merge branch 'master' of https://github.com/erwincoumans/bullet3 2020-02-04 20:59:26 -08:00
Erwin Coumans 401abd9ebc implement b3RobotSimulatorClientAPI_NoDirect::createVisualShape 2020-02-04 20:58:15 -08:00
erwincoumans 7d2a639fe1 Merge pull request #2605 from RanTig/fixResetUserDataCache
Only clear the user data cache when a full user data sync is requested.
2020-02-03 08:19:53 -08:00
Tigran Gasparian 19075f75b2 Only clear the user data cache when a full user data sync is requested. 2020-02-03 15:24:12 +01:00
erwincoumans 9469f39b3e Merge pull request #2602 from fuchuyuan/fixsdf
Fix indexing in obj2sdf
2020-01-31 10:03:40 -08:00
Chuyuan Fu 1efe8209ac fix obj2sdf mergeMaterial 2020-01-30 19:58:21 -08:00
Chuyuan Fu e76ebe86d9 fix index for obj2sdf 2020-01-30 19:25:04 -08:00
erwincoumans 7380a55ba7 Merge pull request #2594 from RanTig/SyncSingleBodyUserData
Adds an option to syncUserData to specify the bodies for which to sync.
2020-01-29 19:23:44 -08:00
erwincoumans 9ac1dd6194 Merge pull request #2597 from erwincoumans/master
made char* in addUserDebugParameter const
2020-01-24 09:45:35 -08:00
Erwin Coumans 4c6e3daf5e made char* in addUserDebugParameter const 2020-01-24 08:43:20 -08:00
Tigran Gasparian 2403a22ebf Bump up shared memory magic number. 2020-01-23 16:58:32 +01:00
Tigran Gasparian 34db76d263 Adds an option to syncUserData to specify the bodies for which to sync. 2020-01-23 14:46:33 +01:00
erwincoumans 34eb3d19bf Merge pull request #2589 from RanTig/master
Adds support for loading user data from URDF files.
2020-01-21 15:23:09 -08:00
Tigran Gasparian 899d53ee29 Added null check. 2020-01-21 19:40:22 +01:00
Tigran Gasparian a88ffea416 . 2020-01-17 13:30:26 +01:00
Tigran Gasparian 68d3fb28e0 Adds support for loading user data from URDF files. 2020-01-17 11:55:42 +01:00
erwincoumans 6428ed5e5f Merge pull request #2563 from Lopuska/patch-1
add btCollisionDispatcherMt.cpp on unity build
2020-01-12 09:05:34 -08:00
erwincoumans 2f09c7c224 Merge pull request #2581 from erwincoumans/master
bump up pybullet version to 2.6.4
2020-01-12 08:13:03 -08:00
Erwin Coumans 1be6a1d16b fix loadpanda video generation
remove duplicate code (formerly Windows ffpmeg needed different settings?)
2020-01-12 08:07:54 -08:00
Erwin Coumans 84e2ea918c add xarm, modify loadpanda to work with pybullet_robots module 2020-01-12 07:20:32 -08:00