~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
 
22
22
btHeightfieldTerrainShape::btHeightfieldTerrainShape
23
23
(
24
 
int heightStickWidth, int heightStickLength, void* heightfieldData,
 
24
int heightStickWidth, int heightStickLength, const void* heightfieldData,
25
25
btScalar heightScale, btScalar minHeight, btScalar maxHeight,int upAxis,
26
26
PHY_ScalarType hdt, bool flipQuadEdges
27
27
)
33
33
 
34
34
 
35
35
 
36
 
btHeightfieldTerrainShape::btHeightfieldTerrainShape(int heightStickWidth, int heightStickLength,void* heightfieldData,btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges)
 
36
btHeightfieldTerrainShape::btHeightfieldTerrainShape(int heightStickWidth, int heightStickLength,const void* heightfieldData,btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges)
37
37
{
38
38
        // legacy constructor: support only float or unsigned char,
39
39
        //      and min height is zero
53
53
 
54
54
void btHeightfieldTerrainShape::initialize
55
55
(
56
 
int heightStickWidth, int heightStickLength, void* heightfieldData,
 
56
int heightStickWidth, int heightStickLength, const void* heightfieldData,
57
57
btScalar heightScale, btScalar minHeight, btScalar maxHeight, int upAxis,
58
58
PHY_ScalarType hdt, bool flipQuadEdges
59
59
)