This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch experimental in repository bullet.
commit 922d248db0d836b976abe3f2400e19e467f242ef Merge: a624d2e 6746341 Author: Markus Koschany <[email protected]> Date: Thu Feb 9 05:01:52 2017 +0100 Merge tag 'upstream/2.86+dfsg' into experimental Upstream version 2.86+dfsg # gpg: Signatur vom Do 09 Feb 2017 05:01:52 CET # gpg: mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4 # gpg: Korrekte Signatur von "Markus Koschany <[email protected]>" [ultimativ] # gpg: alias "Markus Koschany <[email protected]>" [ultimativ] # gpg: alias "Markus Koschany <[email protected]>" [ultimativ] CMakeLists.txt | 27 +- Extras/ConvexDecomposition/concavity.cpp | 26 +- .../BulletFileLoader/autogenerated/bullet.h | 4 + Extras/Serialize/BulletFileLoader/bDNA.cpp | 3 +- Extras/Serialize/BulletFileLoader/bFile.cpp | 13 +- .../BulletWorldImporter/btBulletWorldImporter.cpp | 2 - .../BulletWorldImporter/btWorldImporter.cpp | 17 +- .../btBulletXmlWorldImporter.cpp | 92 +- README.md | 13 +- VERSION | 2 +- build_and_run_cmake_pybullet_double.sh | 10 + build_cmake_pybullet_win32.bat | 4 + build_visual_studio_vr_pybullet_double.bat | 17 +- data/MPL/LICENSE.txt | 19 + data/MPL/MPL.xml | 473 + data/MPL/mesh/index0.STL | Bin 0 -> 43084 bytes data/MPL/mesh/index1.STL | Bin 0 -> 52684 bytes data/MPL/mesh/index2.STL | Bin 0 -> 109284 bytes data/MPL/mesh/index3.STL | Bin 0 -> 111184 bytes data/MPL/mesh/middle0.STL | Bin 0 -> 43084 bytes data/MPL/mesh/middle1.STL | Bin 0 -> 52684 bytes data/MPL/mesh/middle2.STL | Bin 0 -> 109184 bytes data/MPL/mesh/middle3.STL | Bin 0 -> 111184 bytes data/MPL/mesh/palm.STL | Bin 0 -> 158184 bytes data/MPL/mesh/pinky0.STL | Bin 0 -> 42584 bytes data/MPL/mesh/pinky1.STL | Bin 0 -> 61684 bytes data/MPL/mesh/pinky2.STL | Bin 0 -> 94684 bytes data/MPL/mesh/pinky3.STL | Bin 0 -> 160984 bytes data/MPL/mesh/ring0.STL | Bin 0 -> 43084 bytes data/MPL/mesh/ring1.STL | Bin 0 -> 52684 bytes data/MPL/mesh/ring2.STL | Bin 0 -> 109184 bytes data/MPL/mesh/ring3.STL | Bin 0 -> 111184 bytes data/MPL/mesh/thumb0.STL | Bin 0 -> 17884 bytes data/MPL/mesh/thumb1.STL | Bin 0 -> 69084 bytes data/MPL/mesh/thumb2.STL | Bin 0 -> 67984 bytes data/MPL/mesh/thumb3.STL | Bin 0 -> 99184 bytes data/MPL/mesh/wristx.STL | Bin 0 -> 58684 bytes data/MPL/mesh/wristy.STL | Bin 0 -> 101484 bytes data/MPL/mesh/wristz.STL | Bin 0 -> 54584 bytes data/capsule.urdf | 23 + data/door.urdf | 2 +- data/gripper/wsg50_one_motor_gripper_free_base.sdf | 8 + .../wsg50_one_motor_gripper_left_finger.urdf | 27 + data/gripper/wsg50_one_motor_gripper_new.sdf | 2 +- .../wsg50_one_motor_gripper_new_free_base.sdf | 8 + ...w.sdf => wsg50_one_motor_gripper_no_finger.sdf} | 95 +- .../wsg50_one_motor_gripper_right_finger.urdf | 27 + data/humanoid/LICENSE.txt | 26 + data/humanoid/nao.urdf | 2663 ++++++ .../nao_meshes/meshes/V40/HeadPitch_0.10.stl | Bin 0 -> 392334 bytes .../nao_meshes/meshes/V40/HeadYaw_0.10.stl | Bin 0 -> 484 bytes .../nao_meshes/meshes/V40/LAnklePitch_0.10.stl | Bin 0 -> 734 bytes .../nao_meshes/meshes/V40/LAnkleRoll_0.10.stl | Bin 0 -> 15734 bytes .../nao_meshes/meshes/V40/LElbowRoll_0.10.stl | Bin 0 -> 4234 bytes .../nao_meshes/meshes/V40/LFinger11_0.10.stl | Bin 0 -> 5634 bytes .../nao_meshes/meshes/V40/LFinger12_0.10.stl | Bin 0 -> 5634 bytes .../nao_meshes/meshes/V40/LFinger13_0.10.stl | Bin 0 -> 4984 bytes .../nao_meshes/meshes/V40/LFinger21_0.10.stl | Bin 0 -> 5634 bytes .../nao_meshes/meshes/V40/LFinger22_0.10.stl | Bin 0 -> 5634 bytes .../nao_meshes/meshes/V40/LFinger23_0.10.stl | Bin 0 -> 4984 bytes .../nao_meshes/meshes/V40/LHipPitch_0.10.stl | Bin 0 -> 11334 bytes .../nao_meshes/meshes/V40/LHipRoll_0.10.stl | Bin 0 -> 534 bytes .../nao_meshes/meshes/V40/LHipYawPitch_0.10.stl | Bin 0 -> 14934 bytes .../nao_meshes/meshes/V40/LKneePitch_0.10.stl | Bin 0 -> 17134 bytes .../nao_meshes/meshes/V40/LShoulderPitch_0.10.stl | Bin 0 -> 1084 bytes .../nao_meshes/meshes/V40/LShoulderRoll_0.10.stl | Bin 0 -> 20834 bytes .../nao_meshes/meshes/V40/LThumb1_0.10.stl | Bin 0 -> 5584 bytes .../nao_meshes/meshes/V40/LThumb2_0.10.stl | Bin 0 -> 4984 bytes .../nao_meshes/meshes/V40/LWristYaw_0.10.stl | Bin 0 -> 206334 bytes .../nao_meshes/meshes/V40/RAnklePitch_0.10.stl | Bin 0 -> 734 bytes .../nao_meshes/meshes/V40/RAnkleRoll_0.10.stl | Bin 0 -> 15734 bytes .../nao_meshes/meshes/V40/RElbowRoll_0.10.stl | Bin 0 -> 4184 bytes .../nao_meshes/meshes/V40/RFinger11_0.10.stl | Bin 0 -> 5584 bytes .../nao_meshes/meshes/V40/RFinger12_0.10.stl | Bin 0 -> 5634 bytes .../nao_meshes/meshes/V40/RFinger13_0.10.stl | Bin 0 -> 4984 bytes .../nao_meshes/meshes/V40/RFinger21_0.10.stl | Bin 0 -> 5634 bytes .../nao_meshes/meshes/V40/RFinger22_0.10.stl | Bin 0 -> 5634 bytes .../nao_meshes/meshes/V40/RFinger23_0.10.stl | Bin 0 -> 4984 bytes .../nao_meshes/meshes/V40/RHipPitch_0.10.stl | Bin 0 -> 11334 bytes .../nao_meshes/meshes/V40/RHipRoll_0.10.stl | Bin 0 -> 534 bytes .../nao_meshes/meshes/V40/RHipYawPitch_0.10.stl | Bin 0 -> 14934 bytes .../nao_meshes/meshes/V40/RKneePitch_0.10.stl | Bin 0 -> 17134 bytes .../nao_meshes/meshes/V40/RShoulderPitch_0.10.stl | Bin 0 -> 1084 bytes .../nao_meshes/meshes/V40/RShoulderRoll_0.10.stl | Bin 0 -> 20834 bytes .../nao_meshes/meshes/V40/RThumb1_0.10.stl | Bin 0 -> 5584 bytes .../nao_meshes/meshes/V40/RThumb2_0.10.stl | Bin 0 -> 4984 bytes .../nao_meshes/meshes/V40/RWristYaw_0.10.stl | Bin 0 -> 20684 bytes data/humanoid/nao_meshes/meshes/V40/Torso_0.10.stl | Bin 0 -> 36184 bytes data/husky/meshes/base_link.stl | Bin 0 -> 60484 bytes data/kiva_shelf/0_Bullet3Demo.txt | 7 - data/kuka_iiwa/model.sdf | 16 +- data/kuka_iiwa/model_free_base.urdf | 289 + data/mjcf/ant.xml | 80 + data/mjcf/capsule.xml | 13 + data/mjcf/hello_mjcf.xml | 13 + data/mjcf/hopper.xml | 44 + data/mjcf/humanoid.xml | 130 + data/mjcf/inverted_double_pendulum.xml | 47 + data/mjcf/inverted_pendulum.xml | 27 + data/mjcf/reacher.xml | 39 + data/mjcf/swimmer.xml | 38 + data/multibody.bullet | Bin 14660 -> 14712 bytes data/plane.obj | 14 +- data/plane.urdf | 7 +- data/quadruped/quadruped.urdf | 712 ++ data/r2d2.urdf | 12 +- data/torus/plane_only.mtl | 10 + data/torus/plane_only.obj | 7913 +++++++++++++++++ data/torus/torus.mtl | 10 + data/torus/torus.obj | 1446 +++ data/{plane.urdf => torus/torus.urdf} | 17 +- data/torus/torus_only.mtl | 12 + data/torus/torus_only.obj | 1474 +++ data/torus/torus_with_plane.mtl | 10 + data/torus/torus_with_plane.obj | 9384 ++++++++++++++++++++ data/torus/torus_with_plane.urdf | 33 + data/torus/torus_with_separate_plane.urdf | 48 + data/tray/tray.jpg | Bin 0 -> 369344 bytes data/tray/tray_textured2.mtl | 13 + data/tray/tray_textured2.obj | 255 + data/{plane.urdf => tray/tray_textured2.urdf} | 16 +- docs/pybullet_quickstartguide.pdf | Bin 0 -> 253251 bytes examples/BasicDemo/CMakeLists.txt | 7 +- examples/BasicDemo/premake4.lua | 7 +- examples/Benchmarks/BenchmarkDemo.cpp | 117 +- examples/CMakeLists.txt | 2 +- examples/Collision/CollisionTutorialBullet2.cpp | 12 +- .../Collision/Internal/Bullet2CollisionSdk.cpp | 9 +- .../Internal/RealTimeBullet3CollisionSdk.cpp | 25 +- examples/CommonInterfaces/CommonCameraInterface.h | 1 + .../CommonInterfaces/CommonGUIHelperInterface.h | 26 +- .../CommonInterfaces/CommonGraphicsAppInterface.h | 2 +- examples/CommonInterfaces/CommonMultiBodyBase.h | 58 +- .../CommonInterfaces/CommonParameterInterface.h | 4 +- examples/CommonInterfaces/CommonRenderInterface.h | 1 + examples/Constraints/ConstraintDemo.cpp | 13 +- examples/Constraints/Dof6Spring2Setup.cpp | 2 - examples/Constraints/TestHingeTorque.cpp | 10 +- examples/Evolution/NN3DWalkers.cpp | 1058 +++ .../NN3DWalkers.h} | 17 +- examples/Evolution/NN3DWalkersTimeWarpBase.h | 898 ++ examples/ExampleBrowser/CMakeLists.txt | 94 +- examples/ExampleBrowser/ExampleEntries.cpp | 17 +- examples/ExampleBrowser/GL_ShapeDrawer.cpp | 22 +- examples/ExampleBrowser/GL_ShapeDrawer.h | 4 +- .../GwenGUISupport/GwenParameterInterface.cpp | 29 +- .../GwenGUISupport/GwenProfileWindow.cpp | 36 +- .../GwenGUISupport/GwenProfileWindow.h | 2 + .../ExampleBrowser/InProcessExampleBrowser.cpp | 28 +- examples/ExampleBrowser/OpenGLExampleBrowser.cpp | 379 +- examples/ExampleBrowser/OpenGLGuiHelper.cpp | 6 +- examples/ExampleBrowser/OpenGLGuiHelper.h | 23 + examples/ExampleBrowser/main.cpp | 23 +- examples/ExampleBrowser/premake4.lua | 13 +- examples/ExtendedTutorials/InclinedPlane.cpp | 28 +- examples/ExtendedTutorials/MultiPendulum.cpp | 21 +- examples/ExtendedTutorials/NewtonsCradle.cpp | 22 +- examples/ExtendedTutorials/NewtonsRopeCradle.cpp | 21 +- examples/ExtendedTutorials/premake4.lua | 4 + examples/ForkLift/ForkLiftDemo.cpp | 4 +- examples/FractureDemo/btFractureDynamicsWorld.cpp | 6 +- .../ImportColladaDemo/LoadMeshFromCollada.cpp | 4 +- .../ImportMJCFDemo/BulletMJCFImporter.cpp | 1687 ++++ .../Importers/ImportMJCFDemo/BulletMJCFImporter.h | 82 + .../ImportMJCFSetup.cpp} | 274 +- .../Importers/ImportMJCFDemo/ImportMJCFSetup.h | 8 + .../ImportMeshUtility/b3ImportMeshUtility.cpp | 3 +- .../Wavefront2GLInstanceGraphicsShape.cpp | 4 +- .../Importers/ImportSDFDemo/ImportSDFSetup.cpp | 21 +- .../ImportURDFDemo/BulletUrdfImporter.cpp | 32 +- .../Importers/ImportURDFDemo/BulletUrdfImporter.h | 2 +- .../Importers/ImportURDFDemo/ImportURDFSetup.cpp | 23 +- examples/Importers/ImportURDFDemo/URDF2Bullet.cpp | 93 +- examples/Importers/ImportURDFDemo/URDF2Bullet.h | 3 +- .../ImportURDFDemo/URDFImporterInterface.h | 10 +- examples/Importers/ImportURDFDemo/URDFJointTypes.h | 9 + examples/Importers/ImportURDFDemo/UrdfParser.cpp | 44 +- examples/Importers/ImportURDFDemo/UrdfParser.h | 17 +- .../InverseDynamics/InverseDynamicsExample.cpp | 6 +- .../InverseKinematics/InverseKinematicsExample.cpp | 16 +- examples/MultiBody/InvertedPendulumPDControl.cpp | 14 +- examples/MultiBody/MultiBodyConstraintFeedback.cpp | 16 +- examples/MultiBody/MultiBodySoftContact.cpp | 6 +- examples/MultiBody/MultiDofDemo.cpp | 15 +- examples/MultiBody/Pendulum.cpp | 4 +- examples/MultiBody/TestJointTorqueSetup.cpp | 8 +- .../MultiThreadedDemo/CommonRigidBodyMTBase.cpp | 882 ++ .../CommonRigidBodyMTBase.h} | 238 +- examples/MultiThreadedDemo/MultiThreadedDemo.cpp | 281 + .../MultiThreadedDemo.h} | 17 +- examples/MultiThreadedDemo/ParallelFor.h | 336 + examples/MultiThreading/MultiThreadingExample.cpp | 9 +- examples/MultiThreading/b3Win32ThreadSupport.cpp | 5 +- examples/OpenCL/CommonOpenCL/CommonOpenCLBase.h | 4 +- examples/OpenCL/broadphase/PairBench.cpp | 25 +- examples/OpenCL/rigidbody/GpuConvexScene.cpp | 47 +- examples/OpenCL/rigidbody/GpuRigidBodyDemo.cpp | 19 +- examples/OpenCL/rigidbody/GpuRigidBodyDemo.h | 3 +- .../rigidbody/GpuRigidBodyDemoInternalData.h | 4 +- examples/OpenGLWindow/EGLOpenGLWindow.cpp | 207 + examples/OpenGLWindow/EGLOpenGLWindow.h | 76 + examples/OpenGLWindow/GLInstancingRenderer.cpp | 16 +- examples/OpenGLWindow/GLPrimInternalData.h | 7 +- examples/OpenGLWindow/GLPrimitiveRenderer.cpp | 233 +- examples/OpenGLWindow/GLPrimitiveRenderer.h | 25 +- examples/OpenGLWindow/GwenOpenGL3CoreRenderer.h | 28 +- examples/OpenGLWindow/MacOpenGLWindow.mm | 103 +- examples/OpenGLWindow/SimpleCamera.cpp | 15 + examples/OpenGLWindow/SimpleCamera.h | 2 + examples/OpenGLWindow/SimpleOpenGL2App.cpp | 18 +- examples/OpenGLWindow/SimpleOpenGL2App.h | 2 +- examples/OpenGLWindow/SimpleOpenGL2Renderer.cpp | 1 + examples/OpenGLWindow/SimpleOpenGL3App.cpp | 18 +- examples/OpenGLWindow/SimpleOpenGL3App.h | 2 +- examples/OpenGLWindow/fontstash.cpp | 2 +- examples/Raycast/RaytestDemo.cpp | 2 +- .../RenderingExamples/DynamicTexturedCubeDemo.cpp | 10 +- examples/RenderingExamples/RaytracerSetup.cpp | 16 +- examples/RenderingExamples/TimeSeriesCanvas.cpp | 2 +- examples/RenderingExamples/TinyRendererSetup.cpp | 69 +- examples/RenderingExamples/TinyVRGui.cpp | 7 +- examples/RigidBody/RigidBodySoftContact.cpp | 3 +- examples/RoboticsLearning/GripperGraspExample.cpp | 214 +- examples/RoboticsLearning/GripperGraspExample.h | 2 + examples/RoboticsLearning/KukaGraspExample.cpp | 6 +- examples/RoboticsLearning/R2D2GraspExample.cpp | 10 +- examples/RoboticsLearning/b3RobotSimAPI.cpp | 80 +- examples/RoboticsLearning/b3RobotSimAPI.h | 2 + .../RollingFrictionDemo/RollingFrictionDemo.cpp | 10 +- examples/SharedMemory/BodyJointInfoUtility.h | 2 + examples/SharedMemory/CMakeLists.txt | 206 + examples/SharedMemory/IKTrajectoryHelper.cpp | 45 +- examples/SharedMemory/PhysicsClient.h | 12 + examples/SharedMemory/PhysicsClientC_API.cpp | 1635 +++- examples/SharedMemory/PhysicsClientC_API.h | 153 +- examples/SharedMemory/PhysicsClientExample.cpp | 86 +- .../SharedMemory/PhysicsClientSharedMemory.cpp | 434 +- examples/SharedMemory/PhysicsClientSharedMemory.h | 15 +- .../SharedMemory/PhysicsClientSharedMemory2.cpp | 27 + examples/SharedMemory/PhysicsClientSharedMemory2.h | 18 + .../PhysicsClientSharedMemory2_C_API.cpp | 19 + .../PhysicsClientSharedMemory2_C_API.h | 18 + .../PhysicsClientSharedMemory_C_API.cpp | 11 + .../SharedMemory/PhysicsClientSharedMemory_C_API.h | 16 + examples/SharedMemory/PhysicsClientUDP.cpp | 593 ++ examples/SharedMemory/PhysicsClientUDP.h | 37 + examples/SharedMemory/PhysicsClientUDP_C_API.cpp | 22 + examples/SharedMemory/PhysicsClientUDP_C_API.h | 19 + .../PhysicsCommandProcessorInterface.h | 27 + examples/SharedMemory/PhysicsDirect.cpp | 622 +- examples/SharedMemory/PhysicsDirect.h | 26 +- examples/SharedMemory/PhysicsDirectC_API.cpp | 13 +- examples/SharedMemory/PhysicsLoopBack.cpp | 31 +- examples/SharedMemory/PhysicsLoopBack.h | 12 + examples/SharedMemory/PhysicsLoopBackC_API.cpp | 3 +- .../SharedMemory/PhysicsServerCommandProcessor.cpp | 3137 +++++-- .../SharedMemory/PhysicsServerCommandProcessor.h | 51 +- examples/SharedMemory/PhysicsServerExample.cpp | 1271 ++- .../SharedMemory/PhysicsServerSharedMemory.cpp | 283 +- examples/SharedMemory/PhysicsServerSharedMemory.h | 6 +- examples/SharedMemory/PosixSharedMemory.cpp | 95 +- .../SharedMemory/SharedMemoryCommandProcessor.cpp | 215 + .../SharedMemory/SharedMemoryCommandProcessor.h | 37 + examples/SharedMemory/SharedMemoryCommands.h | 254 +- .../SharedMemoryInProcessPhysicsC_API.cpp | 2 +- examples/SharedMemory/SharedMemoryPublic.h | 196 +- .../TinyRendererVisualShapeConverter.cpp | 388 +- .../TinyRendererVisualShapeConverter.h | 21 +- examples/SharedMemory/Win32SharedMemory.cpp | 113 +- examples/SharedMemory/main.cpp | 17 +- examples/SharedMemory/premake4.lua | 76 +- examples/SharedMemory/udp/main.cpp | 229 + examples/SharedMemory/udp/premake4.lua | 128 + examples/SoftDemo/SoftDemo.cpp | 24 +- examples/StandaloneMain/hellovr_opengl_main.cpp | 86 +- .../StandaloneMain/main_opengl_single_example.cpp | 10 +- .../main_sw_tinyrenderer_single_example.cpp | 7 +- .../main_tinyrenderer_single_example.cpp | 21 +- examples/TinyRenderer/TinyRenderer.cpp | 283 +- examples/TinyRenderer/TinyRenderer.h | 13 +- examples/TinyRenderer/our_gl.cpp | 55 +- examples/Tutorial/Dof6ConstraintTutorial.cpp | 6 +- examples/Tutorial/Tutorial.cpp | 8 +- examples/Utils/b3Clock.cpp | 72 +- examples/Utils/b3ERPCFMHelper.hpp | 79 + examples/Utils/b3ReferenceFrameHelper.hpp | 56 + examples/Vehicles/Hinge2Vehicle.cpp | 34 +- examples/pybullet/CMakeLists.txt | 55 +- examples/pybullet/constraint.py | 24 + examples/pybullet/hand.ino | 32 + examples/pybullet/hand.py | 78 + examples/pybullet/hello_pybullet.py | 23 + examples/pybullet/inverse_kinematics.py | 85 + examples/pybullet/premake4.lua | 32 +- examples/pybullet/pybullet.c | 4213 +++++++-- examples/pybullet/quadruped.py | 135 + examples/pybullet/robotcontrol.py | 2 +- examples/pybullet/test.py | 2 +- examples/pybullet/testrender.py | 38 +- examples/pybullet/testrender_np.py | 45 +- examples/pybullet/vrEvent.py | 62 + examples/pybullet/vr_kuka_pr2_move.py | 22 + examples/pybullet/vr_kuka_setup.py | 76 + .../BroadPhaseCollision/b3DynamicBvh.h | 5 +- .../BroadPhaseCollision/b3DynamicBvhBroadphase.cpp | 4 +- .../BroadPhaseCollision/b3DynamicBvhBroadphase.h | 14 +- .../BroadPhaseCollision/b3OverlappingPairCache.cpp | 4 +- .../BroadPhaseCollision/b3OverlappingPairCache.h | 2 +- .../NarrowPhaseCollision/b3Config.h | 2 +- .../NarrowPhaseCollision/shared/b3ClipFaces.h | 2 +- .../shared/b3ContactConvexConvexSAT.h | 9 +- .../shared/b3FindConcaveSatAxis.h | 8 +- .../shared/b3FindSeparatingAxis.h | 2 +- .../NarrowPhaseCollision/shared/b3MprPenetration.h | 2 +- .../ConstraintSolver/b3PgsJacobiSolver.cpp | 7 +- .../ConstraintSolver/b3Point2PointConstraint.cpp | 2 +- src/Bullet3Dynamics/b3CpuRigidBodyPipeline.cpp | 16 +- .../BroadphaseCollision/b3GpuBroadphaseInterface.h | 4 +- .../BroadphaseCollision/b3GpuGridBroadphase.cpp | 9 +- .../BroadphaseCollision/b3GpuGridBroadphase.h | 4 +- .../b3GpuParallelLinearBvhBroadphase.cpp | 4 +- .../b3GpuParallelLinearBvhBroadphase.h | 4 +- .../BroadphaseCollision/b3GpuSapBroadphase.cpp | 92 +- .../BroadphaseCollision/b3GpuSapBroadphase.h | 4 +- src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp | 10 +- .../NarrowphaseCollision/b3ConvexHullContact.cpp | 83 +- .../NarrowphaseCollision/b3GjkPairDetector.cpp | 12 +- .../NarrowphaseCollision/b3QuantizedBvh.h | 2 +- src/Bullet3OpenCL/Raycast/b3GpuRaycast.cpp | 2 +- .../RigidBody/b3GpuGenericConstraint.cpp | 2 +- .../RigidBody/b3GpuJacobiContactSolver.cpp | 4 +- src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhase.cpp | 4 +- .../RigidBody/b3GpuPgsConstraintSolver.cpp | 18 +- .../RigidBody/b3GpuPgsContactSolver.cpp | 49 +- src/Bullet3OpenCL/RigidBody/b3Solver.cpp | 49 +- src/Bullet3Serialize/Bullet2FileLoader/b3DNA.cpp | 5 +- src/Bullet3Serialize/Bullet2FileLoader/b3File.cpp | 7 +- .../BroadphaseCollision/btAxisSweep3.h | 13 +- .../BroadphaseCollision/btBroadphaseInterface.h | 2 +- .../BroadphaseCollision/btBroadphaseProxy.h | 13 +- src/BulletCollision/BroadphaseCollision/btDbvt.h | 6 +- .../BroadphaseCollision/btDbvtBroadphase.cpp | 32 +- .../BroadphaseCollision/btDbvtBroadphase.h | 5 +- .../BroadphaseCollision/btDispatcher.h | 8 +- .../BroadphaseCollision/btMultiSapBroadphase.cpp | 489 - .../BroadphaseCollision/btMultiSapBroadphase.h | 151 - .../BroadphaseCollision/btOverlappingPairCache.h | 5 +- .../BroadphaseCollision/btQuantizedBvh.h | 2 +- .../BroadphaseCollision/btSimpleBroadphase.cpp | 4 +- .../BroadphaseCollision/btSimpleBroadphase.h | 6 +- src/BulletCollision/CMakeLists.txt | 2 - .../CollisionDispatch/SphereTriangleDetector.cpp | 2 +- .../CollisionDispatch/btCollisionConfiguration.h | 3 + .../CollisionDispatch/btCollisionDispatcher.cpp | 55 +- .../CollisionDispatch/btCollisionDispatcher.h | 8 +- .../CollisionDispatch/btCollisionObject.cpp | 1 + .../CollisionDispatch/btCollisionObject.h | 38 +- .../CollisionDispatch/btCollisionWorld.cpp | 37 +- .../CollisionDispatch/btCollisionWorld.h | 20 +- .../CollisionDispatch/btCollisionWorldImporter.cpp | 4 +- .../btCompoundCollisionAlgorithm.cpp | 42 +- .../btCompoundCompoundCollisionAlgorithm.cpp | 47 +- .../btConvexConcaveCollisionAlgorithm.cpp | 19 +- .../CollisionDispatch/btConvexConvexAlgorithm.cpp | 62 +- .../CollisionDispatch/btConvexConvexAlgorithm.h | 8 +- .../btDefaultCollisionConfiguration.cpp | 89 +- .../btDefaultCollisionConfiguration.h | 11 +- .../CollisionDispatch/btManifoldResult.cpp | 1 + .../CollisionDispatch/btManifoldResult.h | 8 +- .../btSphereSphereCollisionAlgorithm.cpp | 3 +- .../btSphereTriangleCollisionAlgorithm.cpp | 2 +- .../CollisionShapes/btCapsuleShape.cpp | 26 +- .../CollisionShapes/btCapsuleShape.h | 24 +- .../CollisionShapes/btCollisionShape.h | 2 +- .../CollisionShapes/btConvexShape.cpp | 10 +- .../Gimpact/btGImpactCollisionAlgorithm.h | 2 +- src/BulletCollision/Gimpact/btGImpactShape.cpp | 53 + src/BulletCollision/Gimpact/btGImpactShape.h | 28 +- .../NarrowPhaseCollision/btGjkPairDetector.cpp | 88 +- .../NarrowPhaseCollision/btPersistentManifold.h | 4 +- .../NarrowPhaseCollision/btVoronoiSimplexSolver.h | 6 +- src/BulletDynamics/CMakeLists.txt | 4 + .../Character/btKinematicCharacterController.cpp | 4 +- .../ConstraintSolver/btContactSolverInfo.h | 3 +- .../btSequentialImpulseConstraintSolver.cpp | 166 +- .../btSequentialImpulseConstraintSolver.h | 14 +- .../Dynamics/btDiscreteDynamicsWorld.cpp | 73 +- .../Dynamics/btDiscreteDynamicsWorld.h | 11 +- .../Dynamics/btDiscreteDynamicsWorldMt.cpp | 162 + .../Dynamics/btDiscreteDynamicsWorldMt.h | 42 + src/BulletDynamics/Dynamics/btDynamicsWorld.h | 5 +- .../Dynamics/btSimpleDynamicsWorld.cpp | 2 +- .../Dynamics/btSimpleDynamicsWorld.h | 2 +- .../Dynamics/btSimulationIslandManagerMt.cpp | 641 ++ .../Dynamics/btSimulationIslandManagerMt.h | 109 + src/BulletDynamics/Featherstone/btMultiBody.cpp | 35 +- src/BulletDynamics/Featherstone/btMultiBody.h | 3 +- .../Featherstone/btMultiBodyConstraint.cpp | 14 +- .../Featherstone/btMultiBodyConstraint.h | 8 +- .../Featherstone/btMultiBodyConstraintSolver.cpp | 33 +- .../Featherstone/btMultiBodyConstraintSolver.h | 2 +- .../Featherstone/btMultiBodyDynamicsWorld.cpp | 4 +- .../Featherstone/btMultiBodyDynamicsWorld.h | 2 +- .../Featherstone/btMultiBodyFixedConstraint.h | 4 +- .../Featherstone/btMultiBodyPoint2Point.h | 7 +- .../Featherstone/btMultiBodySliderConstraint.h | 4 +- src/BulletDynamics/MLCPSolvers/btMLCPSolver.cpp | 14 +- src/BulletDynamics/MLCPSolvers/btMLCPSolver.h | 11 + .../MLCPSolvers/btSolveProjectedGaussSeidel.h | 30 +- src/BulletSoftBody/CMakeLists.txt | 2 + src/BulletSoftBody/btSoftBody.cpp | 55 +- src/BulletSoftBody/btSoftBody.h | 7 +- .../btSoftBodyConcaveCollisionAlgorithm.cpp | 7 +- src/BulletSoftBody/btSoftBodyHelpers.cpp | 4 +- src/BulletSoftBody/btSoftBodyInternals.h | 39 +- ...sWorld.cpp => btSoftMultiBodyDynamicsWorld.cpp} | 48 +- ...amicsWorld.h => btSoftMultiBodyDynamicsWorld.h} | 19 +- src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h | 4 +- src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp | 2 +- src/BulletSoftBody/btSoftRigidDynamicsWorld.h | 2 +- src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h | 4 +- src/BulletSoftBody/btSparseSDF.h | 2 +- src/LinearMath/CMakeLists.txt | 2 + src/LinearMath/btAlignedObjectArray.h | 17 +- src/LinearMath/btConvexHull.cpp | 4 +- src/LinearMath/btPoolAllocator.h | 15 +- src/LinearMath/btQuickprof.cpp | 329 +- src/LinearMath/btQuickprof.h | 68 +- src/LinearMath/btScalar.h | 2 +- src/LinearMath/btSerializer.cpp | 1993 ++--- src/LinearMath/btSerializer.h | 26 +- src/LinearMath/btThreads.cpp | 231 + src/LinearMath/btThreads.h | 75 + src/btBulletCollisionCommon.h | 1 - test/InverseDynamics/CMakeLists.txt | 6 +- test/InverseDynamics/test_invdyn_jacobian.cpp | 6 +- test/InverseDynamics/test_invdyn_kinematics.cpp | 5 +- test/SharedMemory/CMakeLists.txt | 9 +- test/SharedMemory/premake4.lua | 5 + test/SharedMemory/test.c | 40 +- test/enet/chat/client/main.cpp | 168 + test/enet/{ => chat}/client/premake4.lua | 4 +- test/enet/chat/server/main.cpp | 103 + test/enet/{ => chat}/server/premake4.lua | 4 +- test/enet/{ => nat_punchthrough}/client/main.cpp | 0 .../{ => nat_punchthrough}/client/premake4.lua | 4 +- test/enet/{ => nat_punchthrough}/server/main.cpp | 0 .../{ => nat_punchthrough}/server/premake4.lua | 4 +- 448 files changed, 50796 insertions(+), 6358 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/bullet.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
