[bullet] 03/06: Merge tag 'upstream/2.83.7+dfsg'

Markus Koschany apo-guest at moszumanska.debian.org
Thu Jan 14 15:19:46 UTC 2016


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

apo-guest pushed a commit to branch master
in repository bullet.

commit 4e4bfd027b842da8229d41590aa7993d59e19a37
Merge: 1c0c2d8 2cf3b5e
Author: Markus Koschany <apo at debian.org>
Date:   Thu Jan 14 15:36:10 2016 +0100

    Merge tag 'upstream/2.83.7+dfsg'
    
    Upstream version 2.83.7+dfsg
    
    # gpg: Signature made Thu 14 Jan 2016 15:35:58 CET using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 .travis.yml                                        |    7 +-
 CMakeLists.txt                                     |  104 +-
 Extras/CMakeLists.txt                              |    4 +
 Extras/HACD/CMakeLists.txt                         |    2 +-
 .../BulletInverseDynamicsUtilsCommon.h             |   17 +
 Extras/InverseDynamics/CMakeLists.txt              |   45 +
 Extras/InverseDynamics/CoilCreator.cpp             |   67 +
 Extras/InverseDynamics/CoilCreator.hpp             |   40 +
 Extras/InverseDynamics/DillCreator.cpp             |  124 ++
 Extras/InverseDynamics/DillCreator.hpp             |   47 +
 Extras/InverseDynamics/IDRandomUtil.cpp            |   70 +
 Extras/InverseDynamics/IDRandomUtil.hpp            |   34 +
 Extras/InverseDynamics/MultiBodyNameMap.cpp        |   78 +
 Extras/InverseDynamics/MultiBodyNameMap.hpp        |   54 +
 Extras/InverseDynamics/MultiBodyTreeCreator.cpp    |   64 +
 Extras/InverseDynamics/MultiBodyTreeCreator.hpp    |   45 +
 Extras/InverseDynamics/MultiBodyTreeDebugGraph.cpp |   64 +
 Extras/InverseDynamics/MultiBodyTreeDebugGraph.hpp |   17 +
 Extras/InverseDynamics/SimpleTreeCreator.cpp       |   69 +
 Extras/InverseDynamics/SimpleTreeCreator.hpp       |   34 +
 Extras/InverseDynamics/User2InternalIndex.cpp      |   99 +
 Extras/InverseDynamics/User2InternalIndex.hpp      |   46 +
 Extras/InverseDynamics/btMultiBodyFromURDF.hpp     |   91 +
 Extras/InverseDynamics/btMultiBodyTreeCreator.cpp  |  270 +++
 Extras/InverseDynamics/btMultiBodyTreeCreator.hpp  |   50 +
 .../InverseDynamics/invdyn_bullet_comparison.cpp   |  307 +++
 .../InverseDynamics/invdyn_bullet_comparison.hpp   |   34 +
 Extras/InverseDynamics/premake4.lua                |   12 +
 Extras/Serialize/BlenderSerialize/CMakeLists.txt   |    2 +-
 Extras/Serialize/BulletFileLoader/CMakeLists.txt   |   43 +-
 Extras/Serialize/BulletFileLoader/bDNA.cpp         |    3 +-
 Extras/Serialize/BulletFileLoader/bFile.cpp        |    2 +-
 .../Serialize/BulletWorldImporter/CMakeLists.txt   |   14 +-
 .../BulletXmlWorldImporter/CMakeLists.txt          |   10 +-
 Extras/Serialize/HeaderGenerator/CMakeLists.txt    |    4 +-
 Extras/Serialize/ReadBulletSample/CMakeLists.txt   |    6 +-
 Extras/Serialize/makesdna/CMakeLists.txt           |    4 +-
 Extras/premake4.lua                                |    2 +-
 appveyor.yml                                       |   10 +
 data/cube.mtl                                      |   23 +-
 data/cube.obj                                      |   72 +-
 data/hinge.urdf                                    |   52 +-
 data/kuka_lwr/kuka.urdf                            |   78 +-
 data/kuka_lwr/kuka_lwr_arm.urdf.xacro              |  132 +-
 data/multibody.bullet                              |  Bin 14520 -> 14520 bytes
 docs/logo/bullet_logo_2010_9.emf                   |  Bin 0 -> 38096 bytes
 docs/logo/bullet_logo_2010_9.eps                   | 1815 +++++++++++++++++
 docs/logo/bullet_logo_2010_9.pdf                   |  Bin 0 -> 50637 bytes
 docs/logo/bullet_logo_2010_9.png                   |  Bin 0 -> 7462 bytes
 docs/logo/bullet_logo_2010_9.ps                    | 1813 +++++++++++++++++
 docs/logo/bullet_logo_2010_9.svg                   |  441 +++++
 docs/logo/bullet_logo_2010_9_1080p.png             |  Bin 0 -> 48842 bytes
 docs/logo/bullet_logo_2010_9_plain.svg             |  237 +++
 docs/logo/bullet_logo_original_2005.png            |  Bin 0 -> 3380 bytes
 examples/BasicDemo/CMakeLists.txt                  |    8 +-
 examples/CMakeLists.txt                            |    6 +-
 examples/Collision/CollisionSdkC_Api.cpp           |  130 ++
 examples/Collision/CollisionSdkC_Api.h             |  111 ++
 examples/Collision/CollisionTutorialBullet2.cpp    |  388 ++++
 examples/Collision/CollisionTutorialBullet2.h      |   12 +
 .../Collision/Internal/Bullet2CollisionSdk.cpp     |  278 +++
 examples/Collision/Internal/Bullet2CollisionSdk.h  |   56 +
 .../Collision/Internal/CollisionSdkInterface.h     |   55 +
 .../Internal/RealTimeBullet3CollisionSdk.cpp       |  481 +++++
 .../Internal/RealTimeBullet3CollisionSdk.h         |   55 +
 examples/CommonInterfaces/CommonMultiBodyBase.h    |    5 +
 .../CommonInterfaces/CommonParameterInterface.h    |   24 +-
 examples/CommonInterfaces/CommonRenderInterface.h  |    1 +
 examples/ExampleBrowser/CMakeLists.txt             |  107 +-
 examples/ExampleBrowser/ExampleEntries.cpp         |   37 +-
 .../GwenGUISupport/GwenParameterInterface.cpp      |   78 +-
 .../GwenGUISupport/GwenParameterInterface.h        |    3 +
 .../GwenGUISupport/gwenUserInterface.cpp           |   11 +-
 .../GwenGUISupport/gwenUserInterface.h             |    4 +-
 examples/ExampleBrowser/OpenGLExampleBrowser.cpp   |    4 +-
 examples/ExampleBrowser/premake4.lua               |   24 +-
 examples/HelloWorld/CMakeLists.txt                 |   10 +-
 .../Importers/ImportObjDemo/ImportObjExample.cpp   |    4 +-
 .../ImportURDFDemo/BulletUrdfImporter.cpp          |   33 +-
 .../Importers/ImportURDFDemo/BulletUrdfImporter.h  |    2 +
 .../Importers/ImportURDFDemo/ImportURDFSetup.cpp   |    6 +-
 .../ImportURDFDemo/MultiBodyCreationInterface.h    |    2 +-
 .../ImportURDFDemo/MyMultiBodyCreator.cpp          |    4 +-
 .../Importers/ImportURDFDemo/MyMultiBodyCreator.h  |    3 +-
 examples/Importers/ImportURDFDemo/URDF2Bullet.cpp  |   14 +-
 .../ImportURDFDemo/URDFImporterInterface.h         |    2 +
 examples/Importers/ImportURDFDemo/UrdfParser.cpp   |    4 +-
 .../InverseDynamics/InverseDynamicsExample.cpp     |  332 ++++
 examples/InverseDynamics/InverseDynamicsExample.h  |   28 +
 examples/MultiBody/InvertedPendulumPDControl.cpp   |  514 +++--
 examples/MultiBody/MultiBodyConstraintFeedback.cpp |   13 +-
 examples/MultiBody/MultiDofDemo.cpp                |   11 +-
 examples/MultiBody/Pendulum.cpp                    |  226 +++
 examples/MultiBody/Pendulum.h                      |    7 +
 examples/MultiBody/TestJointTorqueSetup.cpp        |   13 +-
 examples/MultiBody/pendulum_gold.h                 | 2058 ++++++++++++++++++++
 examples/MultiThreading/MultiThreadingExample.cpp  |  325 ++++
 examples/MultiThreading/MultiThreadingExample.h    |   11 +
 examples/MultiThreading/b3PosixThreadSupport.cpp   |  450 +++++
 examples/MultiThreading/b3PosixThreadSupport.h     |  144 ++
 .../MultiThreading/b3ThreadSupportInterface.cpp    |   22 +
 examples/MultiThreading/b3ThreadSupportInterface.h |   90 +
 examples/MultiThreading/b3Win32ThreadSupport.cpp   |  457 +++++
 examples/MultiThreading/b3Win32ThreadSupport.h     |  139 ++
 examples/MultiThreading/main.cpp                   |  177 ++
 examples/MultiThreading/premake4.lua               |   51 +
 examples/OpenGLWindow/CMakeLists.txt               |   15 +-
 examples/OpenGLWindow/GLInstancingRenderer.cpp     |   15 +-
 examples/OpenGLWindow/GLInstancingRenderer.h       |    1 +
 examples/OpenGLWindow/MacOpenGLWindow.mm           |    4 +-
 examples/OpenGLWindow/SimpleOpenGL2Renderer.cpp    |    5 +
 examples/OpenGLWindow/SimpleOpenGL2Renderer.h      |    2 +
 examples/Raycast/RaytestDemo.cpp                   |    2 +-
 examples/SharedMemory/BodyJointInfoUtility.h       |   75 +
 examples/SharedMemory/PhysicsClient.cpp            |  415 +---
 examples/SharedMemory/PhysicsClient.h              |   54 +-
 examples/SharedMemory/PhysicsClientC_API.cpp       |  520 ++++-
 examples/SharedMemory/PhysicsClientC_API.h         |  121 +-
 examples/SharedMemory/PhysicsClientExample.cpp     |  592 ++++--
 .../SharedMemory/PhysicsClientSharedMemory.cpp     |  492 +++++
 examples/SharedMemory/PhysicsClientSharedMemory.h  |   48 +
 examples/SharedMemory/PhysicsDirect.cpp            |  330 ++++
 examples/SharedMemory/PhysicsDirect.h              |   62 +
 examples/SharedMemory/PhysicsDirectC_API.cpp       |   14 +
 examples/SharedMemory/PhysicsDirectC_API.h         |   19 +
 examples/SharedMemory/PhysicsLoopBack.cpp          |  115 ++
 examples/SharedMemory/PhysicsLoopBack.h            |   58 +
 examples/SharedMemory/PhysicsLoopBackC_API.cpp     |   15 +
 examples/SharedMemory/PhysicsLoopBackC_API.h       |   19 +
 examples/SharedMemory/PhysicsServer.cpp            |  892 +--------
 examples/SharedMemory/PhysicsServer.h              |   52 +-
 .../SharedMemory/PhysicsServerCommandProcessor.cpp | 1812 +++++++++++++++++
 .../SharedMemory/PhysicsServerCommandProcessor.h   |   53 +
 examples/SharedMemory/PhysicsServerExample.cpp     |  180 +-
 examples/SharedMemory/PhysicsServerExample.h       |    5 +
 .../SharedMemory/PhysicsServerSharedMemory.cpp     |  304 +++
 ...PhysicsServer.h => PhysicsServerSharedMemory.h} |   26 +-
 examples/SharedMemory/PosixSharedMemory.cpp        |   16 +-
 examples/SharedMemory/RobotControlExample.cpp      |  412 +++-
 examples/SharedMemory/RobotControlExample.h        |    7 +
 examples/SharedMemory/SharedMemoryBlock.h          |   15 +-
 examples/SharedMemory/SharedMemoryCommands.h       |  161 +-
 examples/SharedMemory/SharedMemoryPublic.h         |  113 ++
 examples/SharedMemory/premake4.lua                 |   25 +-
 examples/SimpleOpenGL3/CMakeLists.txt              |   26 +-
 examples/SimpleOpenGL3/main.cpp                    |    2 +-
 examples/Tutorial/Tutorial.cpp                     |    7 +
 src/Bullet3Collision/CMakeLists.txt                |   12 +-
 .../NarrowPhaseCollision/shared/b3Collidable.h     |   28 +-
 src/Bullet3Common/CMakeLists.txt                   |    2 +-
 src/Bullet3Dynamics/CMakeLists.txt                 |   28 +-
 src/Bullet3Geometry/CMakeLists.txt                 |    2 +-
 src/Bullet3OpenCL/CMakeLists.txt                   |   62 +-
 .../NarrowphaseCollision/b3GjkEpa.cpp              |   48 +-
 .../Bullet2FileLoader/CMakeLists.txt               |   28 +-
 src/BulletCollision/BroadphaseCollision/btDbvt.h   |   33 +-
 .../BroadphaseCollision/btOverlappingPairCache.cpp |    1 -
 .../BroadphaseCollision/btOverlappingPairCache.h   |    1 -
 src/BulletCollision/CMakeLists.txt                 |    6 +-
 .../CollisionDispatch/btCollisionWorld.h           |    2 +-
 .../btConvex2dConvex2dAlgorithm.cpp                |    8 +-
 .../btConvex2dConvex2dAlgorithm.h                  |    3 -
 .../CollisionDispatch/btHashedSimplePairCache.cpp  |    4 +-
 .../CollisionDispatch/btHashedSimplePairCache.h    |    4 +-
 .../CollisionDispatch/btInternalEdgeUtility.cpp    |    6 +-
 .../CollisionShapes/btBvhTriangleMeshShape.h       |    4 +
 .../CollisionShapes/btConvexPolyhedron.cpp         |    3 +-
 .../btMultimaterialTriangleMeshShape.h             |    1 -
 .../NarrowPhaseCollision/btGjkPairDetector.cpp     |   44 +-
 .../NarrowPhaseCollision/btPersistentManifold.h    |    4 -
 .../btPolyhedralContactClipping.cpp                |    2 +-
 .../btVoronoiSimplexSolver.cpp                     |    3 +
 src/BulletDynamics/CMakeLists.txt                  |    2 +-
 .../ConstraintSolver/btConeTwistConstraint.cpp     |    2 +-
 .../ConstraintSolver/btConeTwistConstraint.h       |   66 +-
 .../ConstraintSolver/btGeneric6DofConstraint.h     |   27 +-
 .../btGeneric6DofSpringConstraint.h                |   20 +
 .../ConstraintSolver/btHingeConstraint.h           |   37 +-
 .../ConstraintSolver/btPoint2PointConstraint.h     |    5 +
 .../ConstraintSolver/btSliderConstraint.h          |    5 +
 .../ConstraintSolver/btTypedConstraint.h           |    1 +
 src/BulletDynamics/Dynamics/btRigidBody.cpp        |    7 -
 src/BulletDynamics/Featherstone/btMultiBody.cpp    |  679 +------
 src/BulletDynamics/Featherstone/btMultiBody.h      |  102 +-
 .../Featherstone/btMultiBodyConstraint.cpp         |   42 +-
 .../Featherstone/btMultiBodyConstraintSolver.cpp   |  166 +-
 .../Featherstone/btMultiBodyConstraintSolver.h     |    2 +-
 .../Featherstone/btMultiBodyDynamicsWorld.cpp      |   41 +-
 .../btMultiBodyJointLimitConstraint.cpp            |    3 +-
 .../Featherstone/btMultiBodyJointMotor.cpp         |    3 +-
 src/BulletDynamics/Featherstone/btMultiBodyLink.h  |   14 -
 src/BulletDynamics/Vehicle/btRaycastVehicle.h      |    2 -
 src/BulletInverseDynamics/CMakeLists.txt           |   66 +
 src/BulletInverseDynamics/IDConfig.hpp             |   67 +
 src/BulletInverseDynamics/IDConfigBuiltin.hpp      |   37 +
 src/BulletInverseDynamics/IDConfigEigen.hpp        |   44 +
 src/BulletInverseDynamics/IDErrorMessages.hpp      |   34 +
 src/BulletInverseDynamics/IDMath.cpp               |  371 ++++
 src/BulletInverseDynamics/IDMath.hpp               |   88 +
 src/BulletInverseDynamics/MultiBodyTree.cpp        |  331 ++++
 src/BulletInverseDynamics/MultiBodyTree.hpp        |  308 +++
 .../details/IDEigenInterface.hpp                   |   17 +
 .../details/IDLinearMathInterface.hpp              |  112 ++
 src/BulletInverseDynamics/details/IDMatVec.hpp     |  328 ++++
 .../details/MultiBodyTreeImpl.cpp                  |  844 ++++++++
 .../details/MultiBodyTreeImpl.hpp                  |  236 +++
 .../details/MultiBodyTreeInitCache.cpp             |  113 ++
 .../details/MultiBodyTreeInitCache.hpp             |  109 ++
 src/BulletInverseDynamics/premake4.lua             |   12 +
 src/BulletSoftBody/CMakeLists.txt                  |    2 +-
 src/CMakeLists.txt                                 |    1 +
 src/LinearMath/CMakeLists.txt                      |    2 +-
 src/LinearMath/btAlignedObjectArray.h              |   14 +-
 src/LinearMath/btHashMap.h                         |    4 +
 src/LinearMath/btMatrixX.h                         |    1 +
 src/LinearMath/btTransform.h                       |    4 +-
 test/BulletDynamics/pendulum/CMakeLists.txt        |   30 +
 test/BulletDynamics/pendulum/premake4.lua          |   34 +
 test/CMakeLists.txt                                |    8 +-
 test/InverseDynamics/CMakeLists.txt                |   33 +
 test/InverseDynamics/premake4.lua                  |  107 +
 test/InverseDynamics/test_invdyn_bullet.cpp        |  113 ++
 test/InverseDynamics/test_invdyn_kinematics.cpp    |  373 ++++
 test/SharedMemory/premake4.lua                     |  124 +-
 test/SharedMemory/test.c                           |  270 +--
 test/collision/CMakeLists.txt                      |   39 +
 test/collision/main.cpp                            |    8 +-
 227 files changed, 22911 insertions(+), 3727 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