diff --git a/Extras/AllBulletDemosOSX/English.lproj/MainMenu.xib b/Extras/AllBulletDemosOSX/English.lproj/MainMenu.xib index 32522433e..6a63aae57 100644 --- a/Extras/AllBulletDemosOSX/English.lproj/MainMenu.xib +++ b/Extras/AllBulletDemosOSX/English.lproj/MainMenu.xib @@ -2,13 +2,14 @@ 1040 - 9C7010 - 658 - 949.26 + 9E17 + 670 + 949.33 352.00 YES - + + YES @@ -348,6 +349,7 @@ All Bullet Demos NSWindow + {3.40282e+38, 3.40282e+38} {593, 360} @@ -524,7 +526,7 @@ {276, 219} {276, 219} - + 256 YES @@ -801,7 +803,7 @@ YES - 67239424 + -2080244224 0 Enable Split Impulse @@ -818,6 +820,7 @@ {276, 219} + {{0, 0}, {1440, 878}} {276, 235} @@ -1221,6 +1224,22 @@ 580 + + + value: splitImpulse + + + + + + value: splitImpulse + value + splitImpulse + 2 + + + 589 + @@ -1554,8 +1573,8 @@ - + @@ -1844,6 +1863,7 @@ 371.NSWindowTemplate.visibleAtLaunch 371.editorWindowContentRectSynchronizationRect 371.windowTemplate.hasMinSize + 371.windowTemplate.maxSize 371.windowTemplate.minSize 372.IBPluginDependency 449.IBPluginDependency @@ -1962,12 +1982,13 @@ {{390, 212}, {192, 73}} com.apple.InterfaceBuilder.CocoaPlugin {{475, 832}, {234, 43}} - {{115, 412}, {593, 360}} + {{1073, 539}, {593, 360}} com.apple.InterfaceBuilder.CocoaPlugin - {{115, 412}, {593, 360}} + {{1073, 539}, {593, 360}} {{33, 99}, {480, 360}} + {3.40282e+38, 3.40282e+38} {593, 360} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1985,9 +2006,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{543, 587}, {276, 219}} + {{378, 681}, {276, 219}} com.apple.InterfaceBuilder.CocoaPlugin - {{543, 587}, {276, 219}} + {{378, 681}, {276, 219}} @@ -2060,7 +2081,7 @@ - 582 + 589 diff --git a/Extras/AllBulletDemosOSX/src/BTDemo.mm b/Extras/AllBulletDemosOSX/src/BTDemo.mm index f34fcd912..4d64a7691 100644 --- a/Extras/AllBulletDemosOSX/src/BTDemo.mm +++ b/Extras/AllBulletDemosOSX/src/BTDemo.mm @@ -237,6 +237,13 @@ static BOOL DrawContacts = NO; return; } + if (SplitImpulse) + { + demo->getDynamicsWorld()->getSolverInfo().m_splitImpulse=1; + } else + { + demo->getDynamicsWorld()->getSolverInfo().m_splitImpulse=0; + } if (DrawAABBs) { demo->setDebugMode(demo->getDebugMode() |btIDebugDraw::DBG_DrawAabb);