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

more compatibility fixes for Physics Effects 2.x/vectormath.

Browse Source
This commit is contained in:
erwin.coumans
2011-02-28 07:27:39 +00:00
parent e621c880d6
commit b7211240fc
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/BulletMultiThreaded/PlatformDefinitions.h
View File

@@ -6,7 +6,12 @@
#include "LinearMath/btMinMax.h" #include "LinearMath/btMinMax.h"
#ifdef PFX_USE_FREE_VECTORMATH #ifdef PFX_USE_FREE_VECTORMATH
#include "vecmath/vmInclude.h" #include "physics_effects/base_level/base/pfx_vectormath_include.win32.h"
typedef Vectormath::Aos::Vector3 vmVector3;
typedef Vectormath::Aos::Quat vmQuat;
typedef Vectormath::Aos::Matrix3 vmMatrix3;
typedef Vectormath::Aos::Transform3 vmTransform3;
typedef Vectormath::Aos::Point3 vmPoint3;
#else #else
#include "vectormath/vmInclude.h" #include "vectormath/vmInclude.h"
#endif//PFX_USE_FREE_VECTORMATH #endif//PFX_USE_FREE_VECTORMATH

6
src/BulletMultiThreaded/vectormath2bullet.h
View File

@@ -30,11 +30,7 @@
#ifndef AOS_VECTORMATH_BULLET_CONVERT_H #ifndef AOS_VECTORMATH_BULLET_CONVERT_H
#define AOS_VECTORMATH_BULLET_CONVERT_H #define AOS_VECTORMATH_BULLET_CONVERT_H
#ifdef PFX_USE_FREE_VECTORMATH #include "PlatformDefinitions.h"
#include "vecmath/vmInclude.h"
#else
#include "vectormath/vmInclude.h"
#endif //PFX_USE_FREE_VECTORMATH
#include "LinearMath/btVector3.h" #include "LinearMath/btVector3.h"
#include "LinearMath/btQuaternion.h" #include "LinearMath/btQuaternion.h"
#include "LinearMath/btMatrix3x3.h" #include "LinearMath/btMatrix3x3.h"