summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Coumans <erwincoumans@erwincoumans-macbookpro2.roam.corp.google.com>2018-09-25 17:06:32 -0700
committerErwin Coumans <erwincoumans@erwincoumans-macbookpro2.roam.corp.google.com>2018-09-25 17:06:32 -0700
commitcd2f111a10c72f3d41418fa2a8d3f1f70b06e425 (patch)
tree46f798dd9ee02b727c35632a7859e66d9bc424e2
parentf20b7bb07c383a26e16219d3744d791673ec0a94 (diff)
downloadbullet3-cd2f111a10c72f3d41418fa2a8d3f1f70b06e425.tar.gz
update pybullet version, include *.* from OpenGLWindow
-rw-r--r--MANIFEST.in2
-rw-r--r--data/multibody.bulletbin16836 -> 16836 bytes
-rw-r--r--examples/pybullet/examples/inverse_dynamics.py4
-rw-r--r--setup.py2
4 files changed, 6 insertions, 2 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index fdff76d10..476648ddc 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,6 +7,6 @@ recursive-include src *.h
recursive-include src *.hpp
recursive-include examples/pybullet/gym *.*
include examples/ThirdPartyLibs/enet/unix.c
-include examples/OpenGLWindow/*.cpp
+include examples/OpenGLWindow/*.*
recursive-include examples/ThirdPartyLibs/glad *.*
include examples/ThirdPartyLibs/enet/win32.c
diff --git a/data/multibody.bullet b/data/multibody.bullet
index ddab3a090..fec2a61a8 100644
--- a/data/multibody.bullet
+++ b/data/multibody.bullet
Binary files differ
diff --git a/examples/pybullet/examples/inverse_dynamics.py b/examples/pybullet/examples/inverse_dynamics.py
index 8b86cc3b9..955ebfee6 100644
--- a/examples/pybullet/examples/inverse_dynamics.py
+++ b/examples/pybullet/examples/inverse_dynamics.py
@@ -30,6 +30,10 @@ else:
robot_base, robot_orientation, useFixedBase=True)
+bullet.changeDynamics(id_robot,-1,linearDamping=0, angularDamping=0)
+bullet.changeDynamics(id_robot,0,linearDamping=0, angularDamping=0)
+bullet.changeDynamics(id_robot,1,linearDamping=0, angularDamping=0)
+
jointTypeNames = ["JOINT_REVOLUTE", "JOINT_PRISMATIC","JOINT_SPHERICAL","JOINT_PLANAR","JOINT_FIXED","JOINT_POINT2POINT","JOINT_GEAR"]
# Disable the motors for torque control:
diff --git a/setup.py b/setup.py
index 11c383f46..c5b7d063e 100644
--- a/setup.py
+++ b/setup.py
@@ -559,7 +559,7 @@ if 'BT_USE_EGL' in EGL_CXX_FLAGS:
setup(
name = 'pybullet',
- version='2.1.9',
+ version='2.2.2',
description='Official Python Interface for the Bullet Physics SDK specialized for Robotics Simulation and Reinforcement Learning',
long_description='pybullet is an easy to use Python module for physics simulation, robotics and deep reinforcement learning based on the Bullet Physics SDK. With pybullet you can load articulated bodies from URDF, SDF and other file formats. pybullet provides forward dynamics simulation, inverse dynamics computation, forward and inverse kinematics and collision detection and ray intersection queries. Aside from physics simulation, pybullet supports to rendering, with a CPU renderer and OpenGL visualization and support for virtual reality headsets.',
url='https://github.com/bulletphysics/bullet3',