diff --git a/Demos/CharacterDemo/Jamfile b/Demos/CharacterDemo/Jamfile index b28e006bf..db7ad9049 100644 --- a/Demos/CharacterDemo/Jamfile +++ b/Demos/CharacterDemo/Jamfile @@ -1,3 +1,9 @@ SubDir TOP Demos CharacterDemo ; -BulletDemo CharacterDemo : [ Wildcard *.h *.cpp ] ; +BulletDemo CharacterDemo : [ Wildcard *.h *.cpp ] + ../BspDemo/BspConverter.cpp + ../BspDemo/BspConverter.h + ../BspDemo/BspLoader.cpp + ../BspDemo/BspLoader.h + +; diff --git a/Extras/AllBulletDemosOSX/English.lproj/MainMenu.xib b/Extras/AllBulletDemosOSX/English.lproj/MainMenu.xib index 2305b55e0..32522433e 100644 --- a/Extras/AllBulletDemosOSX/English.lproj/MainMenu.xib +++ b/Extras/AllBulletDemosOSX/English.lproj/MainMenu.xib @@ -3,7 +3,7 @@ 1040 9C7010 - 652 + 658 949.26 352.00 @@ -678,7 +678,7 @@ 12 - {{12, 121}, {252, 5}} + {{12, 106}, {252, 5}} {0, 0} @@ -715,7 +715,7 @@ 268 - {{9, 87}, {69, 17}} + {{9, 84}, {69, 17}} YES @@ -759,7 +759,7 @@ -2080244224 0 - Debug Drawer + Wireframe 1211912703 @@ -794,6 +794,28 @@ 25 + + + 268 + {{84, 115}, {149, 18}} + + YES + + 67239424 + 0 + Enable Split Impulse + + + 1211912703 + 130 + + + + + 200 + 25 + + {276, 219} @@ -1526,13 +1548,14 @@ YES - + + @@ -1750,6 +1773,20 @@ + + 581 + + + YES + + + + + + 582 + + + @@ -1873,6 +1910,8 @@ 572.IBPluginDependency 58.IBPluginDependency 58.ImportedFromIB2 + 581.IBPluginDependency + 582.IBPluginDependency 92.IBPluginDependency 92.ImportedFromIB2 @@ -1910,11 +1949,11 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{440, 182}, {211, 103}} + {{526, 428}, {211, 103}} com.apple.InterfaceBuilder.CocoaPlugin {{525, 802}, {197, 73}} - {{207, 285}, {316, 20}} + {{293, 531}, {316, 20}} com.apple.InterfaceBuilder.CocoaPlugin {74, 862} @@ -1996,6 +2035,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -2019,7 +2060,7 @@ - 580 + 582 diff --git a/Extras/AllBulletDemosOSX/src/BTDemo.h b/Extras/AllBulletDemosOSX/src/BTDemo.h index 0f7810f73..235353e2f 100644 --- a/Extras/AllBulletDemosOSX/src/BTDemo.h +++ b/Extras/AllBulletDemosOSX/src/BTDemo.h @@ -97,6 +97,9 @@ subject to the following restrictions: + (void) setDebugDraw: (BOOL) debugDraw; + (BOOL) debugDraw; ++ (void) setSplitImpulse: (BOOL) splitImpulse; ++ (BOOL) splitImpulse; + + (void) setDrawContacts: (BOOL) drawContacts; + (BOOL) drawContacts; diff --git a/Extras/AllBulletDemosOSX/src/BTDemo.mm b/Extras/AllBulletDemosOSX/src/BTDemo.mm index d44a98338..f34fcd912 100644 --- a/Extras/AllBulletDemosOSX/src/BTDemo.mm +++ b/Extras/AllBulletDemosOSX/src/BTDemo.mm @@ -41,6 +41,7 @@ static int NumIterations = 10; static BOOL DisableDeactivation = NO; static BOOL DrawAABBs = NO; static BOOL DebugDraw = NO; +static BOOL SplitImpulse = NO; static BOOL DrawContacts = NO; /////////////////////////////////////////////////////////////////////// @@ -376,6 +377,16 @@ static BOOL DrawContacts = NO; return DebugDraw; } ++ (void) setSplitImpulse: (BOOL) splitImpulse +{ + SplitImpulse = splitImpulse; +} + ++ (BOOL) splitImpulse +{ + return SplitImpulse; +} + + (void) setDrawContacts: (BOOL) drawContacts { DrawContacts = drawContacts; diff --git a/Extras/AllBulletDemosOSX/src/BTSimulationParameters.h b/Extras/AllBulletDemosOSX/src/BTSimulationParameters.h index f549a8b3d..298c9dde8 100644 --- a/Extras/AllBulletDemosOSX/src/BTSimulationParameters.h +++ b/Extras/AllBulletDemosOSX/src/BTSimulationParameters.h @@ -38,6 +38,9 @@ subject to the following restrictions: - (void) setDebugDraw: (BOOL) debugDraw; - (BOOL) debugDraw; +- (void) setSplitImpulse: (BOOL) splitImpulse; +- (BOOL) splitImpulse; + - (void) setDrawContacts: (BOOL) drawContacts; - (BOOL) drawContacts; diff --git a/Extras/AllBulletDemosOSX/src/BTSimulationParameters.m b/Extras/AllBulletDemosOSX/src/BTSimulationParameters.m index 45445c5ad..ab87cd9b9 100644 --- a/Extras/AllBulletDemosOSX/src/BTSimulationParameters.m +++ b/Extras/AllBulletDemosOSX/src/BTSimulationParameters.m @@ -72,6 +72,17 @@ subject to the following restrictions: return [BTDemo debugDraw]; } +- (void) setSplitImpulse: (BOOL) splitImpulse +{ + [BTDemo setSplitImpulse: splitImpulse]; +} + +- (BOOL) splitImpulse +{ + return [BTDemo splitImpulse]; +} + + - (void) setDrawContacts: (BOOL) drawContacts { [BTDemo setDrawContacts: drawContacts]; diff --git a/VERSION b/VERSION index 99f033ecb..e9b29f117 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -Bullet Collision Detection and Physics Library version 2.69 +Bullet Collision Detection and Physics Library version 2.70 http://bullet.googlecode.com diff --git a/configure.ac b/configure.ac index c2042cef3..1e297fdb1 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ AC_PREREQ([2.54]) #---------------------------------------------------------------------------- AC_INIT( [bullet], - [2.69], + [2.70], [bullet@erwincoumans.com]) CS_PACKAGEINFO( [Bullet Continuous Collision Detection and Physics Library],