← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.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/CollisionShapes/btMinkowskiSumShape.h
16
16
#ifndef MINKOWSKI_SUM_SHAPE_H
17
17
#define MINKOWSKI_SUM_SHAPE_H
18
18
 
19
 
#include "btConvexShape.h"
20
 
#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
19
#include "btConvexInternalShape.h"
 
20
#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
21
21
 
22
 
/// btMinkowskiSumShape represents implicit (getSupportingVertex) based minkowski sum of two convex implicit shapes.
23
 
class btMinkowskiSumShape : public btConvexShape
 
22
/// The btMinkowskiSumShape is only for advanced users. This shape represents implicit based minkowski sum of two convex implicit shapes.
 
23
class btMinkowskiSumShape : public btConvexInternalShape
24
24
{
25
25
 
26
26
        btTransform     m_transA;
37
37
        virtual void    batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
38
38
 
39
39
 
40
 
        virtual void    calculateLocalInertia(btScalar mass,btVector3& inertia);
 
40
        virtual void    calculateLocalInertia(btScalar mass,btVector3& inertia) const;
41
41
 
42
42
        void    setTransformA(const btTransform&        transA) { m_transA = transA;}
43
43
        void    setTransformB(const btTransform&        transB) { m_transB = transB;}
53
53
        const btConvexShape*    getShapeA() const { return m_shapeA;}
54
54
        const btConvexShape*    getShapeB() const { return m_shapeB;}
55
55
 
56
 
        virtual char*   getName()const 
 
56
        virtual const char*     getName()const 
57
57
        {
58
58
                return "MinkowskiSum";
59
59
        }