← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
16
16
#ifndef CONVEX_CONCAVE_COLLISION_ALGORITHM_H
17
17
#define CONVEX_CONCAVE_COLLISION_ALGORITHM_H
18
18
 
19
 
#include "../BroadphaseCollision/btCollisionAlgorithm.h"
20
 
#include "../BroadphaseCollision/btDispatcher.h"
21
 
#include "../BroadphaseCollision/btBroadphaseInterface.h"
22
 
#include "../CollisionShapes/btTriangleCallback.h"
23
 
#include "../NarrowPhaseCollision/btPersistentManifold.h"
 
19
#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
 
20
#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
 
21
#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
 
22
#include "BulletCollision/CollisionShapes/btTriangleCallback.h"
 
23
#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
24
24
class btDispatcher;
25
 
#include "../BroadphaseCollision/btBroadphaseProxy.h"
 
25
#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
26
26
#include "btCollisionCreateFunc.h"
27
27
 
28
28
///For each triangle in the concave mesh that overlaps with the AABB of a convex (m_convexProxy), processTriangle is called.
55
55
        
56
56
        void clearCache();
57
57
 
58
 
        inline const btVector3& getAabbMin() const
 
58
        SIMD_FORCE_INLINE const btVector3& getAabbMin() const
59
59
        {
60
60
                return m_aabbMin;
61
61
        }
62
 
        inline const btVector3& getAabbMax() const
 
62
        SIMD_FORCE_INLINE const btVector3& getAabbMax() const
63
63
        {
64
64
                return m_aabbMax;
65
65
        }
88
88
 
89
89
        btScalar        calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
90
90
 
 
91
        virtual void    getAllContactManifolds(btManifoldArray& manifoldArray);
 
92
        
91
93
        void    clearCache();
92
94
 
93
95
        struct CreateFunc :public       btCollisionAlgorithmCreateFunc
94
96
        {
95
97
                virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
96
98
                {
97
 
                        return new btConvexConcaveCollisionAlgorithm(ci,body0,body1,false);
 
99
                        void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexConcaveCollisionAlgorithm));
 
100
                        return new(mem) btConvexConcaveCollisionAlgorithm(ci,body0,body1,false);
98
101
                }
99
102
        };
100
103
 
102
105
        {
103
106
                virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
104
107
                {
105
 
                        return new btConvexConcaveCollisionAlgorithm(ci,body0,body1,true);
 
108
                        void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexConcaveCollisionAlgorithm));
 
109
                        return new(mem) btConvexConcaveCollisionAlgorithm(ci,body0,body1,true);
106
110
                }
107
111
        };
108
112