[bullet] branch upstream updated (baee5ef -> ee7a45d)
Markus Koschany
apo-guest at moszumanska.debian.org
Tue Aug 25 22:02:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a change to branch upstream
in repository bullet.
from baee5ef Imported Upstream version 2.83.5+dfsg
new ee7a45d Imported Upstream version 2.83.6+dfsg
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
Extras/ConvexDecomposition/premake4.lua | 2 +-
Extras/HACD/premake4.lua | 2 +-
.../BulletFileLoader/autogenerated/bullet.h | 458 +++++
Extras/Serialize/BulletFileLoader/bDefines.h | 1 -
Extras/Serialize/BulletFileLoader/bFile.cpp | 128 +-
Extras/Serialize/BulletFileLoader/bFile.h | 14 +-
Extras/Serialize/BulletFileLoader/btBulletFile.cpp | 15 +-
Extras/Serialize/BulletFileLoader/btBulletFile.h | 5 +-
Extras/Serialize/BulletFileLoader/premake4.lua | 2 +-
.../BulletWorldImporter/btBulletWorldImporter.cpp | 3 +-
.../BulletWorldImporter/btWorldImporter.cpp | 9 +-
Extras/Serialize/BulletWorldImporter/premake4.lua | 2 +-
Extras/Serialize/HeaderGenerator/apiGen.cpp | 2 +-
Extras/Serialize/makesdna/makesdna.cpp | 9 +-
README.md | 76 +-
VERSION | 2 +-
data/{sphere2.urdf => hinge.urdf} | 16 +-
data/kuka_lwr/arm_base.urdf.xacro | 80 +
data/kuka_lwr/gazebo.urdf.xacro | 16 +
data/kuka_lwr/kuka.urdf | 296 ++++
data/kuka_lwr/kuka_lwr_arm.urdf.xacro | 418 +++++
data/kuka_lwr/materials.xml | 34 +
data/kuka_lwr/meshes_arm/COPYRIGHT | 12 +
data/kuka_lwr/meshes_arm/arm_base.dae | 162 ++
data/kuka_lwr/meshes_arm/arm_base.stl | Bin 0 -> 28884 bytes
data/kuka_lwr/meshes_arm/arm_flanche.dae | 158 ++
data/kuka_lwr/meshes_arm/arm_flanche.stl | Bin 0 -> 4784 bytes
data/kuka_lwr/meshes_arm/arm_flanche_angle.dae | 162 ++
data/kuka_lwr/meshes_arm/arm_flanche_angle.stl | Bin 0 -> 7084 bytes
data/kuka_lwr/meshes_arm/arm_segment_a.dae | 162 ++
data/kuka_lwr/meshes_arm/arm_segment_a.stl | Bin 0 -> 76884 bytes
data/kuka_lwr/meshes_arm/arm_segment_b.dae | 162 ++
data/kuka_lwr/meshes_arm/arm_segment_b.stl | Bin 0 -> 76884 bytes
data/kuka_lwr/meshes_arm/arm_segment_last.dae | 116 ++
data/kuka_lwr/meshes_arm/arm_segment_last.stl | Bin 0 -> 51284 bytes
data/kuka_lwr/meshes_arm/arm_wrist.dae | 116 ++
data/kuka_lwr/meshes_arm/arm_wrist.stl | Bin 0 -> 55284 bytes
data/kuka_lwr/meshes_arm/convex/README | 4 +
.../kuka_lwr/meshes_arm/convex/arm_base_convex.stl | Bin 0 -> 2284 bytes
.../meshes_arm/convex/arm_flanche_angle_convex.stl | Bin 0 -> 4184 bytes
.../meshes_arm/convex/arm_flanche_convex.stl | Bin 0 -> 2284 bytes
.../meshes_arm/convex/arm_segment_a_convex.stl | Bin 0 -> 4884 bytes
.../meshes_arm/convex/arm_segment_b_convex.stl | Bin 0 -> 4484 bytes
.../meshes_arm/convex/arm_segment_last_convex.stl | Bin 0 -> 5984 bytes
.../meshes_arm/convex/arm_wrist_convex.stl | Bin 0 -> 4784 bytes
data/kuka_lwr/tools/jr3-stabilo.dae | 1823 ++++++++++++++++++++
data/kuka_lwr/tools/jr3-stabilo.skp | Bin 0 -> 314341 bytes
data/multibody.bullet | Bin 0 -> 14520 bytes
data/{sphere2.urdf => prismatic.urdf} | 23 +-
data/r2d2_multibody.bullet | Bin 0 -> 309384 bytes
data/slope.bullet | Bin 0 -> 79960 bytes
data/sphere2.urdf | 26 +
data/sphere8.mtl | 7 +
data/sphere8.obj | 1695 ++++++++++++++++++
data/uvmap.png | Bin 0 -> 41155 bytes
data/xacro_standalone.py | 705 ++++++++
examples/BasicDemo/BasicExample.cpp | 4 +-
examples/BasicDemo/main.cpp | 1 -
.../CommonInterfaces/Common2dCanvasInterface.h | 2 +
.../CommonInterfaces/CommonGraphicsAppInterface.h | 57 +-
.../CommonInterfaces/CommonParameterInterface.h | 20 +
examples/CommonInterfaces/CommonRenderInterface.h | 2 +-
examples/CommonInterfaces/CommonRigidBodyBase.h | 4 +-
examples/CommonInterfaces/CommonWindowInterface.h | 2 +
examples/Constraints/TestHingeTorque.cpp | 243 +++
examples/Constraints/TestHingeTorque.h | 7 +
examples/ExampleBrowser/CMakeLists.txt | 40 +-
examples/ExampleBrowser/ExampleEntries.cpp | 42 +-
.../GwenGUISupport/GraphingTexture.cpp | 112 --
.../GwenGUISupport/GraphingTexture.h | 18 +-
.../GwenGUISupport/GwenParameterInterface.cpp | 59 +
.../GwenGUISupport/GwenParameterInterface.h | 2 +
.../GwenGUISupport/gwenUserInterface.cpp | 99 +-
examples/ExampleBrowser/OpenGLExampleBrowser.cpp | 209 ++-
examples/ExampleBrowser/OpenGLGuiHelper.cpp | 18 +-
examples/ExampleBrowser/main.cpp | 5 +-
examples/ExampleBrowser/premake4.lua | 15 +-
examples/Importers/ImportBullet/SerializeSetup.cpp | 3 -
.../ImportColladaDemo/ImportColladaSetup.cpp | 9 +-
.../ImportColladaDemo/LoadMeshFromCollada.cpp | 15 +-
examples/Importers/ImportColladaDemo/btMatrix4x4.h | 3 +-
.../Importers/ImportObjDemo/ImportObjExample.cpp | 98 +-
.../Wavefront2GLInstanceGraphicsShape.cpp | 34 +-
.../Importers/ImportSTLDemo/ImportSTLSetup.cpp | 29 +-
.../{MyURDFImporter.cpp => BulletUrdfImporter.cpp} | 425 ++---
.../{MyURDFImporter.h => BulletUrdfImporter.h} | 16 +-
.../Importers/ImportURDFDemo/ImportURDFSetup.cpp | 163 +-
.../ImportURDFDemo/MultiBodyCreationInterface.h | 7 +
.../ImportURDFDemo/MyMultiBodyCreator.cpp | 143 +-
.../Importers/ImportURDFDemo/MyMultiBodyCreator.h | 30 +-
.../{MyURDFImporter.cpp => ROSURDFImporter.cpp} | 54 +-
.../{MyURDFImporter.h => ROSURDFImporter.h} | 19 +-
examples/Importers/ImportURDFDemo/URDF2Bullet.cpp | 164 +-
examples/Importers/ImportURDFDemo/URDF2Bullet.h | 1 -
.../ImportURDFDemo/URDFImporterInterface.h | 4 +
examples/Importers/ImportURDFDemo/URDFJointTypes.h | 2 +-
examples/Importers/ImportURDFDemo/UrdfParser.cpp | 866 ++++++++++
examples/Importers/ImportURDFDemo/UrdfParser.h | 167 ++
.../Importers/ImportURDFDemo/urdfLexicalCast.h | 17 +
.../Importers/ImportURDFDemo/urdfStringSplit.cpp | 74 +-
.../Importers/ImportURDFDemo/urdfStringSplit.h | 30 +
examples/MultiBody/InvertedPendulumPDControl.cpp | 473 +++++
examples/MultiBody/InvertedPendulumPDControl.h | 7 +
examples/MultiBody/MultiBodyConstraintFeedback.cpp | 432 +++++
examples/MultiBody/MultiBodyConstraintFeedback.h | 7 +
examples/MultiBody/MultiDofDemo.cpp | 4 +-
examples/MultiBody/TestJointTorqueSetup.cpp | 242 ++-
examples/OpenGLWindow/GLInstancingRenderer.cpp | 41 +-
examples/OpenGLWindow/GLInstancingRenderer.h | 2 +-
examples/OpenGLWindow/MacOpenGLWindow.h | 6 +
examples/OpenGLWindow/MacOpenGLWindow.mm | 9 +-
examples/OpenGLWindow/Shaders/instancingPS.glsl | 2 +-
examples/OpenGLWindow/Shaders/instancingPS.h | 2 +-
examples/OpenGLWindow/Shaders/instancingVS.glsl | 19 +-
examples/OpenGLWindow/Shaders/instancingVS.h | 18 +-
.../Shaders/useShadowMapInstancingPS.glsl | 15 +-
.../Shaders/useShadowMapInstancingPS.h | 15 +-
.../Shaders/useShadowMapInstancingVS.glsl | 4 +-
.../Shaders/useShadowMapInstancingVS.h | 4 +-
examples/OpenGLWindow/SimpleCamera.cpp | 13 +-
examples/OpenGLWindow/SimpleOpenGL2App.cpp | 21 +-
examples/OpenGLWindow/SimpleOpenGL2App.h | 6 +-
examples/OpenGLWindow/SimpleOpenGL2Renderer.h | 4 +
examples/OpenGLWindow/SimpleOpenGL3App.cpp | 135 +-
examples/OpenGLWindow/SimpleOpenGL3App.h | 8 +-
examples/OpenGLWindow/Win32OpenGLWindow.h | 1 +
examples/OpenGLWindow/X11OpenGLWindow.h | 2 +-
examples/OpenGLWindow/stb_image_write.h | 5 +-
examples/OpenGLWindow/stb_truetype.h | 1543 ++++++++++++++---
examples/RenderingExamples/TimeSeriesCanvas.cpp | 345 ++++
examples/RenderingExamples/TimeSeriesCanvas.h | 25 +
examples/RenderingExamples/TimeSeriesExample.cpp | 142 ++
examples/RenderingExamples/TimeSeriesExample.h | 8 +
examples/RenderingExamples/TimeSeriesFontData.cpp | 773 +++++++++
examples/RenderingExamples/TimeSeriesFontData.h | 6 +
.../RollingFrictionDemo/RollingFrictionDemo.cpp | 58 +-
examples/SharedMemory/PhysicsClient.cpp | 495 ++++--
examples/SharedMemory/PhysicsClient.h | 40 +-
examples/SharedMemory/PhysicsClientC_API.cpp | 241 +++
examples/SharedMemory/PhysicsClientC_API.h | 75 +
examples/SharedMemory/PhysicsClientExample.cpp | 350 ++++
examples/SharedMemory/PhysicsClientExample.h | 6 +
examples/SharedMemory/PhysicsServer.cpp | 919 ++++++++--
examples/SharedMemory/PhysicsServer.h | 45 +-
examples/SharedMemory/PhysicsServerExample.cpp | 143 ++
.../{PhysicsServer.h => PhysicsServerExample.h} | 6 +-
examples/SharedMemory/PosixSharedMemory.cpp | 39 +-
examples/SharedMemory/PosixSharedMemory.h | 2 +-
examples/SharedMemory/RobotControlExample.cpp | 400 +++++
examples/SharedMemory/RobotControlExample.h | 8 +
examples/SharedMemory/SharedMemoryBlock.h | 48 +
examples/SharedMemory/SharedMemoryCommands.h | 268 +++
examples/SharedMemory/SharedMemoryCommon.h | 10 +-
examples/SharedMemory/SharedMemoryInterface.h | 82 +-
examples/SharedMemory/Win32SharedMemory.cpp | 36 +-
examples/SharedMemory/Win32SharedMemory.h | 14 +-
examples/SharedMemory/main.cpp | 64 +-
examples/SharedMemory/premake4.lua | 14 +-
examples/SimpleOpenGL3/main.cpp | 6 +-
.../Dof6ConstraintTutorial.cpp} | 69 +-
examples/Tutorial/Dof6ConstraintTutorial.h | 6 +
examples/Tutorial/Tutorial.cpp | 793 +++++++++
examples/Tutorial/Tutorial.h | 14 +
examples/Utils/b3ResourcePath.cpp | 91 +
examples/Utils/b3ResourcePath.h | 13 +
src/Bullet3Collision/premake4.lua | 2 +-
src/Bullet3Common/b3CommandLineArgs.h | 23 +-
src/Bullet3Common/b3FileUtils.h | 11 +-
src/Bullet3Common/b3Logging.h | 10 +-
src/Bullet3Common/b3Vector3.h | 346 ++--
src/Bullet3Dynamics/premake4.lua | 2 +-
src/Bullet3Geometry/premake4.lua | 2 +-
src/Bullet3OpenCL/premake4.lua | 2 +-
.../Bullet2FileLoader/autogenerated/bullet2.h | 6 +-
.../Bullet2FileLoader/premake4.lua | 2 +-
.../CollisionDispatch/btCollisionWorld.cpp | 127 +-
.../CollisionShapes/btCompoundShape.cpp | 4 +-
.../CollisionShapes/btCompoundShape.h | 4 +-
.../CollisionShapes/btConvexShape.cpp | 8 +-
.../CollisionShapes/btConvexShape.h | 3 +-
.../CollisionShapes/btHeightfieldTerrainShape.cpp | 16 +-
src/BulletDynamics/Featherstone/btMultiBody.cpp | 1009 ++++-------
src/BulletDynamics/Featherstone/btMultiBody.h | 199 ++-
.../Featherstone/btMultiBodyConstraint.cpp | 32 +-
.../Featherstone/btMultiBodyConstraint.h | 14 +
.../Featherstone/btMultiBodyConstraintSolver.cpp | 274 ++-
.../Featherstone/btMultiBodyConstraintSolver.h | 3 +-
.../Featherstone/btMultiBodyDynamicsWorld.cpp | 339 +++-
.../Featherstone/btMultiBodyDynamicsWorld.h | 22 +
.../Featherstone/btMultiBodyJointFeedback.h} | 16 +-
.../btMultiBodyJointLimitConstraint.cpp | 48 +-
.../Featherstone/btMultiBodyJointMotor.cpp | 71 +-
.../Featherstone/btMultiBodyJointMotor.h | 2 +-
src/BulletDynamics/Featherstone/btMultiBodyLink.h | 60 +-
.../Featherstone/btMultiBodyPoint2Point.cpp | 14 +-
.../Featherstone/btMultiBodySolverConstraint.h | 7 +-
src/BulletSoftBody/btSoftBodyInternals.h | 2 +-
src/BulletSoftBody/premake4.lua | 2 +-
src/LinearMath/btAlignedObjectArray.h | 22 +-
src/LinearMath/btIDebugDraw.h | 29 +
src/LinearMath/btQuaternion.h | 76 +-
src/LinearMath/btQuickprof.cpp | 4 +-
src/LinearMath/btScalar.h | 2 +-
src/LinearMath/btSerializer.cpp | 1060 ++++++------
src/LinearMath/btSerializer.h | 48 +-
test/Bullet2/premake4.lua | 2 +-
test/GwenOpenGLTest/premake4.lua | 2 +-
test/OpenCL/BasicInitialize/premake4.lua | 2 +-
test/OpenCL/KernelLaunch/premake4.lua | 2 +-
test/OpenCL/ParallelPrimitives/premake4.lua | 2 +-
test/OpenCL/RadixSortBenchmark/premake4.lua | 2 +-
test/SharedMemory/premake4.lua | 26 +
test/SharedMemory/test.c | 155 ++
test/TestBullet3OpenCL/premake4.lua | 2 +-
test/b3DynamicBvhBroadphase/premake4.lua | 2 +-
test/clew/premake4.lua | 2 +-
test/collision/premake4.lua | 2 +-
test/enet/client/premake4.lua | 2 +-
test/enet/server/premake4.lua | 2 +-
test/gtest-1.7.0/premake4.lua | 2 +-
220 files changed, 19760 insertions(+), 3321 deletions(-)
copy data/{sphere2.urdf => hinge.urdf} (75%)
create mode 100644 data/kuka_lwr/arm_base.urdf.xacro
create mode 100644 data/kuka_lwr/gazebo.urdf.xacro
create mode 100644 data/kuka_lwr/kuka.urdf
create mode 100644 data/kuka_lwr/kuka_lwr_arm.urdf.xacro
create mode 100644 data/kuka_lwr/materials.xml
create mode 100644 data/kuka_lwr/meshes_arm/COPYRIGHT
create mode 100644 data/kuka_lwr/meshes_arm/arm_base.dae
create mode 100644 data/kuka_lwr/meshes_arm/arm_base.stl
create mode 100644 data/kuka_lwr/meshes_arm/arm_flanche.dae
create mode 100644 data/kuka_lwr/meshes_arm/arm_flanche.stl
create mode 100644 data/kuka_lwr/meshes_arm/arm_flanche_angle.dae
create mode 100644 data/kuka_lwr/meshes_arm/arm_flanche_angle.stl
create mode 100644 data/kuka_lwr/meshes_arm/arm_segment_a.dae
create mode 100644 data/kuka_lwr/meshes_arm/arm_segment_a.stl
create mode 100644 data/kuka_lwr/meshes_arm/arm_segment_b.dae
create mode 100644 data/kuka_lwr/meshes_arm/arm_segment_b.stl
create mode 100644 data/kuka_lwr/meshes_arm/arm_segment_last.dae
create mode 100644 data/kuka_lwr/meshes_arm/arm_segment_last.stl
create mode 100644 data/kuka_lwr/meshes_arm/arm_wrist.dae
create mode 100644 data/kuka_lwr/meshes_arm/arm_wrist.stl
create mode 100644 data/kuka_lwr/meshes_arm/convex/README
create mode 100644 data/kuka_lwr/meshes_arm/convex/arm_base_convex.stl
create mode 100644 data/kuka_lwr/meshes_arm/convex/arm_flanche_angle_convex.stl
create mode 100644 data/kuka_lwr/meshes_arm/convex/arm_flanche_convex.stl
create mode 100644 data/kuka_lwr/meshes_arm/convex/arm_segment_a_convex.stl
create mode 100644 data/kuka_lwr/meshes_arm/convex/arm_segment_b_convex.stl
create mode 100644 data/kuka_lwr/meshes_arm/convex/arm_segment_last_convex.stl
create mode 100644 data/kuka_lwr/meshes_arm/convex/arm_wrist_convex.stl
create mode 100644 data/kuka_lwr/tools/jr3-stabilo.dae
create mode 100644 data/kuka_lwr/tools/jr3-stabilo.skp
create mode 100644 data/multibody.bullet
copy data/{sphere2.urdf => prismatic.urdf} (62%)
create mode 100644 data/r2d2_multibody.bullet
create mode 100644 data/slope.bullet
create mode 100644 data/sphere8.mtl
create mode 100644 data/sphere8.obj
create mode 100644 data/uvmap.png
create mode 100755 data/xacro_standalone.py
create mode 100644 examples/Constraints/TestHingeTorque.cpp
create mode 100644 examples/Constraints/TestHingeTorque.h
copy examples/Importers/ImportURDFDemo/{MyURDFImporter.cpp => BulletUrdfImporter.cpp} (70%)
copy examples/Importers/ImportURDFDemo/{MyURDFImporter.h => BulletUrdfImporter.h} (73%)
rename examples/Importers/ImportURDFDemo/{MyURDFImporter.cpp => ROSURDFImporter.cpp} (92%)
rename examples/Importers/ImportURDFDemo/{MyURDFImporter.h => ROSURDFImporter.h} (68%)
create mode 100644 examples/Importers/ImportURDFDemo/UrdfParser.cpp
create mode 100644 examples/Importers/ImportURDFDemo/UrdfParser.h
create mode 100644 examples/Importers/ImportURDFDemo/urdfLexicalCast.h
copy Extras/Serialize/BulletXmlWorldImporter/string_split.cpp => examples/Importers/ImportURDFDemo/urdfStringSplit.cpp (73%)
create mode 100644 examples/Importers/ImportURDFDemo/urdfStringSplit.h
create mode 100644 examples/MultiBody/InvertedPendulumPDControl.cpp
create mode 100644 examples/MultiBody/InvertedPendulumPDControl.h
create mode 100644 examples/MultiBody/MultiBodyConstraintFeedback.cpp
create mode 100644 examples/MultiBody/MultiBodyConstraintFeedback.h
create mode 100644 examples/RenderingExamples/TimeSeriesCanvas.cpp
create mode 100644 examples/RenderingExamples/TimeSeriesCanvas.h
create mode 100644 examples/RenderingExamples/TimeSeriesExample.cpp
create mode 100644 examples/RenderingExamples/TimeSeriesExample.h
create mode 100644 examples/RenderingExamples/TimeSeriesFontData.cpp
create mode 100644 examples/RenderingExamples/TimeSeriesFontData.h
create mode 100644 examples/SharedMemory/PhysicsClientC_API.cpp
create mode 100644 examples/SharedMemory/PhysicsClientC_API.h
create mode 100644 examples/SharedMemory/PhysicsClientExample.cpp
create mode 100644 examples/SharedMemory/PhysicsClientExample.h
create mode 100644 examples/SharedMemory/PhysicsServerExample.cpp
copy examples/SharedMemory/{PhysicsServer.h => PhysicsServerExample.h} (50%)
create mode 100644 examples/SharedMemory/RobotControlExample.cpp
create mode 100644 examples/SharedMemory/RobotControlExample.h
create mode 100644 examples/SharedMemory/SharedMemoryBlock.h
create mode 100644 examples/SharedMemory/SharedMemoryCommands.h
copy examples/{Constraints/Dof6Spring2Setup.cpp => Tutorial/Dof6ConstraintTutorial.cpp} (89%)
create mode 100644 examples/Tutorial/Dof6ConstraintTutorial.h
create mode 100644 examples/Tutorial/Tutorial.cpp
create mode 100644 examples/Tutorial/Tutorial.h
create mode 100644 examples/Utils/b3ResourcePath.cpp
create mode 100644 examples/Utils/b3ResourcePath.h
copy src/{BulletCollision/CollisionShapes/btConcaveShape.cpp => BulletDynamics/Featherstone/btMultiBodyJointFeedback.h} (75%)
create mode 100644 test/SharedMemory/premake4.lua
create mode 100644 test/SharedMemory/test.c
--
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