clean up rigidbody

[carveJwlIkooP6JGAAIwe30JlM.git] / player.h

diff --git a/player.h b/player.h
index aa5b548d0821dc27f2203166c9a6b34816842241..726d62483c5788bd3e713ad64fa9a355c7a1ff44 100644 (file)
--- a/player.h
+++ b/player.h
@@ -470,8 +470,8 @@ static void player_physics(void)
    rb_ct manifold[24];
    int len = 0;
 
-   len += rb_sphere_vs_scene( rbf, &world.rb_geo, manifold+len );
-   len += rb_sphere_vs_scene( rbb, &world.rb_geo, manifold+len );
+   len += rb_sphere_scene( rbf, &world.rb_geo, manifold+len );
+   len += rb_sphere_scene( rbb, &world.rb_geo, manifold+len );
 
    rb_presolve_contacts( manifold, len );
    v3f surface_avg = {0.0f, 0.0f, 0.0f};
@@ -834,10 +834,9 @@ static void player_camera_update(void)
 
 static void player_animate_death_cam(void)
 {
-#if 0
    v3f delta;
    v3f head_pos;
-   v3_copy( player.mdl.ragdoll[k_chpart_head].co, head_pos );
+   v3_copy( player.mdl.ragdoll[0].rb.co, head_pos );
 
    v3_sub( head_pos, player.camera_pos, delta );
    v3_normalize( delta );
@@ -864,7 +863,6 @@ static void player_animate_death_cam(void)
 
    player.angles[0] = atan2f( delta[0], -delta[2] ); 
    player.angles[1] = -asinf( delta[1] );
-#endif
 }
 
 static void player_animate_camera(void)
@@ -1081,21 +1079,8 @@ static void player_update(void)
 
 static void draw_player(void)
 {
-   /* Draw */
-#if 0
-   m4x3_copy( player.rb.to_world, player.mdl.mroot );
-
    if( player.is_dead )
       character_mimic_ragdoll( &player.mdl );
-   else
-      character_eval( &player.mdl );
-
-   float opacity = 1.0f-player.air_blend;
-   if( player.is_dead )
-      opacity = 0.0f;
-
-   character_draw( &player.mdl, opacity, player.camera );
-#endif
 
    shader_viewchar_use();
    vg_tex2d_bind( &tex_characters, 0 );