Changeset 2908 for code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h

Timestamp:

Apr 8, 2009, 12:58:47 AM (15 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified) (14 diffs)

code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h

@@ -59 +59 @@
  * 
  */
-
-
  
  
@@ -82 +80 @@
 {
 
-
         
 protected:
 
         btAlignedObjectArray<btCollisionObject*>        m_collisionObjects;
-
         
         btDispatcher*   m_dispatcher1;
@@ -99 +95 @@
         btIDebugDraw*   m_debugDrawer;
 
-
         
 public:
@@ -138 +133 @@
                 return m_dispatcher1;
         }
-
-        void    updateSingleAabb(btCollisionObject* colObj);
 
         virtual void    updateAabbs();
@@ -161 +154 @@
                 int     m_shapePart;
                 int     m_triangleIndex;
-
                 
                 //const btCollisionShape*       m_shapeTemp;
@@ -194 +186 @@
                 short int       m_collisionFilterGroup;
                 short int       m_collisionFilterMask;
-      //@BP Mod - Custom flags, currently used to enable backface culling on tri-meshes, see btRaycastCallback
-      unsigned int m_flags;
 
                 virtual ~RayResultCallback()
@@ -209 +199 @@
                         m_collisionObject(0),
                         m_collisionFilterGroup(btBroadphaseProxy::DefaultFilter),
-                        m_collisionFilterMask(btBroadphaseProxy::AllFilter),
-         //@BP Mod
-         m_flags(0)
+                        m_collisionFilterMask(btBroadphaseProxy::AllFilter)
                 {
                 }
@@ -239 +227 @@
                 btVector3       m_hitNormalWorld;
                 btVector3       m_hitPointWorld;
-
                         
                 virtual btScalar        addSingleResult(LocalRayResult& rayResult,bool normalInWorldSpace)
@@ -245 +232 @@
                         //caller already does the filter on the m_closestHitFraction
                         btAssert(rayResult.m_hitFraction <= m_closestHitFraction);
-
                         
                         m_closestHitFraction = rayResult.m_hitFraction;
@@ -292 +278 @@
                 short int       m_collisionFilterGroup;
                 short int       m_collisionFilterMask;
-
                 
                 ConvexResultCallback()
@@ -304 +289 @@
                 {
                 }
-
                 
                 bool    hasHit() const
@@ -310 +294 @@
                         return (m_closestHitFraction < btScalar(1.));
                 }
-
 
                 
@@ -339 +322 @@
                 btVector3       m_hitPointWorld;
                 btCollisionObject*      m_hitCollisionObject;
-
                 
                 virtual btScalar        addSingleResult(LocalConvexResult& convexResult,bool normalInWorldSpace)
@@ -345 +327 @@
 //caller already does the filter on the m_closestHitFraction
                         btAssert(convexResult.m_hitFraction <= m_closestHitFraction);
-
                                                 
                         m_closestHitFraction = convexResult.m_hitFraction;