for( int i=0; i<4; i++ )
{
rigidbody *fn = &funnel[i];
- rb_contact_count += rb_sphere_vs_box( &ball, fn, rb_global_ct());
- rb_contact_count += rb_sphere_vs_box( &ball1, fn, rb_global_ct());
- rb_contact_count += rb_capsule_vs_box( &jeff1, fn, rb_global_ct() );
+ rb_collide( &ball, fn );
+ rb_collide( &ball1, fn );
+ rb_collide( &jeff1, fn );
for( int i=0; i<vg_list_size(jeffs); i++ )
- rb_contact_count += rb_capsule_vs_box( jeffs+i, fn, rb_global_ct() );
+ rb_collide( jeffs+i, fn );
}
for( int i=0; i<vg_list_size(jeffs)-1; i++ )
{
for( int j=i+1; j<vg_list_size(jeffs); j++ )
{
- rb_contact_count += rb_capsule_vs_capsule( jeffs+i, jeffs+j,
- rb_global_ct() );
+ rb_collide( jeffs+i, jeffs+j );
}
}
for( int i=0; i<vg_list_size(jeffs); i++ )
{
- rb_contact_count += rb_capsule_vs_box( jeffs+i, &ground, rb_global_ct() );
- rb_contact_count += rb_capsule_vs_sphere( jeffs+i, &ball, rb_global_ct() );
- rb_contact_count += rb_capsule_vs_sphere( jeffs+i, &ball1, rb_global_ct() );
- rb_contact_count += rb_capsule_vs_capsule( jeffs+i, &jeff1, rb_global_ct() );
+ rb_collide( jeffs+i, &ground );
+ rb_collide( jeffs+i, &ball );
+ rb_collide( jeffs+i, &ball1 );
+ rb_collide( jeffs+i, &jeff1 );
}
- rb_contact_count += rb_capsule_vs_box( &jeff1, &ground, rb_global_ct() );
- rb_contact_count += rb_capsule_vs_box( &jeff1, &blocky, rb_global_ct() );
- rb_contact_count += rb_capsule_vs_sphere( &jeff1, &ball, rb_global_ct() );
- rb_contact_count += rb_capsule_vs_sphere( &jeff1, &ball1, rb_global_ct() );
+ rb_collide( &jeff1, &ground );
+ rb_collide( &jeff1, &blocky );
+ rb_collide( &jeff1, &ball );
+ rb_collide( &jeff1, &ball1 );
- rb_contact_count += rb_sphere_vs_box( &ball, &ground, rb_global_ct() );
- rb_contact_count += rb_sphere_vs_box( &ball1, &ground, rb_global_ct() );
- rb_contact_count += rb_sphere_vs_sphere( &ball1, &ball, rb_global_ct() );
+ rb_collide( &ball, &ground );
+ rb_collide( &ball1, &ground );
+ rb_collide( &ball1, &ball );
rb_presolve_contacts( rb_contact_buffer, rb_contact_count );
for( int i=0; i<8; i++ )