Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enable alignment macros for Linux

Browse Source
This commit is contained in:
erwincoumans
2013-05-22 17:59:13 -07:00
parent ee5195d3e8
commit 98a877a80d
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Demos3/GpuDemos/main_opengl3core.cpp
View File

@@ -48,7 +48,7 @@ static void MyResizeCallback( float width, float height)
b3gWindowInterface* window=0; b3gWindowInterface* window=0;
GwenUserInterface* gui = 0; GwenUserInterface* gui = 0;
bool gPause = true; bool gPause = false;
bool gReset = false; bool gReset = false;
enum enum
@@ -68,7 +68,9 @@ int selectedDemo = 0;
GpuDemo::CreateFunc* allDemos[]= GpuDemo::CreateFunc* allDemos[]=
{ {
// ConcaveCompound2Scene::MyCreateFunc, // ConcaveCompound2Scene::MyCreateFunc,
GpuConvexScene::MyCreateFunc, // GpuConvexScene::MyCreateFunc,
//ConcaveSphereScene::MyCreateFunc,
GpuBoxPlaneScene::MyCreateFunc, GpuBoxPlaneScene::MyCreateFunc,
GpuConvexPlaneScene::MyCreateFunc, GpuConvexPlaneScene::MyCreateFunc,

12
src/Bullet3Common/b3Scalar.h
View File

@@ -221,12 +221,12 @@ inline int b3GetVersion()
#define B3_FORCE_INLINE inline #define B3_FORCE_INLINE inline
///@todo: check out alignment methods for other platforms/compilers ///@todo: check out alignment methods for other platforms/compilers
///#define B3_ATTRIBUTE_ALIGNED16(a) a __attribute__ ((aligned (16))) #define B3_ATTRIBUTE_ALIGNED16(a) a __attribute__ ((aligned (16)))
///#define B3_ATTRIBUTE_ALIGNED64(a) a __attribute__ ((aligned (64))) #define B3_ATTRIBUTE_ALIGNED64(a) a __attribute__ ((aligned (64)))
///#define B3_ATTRIBUTE_ALIGNED128(a) a __attribute__ ((aligned (128))) #define B3_ATTRIBUTE_ALIGNED128(a) a __attribute__ ((aligned (128)))
#define B3_ATTRIBUTE_ALIGNED16(a) a ///#define B3_ATTRIBUTE_ALIGNED16(a) a
#define B3_ATTRIBUTE_ALIGNED64(a) a ///#define B3_ATTRIBUTE_ALIGNED64(a) a
#define B3_ATTRIBUTE_ALIGNED128(a) a ///#define B3_ATTRIBUTE_ALIGNED128(a) a
#ifndef assert #ifndef assert
#include <assert.h> #include <assert.h>
#endif #endif