diff --git a/Demos3/GpuDemos/main_opengl3core.cpp b/Demos3/GpuDemos/main_opengl3core.cpp index 34a2c63fa..03f28a5b6 100644 --- a/Demos3/GpuDemos/main_opengl3core.cpp +++ b/Demos3/GpuDemos/main_opengl3core.cpp @@ -48,7 +48,7 @@ static void MyResizeCallback( float width, float height) b3gWindowInterface* window=0; GwenUserInterface* gui = 0; -bool gPause = true; +bool gPause = false; bool gReset = false; enum @@ -68,7 +68,9 @@ int selectedDemo = 0; GpuDemo::CreateFunc* allDemos[]= { // ConcaveCompound2Scene::MyCreateFunc, - GpuConvexScene::MyCreateFunc, +// GpuConvexScene::MyCreateFunc, + + //ConcaveSphereScene::MyCreateFunc, GpuBoxPlaneScene::MyCreateFunc, GpuConvexPlaneScene::MyCreateFunc, diff --git a/src/Bullet3Common/b3Scalar.h b/src/Bullet3Common/b3Scalar.h index 67c65aaa1..f877d57c3 100644 --- a/src/Bullet3Common/b3Scalar.h +++ b/src/Bullet3Common/b3Scalar.h @@ -221,12 +221,12 @@ inline int b3GetVersion() #define B3_FORCE_INLINE inline ///@todo: check out alignment methods for other platforms/compilers - ///#define B3_ATTRIBUTE_ALIGNED16(a) a __attribute__ ((aligned (16))) - ///#define B3_ATTRIBUTE_ALIGNED64(a) a __attribute__ ((aligned (64))) - ///#define B3_ATTRIBUTE_ALIGNED128(a) a __attribute__ ((aligned (128))) - #define B3_ATTRIBUTE_ALIGNED16(a) a - #define B3_ATTRIBUTE_ALIGNED64(a) a - #define B3_ATTRIBUTE_ALIGNED128(a) a + #define B3_ATTRIBUTE_ALIGNED16(a) a __attribute__ ((aligned (16))) + #define B3_ATTRIBUTE_ALIGNED64(a) a __attribute__ ((aligned (64))) + #define B3_ATTRIBUTE_ALIGNED128(a) a __attribute__ ((aligned (128))) + ///#define B3_ATTRIBUTE_ALIGNED16(a) a + ///#define B3_ATTRIBUTE_ALIGNED64(a) a + ///#define B3_ATTRIBUTE_ALIGNED128(a) a #ifndef assert #include #endif