diff --git a/MANIFEST.in b/MANIFEST.in index 0d31466ce..1c978abbd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,7 +8,7 @@ recursive-include src *.hpp recursive-include examples/pybullet/gym *.* include examples/ThirdPartyLibs/enet/unix.c include examples/OpenGLWindow/X11OpenGLWindow.cpp -include examples/ThirdPartyLibs/Glew/glew.c +recursive-include examples/ThirdPartyLibs/glad *.* include examples/ThirdPartyLibs/enet/win32.c include examples/OpenGLWindow/Win32Window.cpp include examples/OpenGLWindow/Win32OpenGLWindow.cpp diff --git a/examples/pybullet/gym/pybullet_data/random_urdfs.zip b/examples/pybullet/gym/pybullet_data/random_urdfs.zip deleted file mode 100644 index 58ed00628..000000000 Binary files a/examples/pybullet/gym/pybullet_data/random_urdfs.zip and /dev/null differ diff --git a/examples/pybullet/gym/pybullet_envs/prediction/__init__.py b/examples/pybullet/gym/pybullet_envs/prediction/__init__.py index a629e0fe7..26f76e102 100644 --- a/examples/pybullet/gym/pybullet_envs/prediction/__init__.py +++ b/examples/pybullet/gym/pybullet_envs/prediction/__init__.py @@ -1,3 +1,3 @@ -from . import boxstack_pybullet_sim.py -from . import pybullet_sim_gym_env.py +from . import boxstack_pybullet_sim +from . import pybullet_sim_gym_env diff --git a/examples/pybullet/gym/pybullet_envs/prediction/pybullet_sim_gym_env.py b/examples/pybullet/gym/pybullet_envs/prediction/pybullet_sim_gym_env.py index 5c1b52757..eabd7b749 100644 --- a/examples/pybullet/gym/pybullet_envs/prediction/pybullet_sim_gym_env.py +++ b/examples/pybullet/gym/pybullet_envs/prediction/pybullet_sim_gym_env.py @@ -190,7 +190,7 @@ class PyBulletSimGymEnv(gym.Env): proj_matrix=[1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, -1.0000200271606445, -1.0, 0.0, 0.0, -0.02000020071864128, 0.0] (_, _, px, _, _) = self._pybullet_client.getCameraImage( width=self._render_width, height=self._render_height, viewMatrix=view_matrix, - projectionMatrix=proj_matrix, renderer=pybullet.ER_TINY_RENDERER) + projectionMatrix=proj_matrix, renderer=pybullet.ER_BULLET_HARDWARE_OPENGL)#ER_TINY_RENDERER) rgb_array = np.array(px, dtype=np.uint8) rgb_array = np.reshape(rgb_array, (self._render_height, self._render_width, 4)) rgb_array = rgb_array[:, :, :3] diff --git a/setup.py b/setup.py index 0616a04dc..664059460 100644 --- a/setup.py +++ b/setup.py @@ -446,7 +446,7 @@ print("-----") setup( name = 'pybullet', - version='1.8.9', + version='1.9.1', 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',