diff options
Diffstat (limited to 'extern/bullet2/src/BulletSoftBody/btSparseSDF.h')
| -rw-r--r-- | extern/bullet2/src/BulletSoftBody/btSparseSDF.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extern/bullet2/src/BulletSoftBody/btSparseSDF.h b/extern/bullet2/src/BulletSoftBody/btSparseSDF.h index 90a26cdf7e3..180e3c218cc 100644 --- a/extern/bullet2/src/BulletSoftBody/btSparseSDF.h +++ b/extern/bullet2/src/BulletSoftBody/btSparseSDF.h @@ -58,7 +58,7 @@ struct btSparseSdf int c[3]; int puid; unsigned hash; - btCollisionShape* pclient; + const btCollisionShape* pclient; Cell* next; }; // @@ -152,7 +152,7 @@ struct btSparseSdf } // btScalar Evaluate( const btVector3& x, - btCollisionShape* shape, + const btCollisionShape* shape, btVector3& normal, btScalar margin) { @@ -248,14 +248,14 @@ struct btSparseSdf } // static inline btScalar DistanceToShape(const btVector3& x, - btCollisionShape* shape) + const btCollisionShape* shape) { btTransform unit; unit.setIdentity(); if(shape->isConvex()) { btGjkEpaSolver2::sResults res; - btConvexShape* csh=static_cast<btConvexShape*>(shape); + const btConvexShape* csh=static_cast<const btConvexShape*>(shape); return(btGjkEpaSolver2::SignedDistance(x,0,csh,unit,res)); } return(0); @@ -282,7 +282,7 @@ struct btSparseSdf // - static inline unsigned int Hash(int x,int y,int z,btCollisionShape* shape) + static inline unsigned int Hash(int x,int y,int z,const btCollisionShape* shape) { struct btS { @@ -292,7 +292,7 @@ struct btSparseSdf btS myset; - myset.x=x;myset.y=y;myset.z=z;myset.p=shape; + myset.x=x;myset.y=y;myset.z=z;myset.p=(void*)shape; const void* ptr = &myset; unsigned int result = HsiehHash<sizeof(btS)/4> (ptr); |