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

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.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:
384
384
 
385
385
 
386
386
SIMD_FORCE_INLINE bool _quantized_node_collision(
387
 
        btGImpactQuantizedBvh * boxset0, btGImpactQuantizedBvh * boxset1,
 
387
        const btGImpactQuantizedBvh * boxset0, const btGImpactQuantizedBvh * boxset1,
388
388
        const BT_BOX_BOX_TRANSFORM_CACHE & trans_cache_1to0,
389
389
        int node0 ,int node1, bool complete_primitive_tests)
390
390
{
402
402
 
403
403
//stackless recursive collision routine
404
404
static void _find_quantized_collision_pairs_recursive(
405
 
        btGImpactQuantizedBvh * boxset0, btGImpactQuantizedBvh * boxset1,
 
405
        const btGImpactQuantizedBvh * boxset0, const btGImpactQuantizedBvh * boxset1,
406
406
        btPairSet * collision_pairs,
407
407
        const BT_BOX_BOX_TRANSFORM_CACHE & trans_cache_1to0,
408
408
        int node0, int node1, bool complete_primitive_tests)
501
501
}
502
502
 
503
503
 
504
 
void btGImpactQuantizedBvh::find_collision(btGImpactQuantizedBvh * boxset0, const btTransform & trans0,
505
 
                btGImpactQuantizedBvh * boxset1, const btTransform & trans1,
 
504
void btGImpactQuantizedBvh::find_collision(const btGImpactQuantizedBvh * boxset0, const btTransform & trans0,
 
505
                const btGImpactQuantizedBvh * boxset1, const btTransform & trans1,
506
506
                btPairSet & collision_pairs)
507
507
{
508
508