← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletSoftBody/btSparseSDF.h

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
extern/bullet2/src/BulletSoftBody/btSparseSDF.h
58
58
                int                                     c[3];
59
59
                int                                     puid;
60
60
                unsigned                        hash;
61
 
                btCollisionShape*       pclient;
 
61
                const btCollisionShape* pclient;
62
62
                Cell*                           next;
63
63
        };
64
64
        //
152
152
        }
153
153
        //
154
154
        btScalar                                Evaluate(       const btVector3& x,
155
 
                btCollisionShape* shape,
 
155
                const btCollisionShape* shape,
156
156
                btVector3& normal,
157
157
                btScalar margin)
158
158
        {
248
248
        }
249
249
        //
250
250
        static inline btScalar  DistanceToShape(const btVector3& x,
251
 
                btCollisionShape* shape)
 
251
                const btCollisionShape* shape)
252
252
        {
253
253
                btTransform     unit;
254
254
                unit.setIdentity();
255
255
                if(shape->isConvex())
256
256
                {
257
257
                        btGjkEpaSolver2::sResults       res;
258
 
                        btConvexShape*                          csh=static_cast<btConvexShape*>(shape);
 
258
                        const btConvexShape*                            csh=static_cast<const btConvexShape*>(shape);
259
259
                        return(btGjkEpaSolver2::SignedDistance(x,0,csh,unit,res));
260
260
                }
261
261
                return(0);
282
282
 
283
283
 
284
284
        //
285
 
        static inline unsigned int      Hash(int x,int y,int z,btCollisionShape* shape)
 
285
        static inline unsigned int      Hash(int x,int y,int z,const btCollisionShape* shape)
286
286
        {
287
287
                struct btS
288
288
                { 
292
292
 
293
293
                btS myset;
294
294
 
295
 
                myset.x=x;myset.y=y;myset.z=z;myset.p=shape;
 
295
                myset.x=x;myset.y=y;myset.z=z;myset.p=(void*)shape;
296
296
                const void* ptr = &myset;
297
297
 
298
298
                unsigned int result = HsiehHash<sizeof(btS)/4> (ptr);