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

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 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/btConvexPlaneCollisionAlgorithm.h (modified) (4 diffs)

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

@@ -5 +5 @@
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
 subject to the following restrictions:
 
@@ -29 +29 @@
 class btConvexPlaneCollisionAlgorithm : public btCollisionAlgorithm
 {
-        bool            m_ownManifold;
+        bool    m_ownManifold;
         btPersistentManifold*   m_manifoldPtr;
-        bool            m_isSwapped;
-        int                     m_numPerturbationIterations;
-        int                     m_minimumPointsPerturbationThreshold;
-
+        bool    m_isSwapped;
+        
 public:
 
-        btConvexPlaneCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* col0,btCollisionObject* col1, bool isSwapped, int numPerturbationIterations,int minimumPointsPerturbationThreshold);
+        btConvexPlaneCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* col0,btCollisionObject* col1, bool isSwapped);
 
         virtual ~btConvexPlaneCollisionAlgorithm();
 
         virtual void processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
-
-        void collideSingleContact (const btQuaternion& perturbeRot, btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
         virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
@@ -57 +53 @@
         struct CreateFunc :public       btCollisionAlgorithmCreateFunc
         {
-                int     m_numPerturbationIterations;
-                int m_minimumPointsPerturbationThreshold;
-                        
-                CreateFunc() 
-                        : m_numPerturbationIterations(3),
-                        m_minimumPointsPerturbationThreshold(3)
-                {
-                }
-                
                 virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
                 {
@@ -71 +58 @@
                         if (!m_swapped)
                         {
-                                return new(mem) btConvexPlaneCollisionAlgorithm(0,ci,body0,body1,false,m_numPerturbationIterations,m_minimumPointsPerturbationThreshold);
+                                return new(mem) btConvexPlaneCollisionAlgorithm(0,ci,body0,body1,false);
                         } else
                         {
-                                return new(mem) btConvexPlaneCollisionAlgorithm(0,ci,body0,body1,true,m_numPerturbationIterations,m_minimumPointsPerturbationThreshold);
+                                return new(mem) btConvexPlaneCollisionAlgorithm(0,ci,body0,body1,true);
                         }
                 }