[bullet] 03/06: Merge tag 'upstream/2.86.1+dfsg' into experimental

Markus Koschany apo at moszumanska.debian.org
Tue Feb 21 02:06:10 UTC 2017


This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch experimental
in repository bullet.

commit 4e94bffe90db178867934a6192203d6ac48e976a
Merge: 1e7468c f3c1f1a
Author: Markus Koschany <apo at debian.org>
Date:   Tue Feb 21 02:30:39 2017 +0100

    Merge tag 'upstream/2.86.1+dfsg' into experimental
    
    Upstream version 2.86.1+dfsg
    
    # gpg: Signatur vom Di 21 Feb 2017 02:30:39 CET
    # gpg:                mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 CMakeLists.txt                                     |    2 +-
 Extras/InverseDynamics/IDRandomUtil.cpp            |    2 +-
 .../InverseDynamics/invdyn_bullet_comparison.cpp   |   20 +-
 build_cmake_pybullet_win32.bat                     |    2 +-
 data/MPL/mpl2.xml                                  |  471 +++++++
 data/dinnerware/dinnerware.mtl                     |   21 +
 data/dinnerware/generate.py                        |  252 ++++
 data/dinnerware/pan_tefal-collision01.obj          |   36 +
 data/dinnerware/pan_tefal-collision02.obj          |   36 +
 data/dinnerware/pan_tefal-collision03.obj          |   36 +
 data/dinnerware/pan_tefal-collision04.obj          |   36 +
 data/dinnerware/pan_tefal-collision05.obj          |   36 +
 data/dinnerware/pan_tefal-collision06.obj          |   36 +
 data/dinnerware/pan_tefal.jpg                      |  Bin 0 -> 41309 bytes
 data/dinnerware/pan_tefal.obj                      | 1352 ++++++++++++++++++++
 data/dinnerware/pan_tefal.urdf                     |   84 ++
 data/dinnerware/plate-collision01.obj              |   34 +
 data/dinnerware/plate-collision02.obj              |   34 +
 data/dinnerware/plate-collision03.obj              |   34 +
 data/dinnerware/plate-collision04.obj              |   34 +
 data/dinnerware/plate-collision05.obj              |   34 +
 data/dinnerware/plate-collision06.obj              |   34 +
 data/dinnerware/plate.obj                          | 1352 ++++++++++++++++++++
 data/dinnerware/plate.urdf                         |   69 +
 data/gripper/wsg50_one_motor_gripper_new.sdf       |    8 +
 data/sphere2_rolling_friction.urdf                 |    1 +
 ...here2_rolling_friction.urdf => sphere_1cm.urdf} |   17 +-
 data/tray/tray_textured.mtl                        |   13 +
 data/tray/tray_textured.obj                        |  213 +++
 data/tray/traybox.urdf                             |   49 +
 docs/pybullet_quickstartguide.pdf                  |  Bin 253251 -> 428975 bytes
 examples/BasicDemo/premake4.lua                    |    3 +-
 examples/Benchmarks/BenchmarkDemo.cpp              |   10 +-
 examples/CommonInterfaces/CommonCameraInterface.h  |    3 +
 examples/CommonInterfaces/CommonExampleInterface.h |    1 +
 .../CommonInterfaces/CommonParameterInterface.h    |    2 +
 examples/ExampleBrowser/CMakeLists.txt             |    4 +
 .../ExampleBrowser/CollisionShape2TriangleMesh.cpp |   19 +-
 .../GwenGUISupport/GwenParameterInterface.cpp      |   16 +-
 .../ExampleBrowser/InProcessExampleBrowser.cpp     |    1 +
 examples/ExampleBrowser/OpenGLExampleBrowser.cpp   |  301 +----
 examples/ExampleBrowser/OpenGLExampleBrowser.h     |    2 +
 examples/ExampleBrowser/OpenGLGuiHelper.cpp        |    7 +-
 examples/ExampleBrowser/premake4.lua               |    5 +
 examples/Importers/ImportURDFDemo/URDF2Bullet.cpp  |   11 +-
 examples/Importers/ImportURDFDemo/UrdfParser.cpp   |   47 +-
 .../MultiThreadedDemo/CommonRigidBodyMTBase.cpp    |  181 ++-
 examples/MultiThreadedDemo/CommonRigidBodyMTBase.h |   27 +
 examples/OpenGLWindow/EGLOpenGLWindow.cpp          |  255 ++--
 examples/OpenGLWindow/GLInstancingRenderer.cpp     |    4 +
 examples/OpenGLWindow/OpenGL2Include.h             |    8 +-
 examples/OpenGLWindow/OpenGLInclude.h              |    6 +
 examples/OpenGLWindow/SimpleCamera.cpp             |   10 +
 examples/OpenGLWindow/SimpleCamera.h               |    5 +-
 examples/OpenGLWindow/SimpleOpenGL2App.cpp         |   32 +-
 examples/OpenGLWindow/SimpleOpenGL3App.cpp         |   20 +-
 examples/OpenGLWindow/X11OpenGLWindow.cpp          |    7 +-
 examples/RoboticsLearning/GripperGraspExample.cpp  |   17 +-
 examples/RoboticsLearning/KukaGraspExample.cpp     |    6 +-
 examples/RoboticsLearning/b3RobotSimAPI.cpp        |   16 +-
 examples/RoboticsLearning/b3RobotSimAPI.h          |    3 +
 examples/SharedMemory/CMakeLists.txt               |   87 +-
 examples/SharedMemory/IKTrajectoryHelper.cpp       |   17 +-
 examples/SharedMemory/IKTrajectoryHelper.h         |    1 +
 examples/SharedMemory/PhysicsClientC_API.cpp       |  141 +-
 examples/SharedMemory/PhysicsClientC_API.h         |   10 +-
 .../SharedMemory/PhysicsClientSharedMemory.cpp     |   14 +
 examples/SharedMemory/PhysicsClientUDP.cpp         |   66 +-
 examples/SharedMemory/PhysicsClientUDP_C_API.cpp   |   12 +-
 examples/SharedMemory/PhysicsDirect.cpp            |    3 +-
 .../SharedMemory/PhysicsServerCommandProcessor.cpp |  282 +++-
 .../SharedMemory/PhysicsServerCommandProcessor.h   |   10 +-
 examples/SharedMemory/PhysicsServerExample.cpp     |  154 ++-
 examples/SharedMemory/SharedMemoryCommands.h       |   33 +-
 .../SharedMemoryInProcessPhysicsC_API.cpp          |   16 +-
 examples/SharedMemory/SharedMemoryPublic.h         |   16 +
 .../TinyRendererVisualShapeConverter.cpp           |   11 +-
 examples/SharedMemory/premake4.lua                 |    6 +-
 examples/SharedMemory/udp/main.cpp                 |   84 +-
 examples/SharedMemory/udp/premake4.lua             |    6 +-
 examples/StandaloneMain/hellovr_opengl_main.cpp    |   66 +-
 examples/Utils/ChromeTraceUtil.cpp                 |  272 ++++
 examples/Utils/ChromeTraceUtil.h                   |    9 +
 examples/Utils/RobotLoggingUtil.cpp                |  253 ++++
 examples/Utils/RobotLoggingUtil.h                  |   54 +
 examples/pybullet/CMakeLists.txt                   |    3 +
 examples/pybullet/forcetorquesensor.py             |   26 +
 examples/pybullet/inverse_kinematics.py            |    4 +-
 examples/pybullet/logMinitaur.py                   |   15 +
 examples/pybullet/manyspheres.py                   |   25 +
 examples/pybullet/minitaur.py                      |   83 ++
 examples/pybullet/minitaur_test.py                 |   33 +
 examples/pybullet/premake4.lua                     |    2 +
 examples/pybullet/pybullet.c                       |  265 +++-
 examples/pybullet/quadruped.py                     |   69 +-
 examples/pybullet/rollPitchYaw.py                  |   26 +
 examples/pybullet/vr_kuka_setup.py                 |    3 +
 examples/pybullet/vrhand.py                        |   96 ++
 src/Bullet3Common/b3Vector3.h                      |   14 +-
 .../CollisionDispatch/SphereTriangleDetector.cpp   |   77 +-
 .../btCompoundCompoundCollisionAlgorithm.cpp       |   11 +
 .../Featherstone/btMultiBodyDynamicsWorld.cpp      |    8 +-
 src/BulletInverseDynamics/IDConfig.hpp             |   14 +-
 src/BulletInverseDynamics/IDMath.cpp               |   50 +-
 src/BulletInverseDynamics/MultiBodyTree.cpp        |    8 +-
 src/LinearMath/btVector3.h                         |   14 +-
 test/CMakeLists.txt                                |    2 +-
 test/InverseDynamics/test_invdyn_kinematics.cpp    |    2 +-
 test/RobotLogging/main.cpp                         |   81 ++
 test/SharedMemory/CMakeLists.txt                   |    2 +
 test/SharedMemory/premake4.lua                     |    6 +
 test/enet/chat/client/main.cpp                     |    2 +-
 test/enet/chat/server/main.cpp                     |    2 +-
 test/enet/nat_punchthrough/client/main.cpp         |    2 +-
 test/enet/nat_punchthrough/server/main.cpp         |    2 +-
 115 files changed, 7180 insertions(+), 767 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/bullet.git



More information about the Pkg-games-commits mailing list