X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=physics_test.h;fp=physics_test.h;h=d3b9f0640b97f035acfa5253e4660afe9bcb2c63;hb=be0f28b651e5c39943e476c0cd68c146e9952857;hp=8143c1d02d4bc4814423cb3cc8389675e70ba48e;hpb=344f0153cf1907da87dd041db3ec517325b1c429;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/physics_test.h b/physics_test.h
index 8143c1d..d3b9f06 100644
--- a/physics_test.h
+++ b/physics_test.h
@@ -136,39 +136,38 @@ static void physics_test_update(void)
    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++ )