← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.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/NarrowPhaseCollision/btContinuousConvexCollision.h
30
30
{
31
31
        btSimplexSolverInterface* m_simplexSolver;
32
32
        btConvexPenetrationDepthSolver* m_penetrationDepthSolver;
33
 
        btConvexShape*  m_convexA;
34
 
        btConvexShape*  m_convexB;
 
33
        const btConvexShape*    m_convexA;
 
34
        const btConvexShape*    m_convexB;
35
35
 
36
36
 
37
37
public:
38
38
 
39
 
        btContinuousConvexCollision (btConvexShape*     shapeA,btConvexShape*   shapeB ,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver* penetrationDepthSolver);
 
39
        btContinuousConvexCollision (const btConvexShape*       shapeA,const btConvexShape*     shapeB ,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver* penetrationDepthSolver);
40
40
 
41
41
        virtual bool    calcTimeOfImpact(
42
42
                                const btTransform& fromA,