← 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/btTriangleShape.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/btTriangleShape.h
27
27
 
28
28
        btVector3       m_vertices1[3];
29
29
 
30
 
 
31
30
        virtual int getNumVertices() const
32
31
        {
33
32
                return 3;
84
83
 
85
84
 
86
85
 
87
 
        btTriangleShape(const btVector3& p0,const btVector3& p1,const btVector3& p2)
88
 
        {
89
 
                m_vertices1[0] = p0;
90
 
                m_vertices1[1] = p1;
91
 
                m_vertices1[2] = p2;
92
 
        }
 
86
    btTriangleShape(const btVector3& p0,const btVector3& p1,const btVector3& p2)
 
87
    {
 
88
        m_vertices1[0] = p0;
 
89
        m_vertices1[1] = p1;
 
90
        m_vertices1[2] = p2;
 
91
    }
93
92
 
94
 
        
95
93
 
96
94
        virtual void getPlane(btVector3& planeNormal,btPoint3& planeSupport,int i) const
97
95
        {
116
114
                planeSupport = m_vertices1[0];
117
115
        }
118
116
 
119
 
        virtual void    calculateLocalInertia(btScalar mass,btVector3& inertia)
 
117
        virtual void    calculateLocalInertia(btScalar mass,btVector3& inertia) const
120
118
        {
121
119
                (void)mass;
122
120
                btAssert(0);
155
153
                return false;
156
154
        }
157
155
                //debugging
158
 
                virtual char*   getName()const
 
156
                virtual const char*     getName()const
159
157
                {
160
158
                        return "Triangle";
161
159
                }