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

move an __SPU__ conditional around the virtual methods, we need some of the other inline methods.

Browse Source
This commit is contained in:
erwin.coumans
2009-10-21 19:47:52 +00:00
parent d07b7ef3fa
commit 5acda2d06c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletCollision/CollisionShapes/btCollisionShape.h
View File

@@ -53,7 +53,7 @@ public:
///result is conservative ///result is conservative
void calculateTemporalAabb(const btTransform& curTrans,const btVector3& linvel,const btVector3& angvel,btScalar timeStep, btVector3& temporalAabbMin,btVector3& temporalAabbMax) const; void calculateTemporalAabb(const btTransform& curTrans,const btVector3& linvel,const btVector3& angvel,btScalar timeStep, btVector3& temporalAabbMin,btVector3& temporalAabbMax) const;
#ifndef __SPU__
SIMD_FORCE_INLINE bool isPolyhedral() const SIMD_FORCE_INLINE bool isPolyhedral() const
{ {
@@ -84,7 +84,7 @@ public:
return btBroadphaseProxy::isInfinite(getShapeType()); return btBroadphaseProxy::isInfinite(getShapeType());
} }
#ifndef __SPU__
virtual void setLocalScaling(const btVector3& scaling) =0; virtual void setLocalScaling(const btVector3& scaling) =0;
virtual const btVector3& getLocalScaling() const =0; virtual const btVector3& getLocalScaling() const =0;
virtual void calculateLocalInertia(btScalar mass,btVector3& inertia) const = 0; virtual void calculateLocalInertia(btScalar mass,btVector3& inertia) const = 0;