From 58e1e9f049c6e8bfd151e622f15922da9b81837c Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Fri, 12 Sep 2008 00:59:16 +0000 Subject: [PATCH] updated version to 2.72, fix a compilation issue. --- ChangeLog.txt | 6 ++++++ Demos/OpenGL/DemoApplication.cpp | 2 +- VERSION | 2 +- configure | 20 ++++++++++---------- configure.ac | 2 +- src/BulletCollision/CMakeLists.txt | 2 ++ src/LinearMath/btScalar.h | 2 +- 7 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 306bd812c..48b452266 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -4,6 +4,12 @@ Primary author and maintainer: Erwin Coumans Todo: update changelog from April - July 2008 See http://code.google.com/p/bullet/source/list for more complete log in Subversion +2008 Sept 11 + - Enable CCD motion clamping for btDiscreteDynamicsWorld, to avoid tunneling. A more advanced solution will be implemented in btContinuousDynamicsWorld. + +2008 Sept 7 + - Add btScaledBvhTriangleMeshShape, to allow re-use of btBvhTriangleMeshShape of different sizes, without copying of the BVH data. + 2008 Sept 5 - Enabled Demos/ForkLiftDemo Thanks Roman Ponomarev. diff --git a/Demos/OpenGL/DemoApplication.cpp b/Demos/OpenGL/DemoApplication.cpp index 49737e328..c8f3073c7 100644 --- a/Demos/OpenGL/DemoApplication.cpp +++ b/Demos/OpenGL/DemoApplication.cpp @@ -544,7 +544,7 @@ void DemoApplication::shootBox(const btVector3& destination) body->getWorldTransform().setRotation(btQuaternion(0,0,0,1)); body->setLinearVelocity(linVel); body->setAngularVelocity(btVector3(0,0,0)); - body->setCcdSquareMotionThreshold(3600);//1600);//40ms/sec for 60 hertz gives 0.66 m/frame. 40*40=1600 + body->setCcdMotionThreshold(1.); body->setCcdSweptSphereRadius(0.2f); } diff --git a/VERSION b/VERSION index be5a07137..dd344c44c 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -Bullet Collision Detection and Physics Library version 2.71 +Bullet Collision Detection and Physics Library version 2.72 http://bullet.googlecode.com diff --git a/configure b/configure index 1bfd677bc..3d7cd5f76 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for bullet 2.71. +# Generated by GNU Autoconf 2.61 for bullet 2.72. # # Report bugs to . # @@ -576,8 +576,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='bullet' PACKAGE_TARNAME='bullet' -PACKAGE_VERSION='2.71' -PACKAGE_STRING='bullet 2.71' +PACKAGE_VERSION='2.72' +PACKAGE_STRING='bullet 2.72' PACKAGE_BUGREPORT='bullet@erwincoumans.com' ac_unique_file="mk/jam/build.jam" @@ -1224,7 +1224,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures bullet 2.71 to adapt to many kinds of systems. +\`configure' configures bullet 2.72 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1293,7 +1293,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bullet 2.71:";; + short | recursive ) echo "Configuration of bullet 2.72:";; esac cat <<\_ACEOF @@ -1385,7 +1385,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bullet configure 2.71 +bullet configure 2.72 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1399,7 +1399,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bullet $as_me 2.71, which was +It was created by bullet $as_me 2.72, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -10533,7 +10533,7 @@ cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_NAME ?= \"$PACKAGE_NAME\" ; " cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_COPYRIGHT ?= \"$PACKAGE_COPYRIGHT\" ; " - for cs_veritem in 2 71; do + for cs_veritem in 2 72; do cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_VERSION_LIST += \"$cs_veritem\" ; " done @@ -10944,7 +10944,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by bullet $as_me 2.71, which was +This file was extended by bullet $as_me 2.72, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10997,7 +10997,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -bullet config.status 2.71 +bullet config.status 2.72 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 107d03f16..237d11f92 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ AC_PREREQ([2.54]) #---------------------------------------------------------------------------- AC_INIT( [bullet], - [2.71], + [2.72], [bullet@erwincoumans.com]) CS_PACKAGEINFO( [Bullet Continuous Collision Detection and Physics Library], diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt index 0efda6062..d77ca6444 100644 --- a/src/BulletCollision/CMakeLists.txt +++ b/src/BulletCollision/CMakeLists.txt @@ -100,6 +100,8 @@ ADD_LIBRARY(LibBulletCollision CollisionShapes/btOptimizedBvh.h CollisionShapes/btPolyhedralConvexShape.cpp CollisionShapes/btPolyhedralConvexShape.h + CollisionShapes/btScaledBvhTriangleMeshShape.cpp + CollisionShapes/btScaledBvhTriangleMeshShape.h CollisionShapes/btTetrahedronShape.cpp CollisionShapes/btTetrahedronShape.h CollisionShapes/btSphereShape.cpp diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h index 3a95ce425..3c96857d4 100644 --- a/src/LinearMath/btScalar.h +++ b/src/LinearMath/btScalar.h @@ -24,7 +24,7 @@ subject to the following restrictions: #include #include -#define BT_BULLET_VERSION 271 +#define BT_BULLET_VERSION 272 inline int btGetVersion() {