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

diff --git a/physics_test.h b/physics_test.h
index 8143c1d..acf4ed3 100644
--- a/physics_test.h
+++ b/physics_test.h
@@ -19,6 +19,26 @@ rigidbody blocky =
       .is_world = 1
    };
 
+rigidbody marko = 
+{
+   .type = k_rb_shape_box,
+   .bbx = {{-2.0f,-2.0f,-2.0f},{2.0f,2.0f,2.0f}},
+   .co = {-36.0f,8.0f,-36.0f},
+   .q = {0.0f,0.0f,0.0f,1.0f},
+   .is_world = 0
+};
+
+scene epic_scene;
+
+rigidbody epic_scene_rb = 
+{
+   .type = k_rb_shape_scene,
+   .co = {0.0f,0.0f,0.0f},
+   .q = {0.0f,0.0f,0.0f,1.0f},
+   .is_world = 1,
+   .inf.scene = { .pscene = &epic_scene }
+};
+
 rigidbody funnel[4] = {
    {
       .type = k_rb_shape_box,
@@ -53,7 +73,7 @@ rigidbody jeff1 = { .type = k_rb_shape_capsule,
 };
 
 rigidbody ball = { .type = k_rb_shape_sphere,
-                   .inf.sphere = { .radius = 2.0f },
+                   .inf.sphere = { .radius = 4.0f },
                    .co = {0.0f,20.0f,2.0f},
                    .q = {0.0f,0.0f,0.0f,1.0f}},
 
@@ -68,6 +88,8 @@ static void reorg_jeffs(void)
 {
    for( int i=0; i<vg_list_size(jeffs); i++ )
    {
+      v3_zero( jeffs[i].v );
+      v3_zero( jeffs[i].w );
       v3_copy( (v3f){ (vg_randf()-0.5f) * 10.0f,
                       (vg_randf()-0.5f) * 10.0f + 17.0f,
                       (vg_randf()-0.5f) * 10.0f }, jeffs[i].co );
@@ -77,7 +99,7 @@ static void reorg_jeffs(void)
       
       jeffs[i].type = k_rb_shape_capsule;
       jeffs[i].inf.capsule.radius = 0.75f;
-      jeffs[i].inf.capsule.height = 3.0f;
+      jeffs[i].inf.capsule.height = 8.0f;
 
       rb_init( &jeffs[i] );
    }
@@ -100,6 +122,30 @@ static void physics_test_start(void)
    rb_init( &ball1 );
    rb_init( &jeff1 );
    rb_init( &blocky );
+
+   scene_init( &epic_scene );
+
+   mdl_header *mdl = mdl_load( "models/epic_scene.mdl" );
+
+   m4x3f transform;
+   m4x3_identity( transform );
+
+   for( int i=0; i<mdl->node_count; i++ )
+   {
+      mdl_node *pnode = mdl_node_from_id( mdl, i );
+
+      for( int j=0; j<pnode->submesh_count; j++ )
+      {
+         mdl_submesh *sm = mdl_node_submesh( mdl, pnode, j );
+         scene_add_submesh( &epic_scene, mdl, sm, transform );
+      }
+   }
+
+   free( mdl );
+   scene_bh_create( &epic_scene );
+
+   rb_init( &epic_scene_rb );
+   rb_init( &marko );
 }
 
 static void physics_test_update(void)
@@ -107,7 +153,6 @@ static void physics_test_update(void)
    player_freecam();
    player_camera_update();
 
-   
    for( int i=0; i<4; i++ )
       rb_debug( &funnel[i], 0xff0060e0 );
    rb_debug( &ground, 0xff00ff00 );
@@ -117,79 +162,78 @@ static void physics_test_update(void)
    rb_debug( &blocky, 0xffcccccc );
    rb_debug( &jeff1, 0xff00ffff );
 
-   for( int i=0; i<vg_list_size(jeffs); i++ )
-   {
-      rb_debug( &jeffs[i], (u32[]){ 0xff0000ff, 0xff00ff00, 0xff00ffff,
-                                   0xffff0000, 0xffff00ff, 0xffffff00,
-                                   }[i%6] );
-      rb_iter( jeffs+i );
-   }
+   rb_debug( &epic_scene_rb, 0xffcccccc );
+   rb_debug( &marko, 0xffffcc00 );
 
    {
 
-   rb_iter( &ball );
-   rb_iter( &ball1 );
-   rb_iter( &jeff1 );
-
    rb_solver_reset();
 
    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_collide( &marko, &epic_scene_rb );
 
    rb_presolve_contacts( rb_contact_buffer, rb_contact_count );
    for( int i=0; i<8; i++ )
       rb_solve_contacts( rb_contact_buffer, rb_contact_count );
 
+
+   /* ITERATE */
+   {
    for( int i=0; i<vg_list_size(jeffs); i++ )
    {
-      rb_update_transform(jeffs+i);
+      rb_debug( &jeffs[i], (u32[]){ 0xff0000ff, 0xff00ff00, 0xff00ffff,
+                                   0xffff0000, 0xffff00ff, 0xffffff00,
+                                   }[i%6] );
+      rb_iter( jeffs+i );
    }
 
-   rb_update_transform( &ball );
-   rb_update_transform( &ball1 );
-   rb_update_transform( &jeff1 );
-
+   rb_iter( &ball );
+   rb_iter( &ball1 );
+   rb_iter( &jeff1 );
+   rb_iter( &marko );
    }
-
+   
+   /* POSITION OVERRIDE */
+   {
    if(glfwGetKey( vg_window, GLFW_KEY_L ))
    {
-      m4x3_mulv( player.camera, (v3f){0.0f,0.0f,-5.0f}, jeff1.co );
-      v3_zero( jeff1.v );
-      v3_zero( jeff1.w );
+      m4x3_mulv( player.camera, (v3f){0.0f,0.0f,-5.0f}, marko.co );
+      v3_zero( marko.v );
+      v3_zero( marko.w );
    }
    if(glfwGetKey( vg_window, GLFW_KEY_K ))
    {
@@ -208,6 +252,20 @@ static void physics_test_update(void)
    {
       reorg_jeffs();
    }
+   }
+   
+   /* UPDATE TRANSFORMS */
+   for( int i=0; i<vg_list_size(jeffs); i++ )
+   {
+      rb_update_transform(jeffs+i);
+   }
+
+   rb_update_transform( &ball );
+   rb_update_transform( &ball1 );
+   rb_update_transform( &jeff1 );
+   rb_update_transform( &marko );
+
+   }
 }
 
 static void physics_test_render(void)