Scarfski/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3.git synced 2026-10-30 12:35:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into deepmimic-gym-fixes

Browse Source
This commit is contained in:
ManifoldFR
2020-07-02 10:12:06 +02:00
parent b200bf59e0 63e1d7d840
commit 53a3af8918
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_visual_studio_vr_pybullet_double_cmake.bat
+1 -1
View File
@@ -1,4 +1,4 @@
mkdir build_cmake
cd build_cmake
cmake -DBUILD_PYBULLET=ON -DUSE_DOUBLE_PRECISION=ON -DCMAKE_BUILD_TYPE=Release -DPYTHON_INCLUDE_DIR=c:\python-3.5.3.amd64\include -DPYTHON_LIBRARY=c:\python-3.5.3.amd64\libs\python35.lib -DPYTHON_DEBUG_LIBRARY=c:\python-3.5.3.amd64\libs\python35_d.lib -G "Visual Studio 14 2015 Win64" ..
cmake -DBUILD_PYBULLET=ON -DUSE_DOUBLE_PRECISION=ON -DCMAKE_BUILD_TYPE=Release -DPYTHON_INCLUDE_DIR=c:\python-3.5.3.amd64\include -DPYTHON_LIBRARY=c:\python-3.5.3.amd64\libs\python35.lib -DPYTHON_DEBUG_LIBRARY=c:\python-3.5.3.amd64\libs\python35_d.lib -G "Visual Studio 16 2019" ..
start .
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
+1 -1
View File
@@ -11789,7 +11789,7 @@ bool PhysicsServerCommandProcessor::processCreateUserConstraintCommand(const str
if (userConstraintPtr->m_sbHandle >= 0)
{
InternalBodyHandle* sbodyHandle = m_data->m_bodyHandles.getHandle(clientCmd.m_userConstraintArguments.m_parentBodyIndex);
InternalBodyHandle* sbodyHandle = m_data->m_bodyHandles.getHandle(userConstraintPtr->m_sbHandle);
if (sbodyHandle)
{
if (sbodyHandle->m_softBody)
examples/pybullet/gym/pybullet_envs/__init__.py
+6
View File
@@ -229,4 +229,10 @@ register(id='HumanoidFlagrunHarderBulletEnv-v0',
def getList():
btenvs = ['- ' + spec.id for spec in gym.envs.registry.all() if spec.id.find('Bullet') >= 0]
btenvs.extend([
'- MinitaurExtendedEnv-v0', '- MinitaurReactiveEnv-v0',
'- MinitaurBallGymEnv-v0', '- MinitaurTrottingEnv-v0',
'- MinitaurStandGymEnv-v0', '- MinitaurAlternatingLegsEnv-v0',
'- MinitaurFourLegStandEnv-v0', '- KukaDiverseObjectGrasping-v0'
])
return btenvs
setup.py
+1 -1
View File
@@ -501,7 +501,7 @@ if 'BT_USE_EGL' in EGL_CXX_FLAGS:
setup(
name='pybullet',
version='2.8.2',
version='2.8.3',
description=
'Official Python Interface for the Bullet Physics SDK specialized for Robotics Simulation and Reinforcement Learning',
long_description=