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

fixed some merging conflicts

Browse Source
This commit is contained in:
ejcoumans
2006-09-27 20:58:49 +00:00
parent eb23bb5c0c
commit d0f09040e9
8 changed files with 42 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletCollision/CollisionDispatch/btCollisionObject.h
View File

@@ -34,8 +34,8 @@ class btCollisionShape;
struct btCollisionObject
{
btTransform m_worldTransform;
BroadphaseProxy* m_broadphaseHandle;
CollisionShape* m_collisionShape;
btBroadphaseProxy* m_broadphaseHandle;
btCollisionShape* m_collisionShape;
//m_interpolationWorldTransform is used for CCD and interpolation
//it can be either previous or future (predicted) transform