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

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

Browse Source 
Still need to verify to make sure no unwanted renaming is introduced.
This commit is contained in:
ejcoumans
2006-09-27 20:43:51 +00:00
parent d1e9a885f3
commit eb23bb5c0c
263 changed files with 7528 additions and 6714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/BulletCollision/CollisionShapes/btEmptyShape.cpp
View File

@@ -19,20 +19,20 @@ subject to the following restrictions:
#include "btCollisionShape.h"
EmptyShape::EmptyShape()
btEmptyShape::btEmptyShape()
{
}
EmptyShape::~EmptyShape()
btEmptyShape::~btEmptyShape()
{
}
///GetAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
void EmptyShape::GetAabb(const SimdTransform& t,SimdVector3& aabbMin,SimdVector3& aabbMax) const
void btEmptyShape::GetAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
{
SimdVector3 margin(GetMargin(),GetMargin(),GetMargin());
btVector3 margin(GetMargin(),GetMargin(),GetMargin());
aabbMin = t.getOrigin() - margin;
@@ -40,7 +40,7 @@ void EmptyShape::GetAabb(const SimdTransform& t,SimdVector3& aabbMin,SimdVector3
}
void EmptyShape::CalculateLocalInertia(SimdScalar mass,SimdVector3& inertia)
void btEmptyShape::CalculateLocalInertia(btScalar mass,btVector3& inertia)
{
assert(0);
}