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

Made the move from sourceforge to googlecode (no svn sync any longer)

Browse Source 
Fixed BulletColladaConverter load/save
Removed btTypedUserInfo
Added btHashMap
Fixed btCapsuleShape
This commit is contained in:
erwin.coumans
2008-03-13 05:16:42 +00:00
parent 2f80e7f814
commit fe5386a5c8
20 changed files with 771 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BulletCollision/CollisionShapes/btCapsuleShape.h
View File

@@ -48,7 +48,7 @@ public:
virtual void getAabb (const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
{
btVector3 halfExtents(getRadius(),getRadius(),getRadius());
halfExtents[m_upAxis] = getRadius()*btScalar(2.0) + btScalar(0.5)*getHalfHeight();
halfExtents[m_upAxis] = getRadius() + getHalfHeight();
btMatrix3x3 abs_b = t.getBasis().absolute();
btPoint3 center = t.getOrigin();
btVector3 extent = btVector3(abs_b[0].dot(halfExtents),abs_b[1].dot(halfExtents),abs_b[2].dot(halfExtents));

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

@@ -16,7 +16,6 @@ subject to the following restrictions:
#ifndef COLLISION_SHAPE_H
#define COLLISION_SHAPE_H
class btTypedUserInfo;
#include "LinearMath/btTransform.h"
#include "LinearMath/btVector3.h"
#include "LinearMath/btMatrix3x3.h"
@@ -28,11 +27,10 @@ class btCollisionShape
{
void* m_userPointer;
btTypedUserInfo* m_typedUserInfo;
public:
btCollisionShape() : m_userPointer(0), m_typedUserInfo (0)
btCollisionShape() : m_userPointer(0)
{
}
virtual ~btCollisionShape()
@@ -105,15 +103,6 @@ public:
return m_userPointer;
}
btTypedUserInfo* getTypedUserInfo () const
{
return m_typedUserInfo;
}
void setTypedUserInfo (btTypedUserInfo* typedUserInfo)
{
m_typedUserInfo = typedUserInfo;
}
};
#endif //COLLISION_SHAPE_H

1
src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
View File

@@ -83,6 +83,7 @@ class btStridingMeshInterface
m_scaling = scaling;
}
};