Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h

Timestamp:

Apr 21, 2011, 6:58:23 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (modified) (3 diffs)

code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h

@@ -47 +47 @@
         MINKOWSKI_SUM_SHAPE_PROXYTYPE,
         MINKOWSKI_DIFFERENCE_SHAPE_PROXYTYPE,
+        BOX_2D_SHAPE_PROXYTYPE,
+        CONVEX_2D_SHAPE_PROXYTYPE,
         CUSTOM_CONVEX_SHAPE_TYPE,
 //concave shapes
@@ -140 +142 @@
         }
 
+        static SIMD_FORCE_INLINE bool   isNonMoving(int proxyType)
+        {
+                return (isConcave(proxyType) && !(proxyType==GIMPACT_SHAPE_PROXYTYPE));
+        }
+
         static SIMD_FORCE_INLINE bool   isConcave(int proxyType)
         {
@@ -149 +156 @@
                 return (proxyType == COMPOUND_SHAPE_PROXYTYPE);
         }
+
+        static SIMD_FORCE_INLINE bool   isSoftBody(int proxyType)
+        {
+                return (proxyType == SOFTBODY_SHAPE_PROXYTYPE);
+        }
+
         static SIMD_FORCE_INLINE bool isInfinite(int proxyType)
         {
                 return (proxyType == STATIC_PLANE_PROXYTYPE);
         }
+
+        static SIMD_FORCE_INLINE bool isConvex2d(int proxyType)
+        {
+                return (proxyType == BOX_2D_SHAPE_PROXYTYPE) || (proxyType == CONVEX_2D_SHAPE_PROXYTYPE);
+        }
+
         
 }