← 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/btEmptyCollisionAlgorithm.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/btEmptyCollisionAlgorithm.h
15
15
 
16
16
#ifndef EMPTY_ALGORITH
17
17
#define EMPTY_ALGORITH
18
 
#include "../BroadphaseCollision/btCollisionAlgorithm.h"
 
18
#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
19
19
#include "btCollisionCreateFunc.h"
 
20
#include "btCollisionDispatcher.h"
20
21
 
21
22
#define ATTRIBUTE_ALIGNED(a)
22
23
 
33
34
 
34
35
        virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
35
36
 
 
37
        virtual void    getAllContactManifolds(btManifoldArray& manifoldArray)
 
38
        {
 
39
        }
 
40
 
36
41
        struct CreateFunc :public       btCollisionAlgorithmCreateFunc
37
42
        {
38
43
                virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
39
44
                {
40
45
                        (void)body0;
41
46
                        (void)body1;
42
 
                        return new btEmptyAlgorithm(ci);
 
47
                        void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btEmptyAlgorithm));
 
48
                        return new(mem) btEmptyAlgorithm(ci);
43
49
                }
44
50
        };
45
51