X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.c;h=bfccb61a2930b5c146544182eb5d3327b379858f;hb=2673c575386c604fc2c0603dba2480eda05cf97a;hp=b372aa2b487d449d23706d7f30b7ac86c29203aa;hpb=d3d41f80ec992fe4e40b8531721b7874b8a7c400;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_skate.c b/player_skate.c
index b372aa2..bfccb61 100644
--- a/player_skate.c
+++ b/player_skate.c
@@ -345,42 +345,6 @@ VG_STATIC int create_jumps_to_hit_target( player_instance *player,
    return valid_count;
 }
 
-#if 0
-VG_STATIC 
-int create_jump_for_target( world_instance *world, player_instance *player,
-                            v3f target, float max_angle, jump_info *jump )
-{
-
-      if( fabsf(a0-a) > fabsf(a1-a) )
-         a0 = a1;
-
-      if( fabsf(a0-a) > max_angle )
-         return 0;
-
-      /* TODO: sweep the path before chosing the smallest dist */
-
-
-#if 0
-      /* add a trace */
-      for( int i=0; i<=20; i++ )
-      {
-         float t = (float)i * (1.0f/20.0f) * p->land_dist;
-
-         v3f p0;
-         v3_muls( p->v, t, p0 );
-         v3_muladds( p0, player->basis[1], -0.5f * p->gravity * t*t, p0 );
-
-         v3_add( player->rb.co, p0, p->log[ p->log_length ++ ] );
-      }
-#endif
-
-      return 1;
-   }
-   else
-      return 0;
-}
-#endif
-
 VG_STATIC 
 void player__approximate_best_trajectory( player_instance *player )
 {
@@ -464,7 +428,7 @@ void player__approximate_best_trajectory( player_instance *player )
          if( grind_located ) search_for_grind = 0;
          if( launch_vy - gravity*t > 0.0f ) search_for_grind = 0;
 
-         /* TODO Cleanup */
+         /* REFACTOR */
 
          v3f closest;
          if( search_for_grind ){
@@ -589,8 +553,7 @@ void player__approximate_best_trajectory( player_instance *player )
          create_jumps_to_hit_target( player, grind_jumps, grind.co, 
                                      0.175f*VG_PIf, grind_located_gravity );
 
-      /* knock out original landing points in the 1m area 
-       * TODO: Make this a konstant */
+      /* knock out original landing points in the 1m area */
       for( u32 j=0; j<s->possible_jump_count; j++ ){
          jump_info *jump = &s->possible_jumps[ j ];
          float dist = v3_dist2( jump->log[jump->log_length-1], grind.co );
@@ -615,8 +578,9 @@ void player__approximate_best_trajectory( player_instance *player )
          v3_muladds( co0, basis[1], -0.5f * jump->gravity * t*t, co0 );
          v3_add( launch_co, co0, co0 );
 
-#if 0
          /* rough scan to make sure we dont collide with anything */
+         /* NOTE this was rarely needed and ends up with false negatives. */
+#if 0
          for( int j=1; j<=16; j++ ){
             t  = (float)j*(1.0f/16.0f);
             t *= 0.9f;
@@ -1031,8 +995,6 @@ VG_STATIC void skate_apply_pump_model( player_instance *player )
    }
 
    /* Throw / collect routine 
-    *
-    * TODO: Max speed boost
     */
    if( player->input_grab->axis.value > 0.5f ){
       if( s->state.activity == k_skate_activity_ground ){
@@ -1293,7 +1255,7 @@ VG_STATIC void player__skate_post_update( player_instance *player )
 
       audio_clip *relevant_samples[] = {
          &audio_board[0],
-         &audio_board[0], /* TODO? */
+         &audio_board[0],
          &audio_board[7],
          &audio_board[6],
          &audio_board[5]
@@ -1498,8 +1460,6 @@ VG_STATIC void skate_weight_distribute( player_instance *player )
                                           (float)s->state.manual_direction;
    }
 
-   /* TODO: Fall back on land normal */
-   /* TODO: Lerp weight distribution */
    if( s->state.manual_direction ){
       v3f plane_z;
 
@@ -1569,7 +1529,6 @@ VG_STATIC int skate_point_visible( v3f origin, v3f target )
 
 VG_STATIC void skate_grind_orient( struct grind_info *inf, m3x3f mtx )
 {
-   /* TODO: Is N and Dir really orthogonal? */
    v3_copy( inf->dir, mtx[0] );
    v3_copy( inf->n, mtx[1] );
    v3_cross( mtx[0], mtx[1], mtx[2] );
@@ -1610,7 +1569,7 @@ VG_STATIC void skate_grind_truck_apply( player_instance *player,
 {
    struct player_skate *s = &player->_skate;
 
-   /* TODO: Trash compactor this */
+   /* REFACTOR */
    v3f ra = { 0.0f, -k_board_radius, sign * k_board_length };
    v3f raw, wsp;
    m3x3_mulv( player->rb.to_world, ra, raw );
@@ -1797,7 +1756,7 @@ VG_STATIC int skate_grind_truck_entry( player_instance *player, float sign,
 {
    struct player_skate *s = &player->_skate;
 
-   /* TODO: Trash compactor this */
+   /* REFACTOR */
    v3f ra = { 0.0f, -k_board_radius, sign * k_board_length };
 
    v3f raw, wsp;
@@ -1943,8 +1902,7 @@ VG_STATIC int skate_boardslide_renew( player_instance *player,
    if( !skate_point_visible( vis, inf->co ) )
       return 0;
 
-   /* Exit condition: minimum velocity not reached, but allow a bit of error 
-    * TODO: trash compactor */
+   /* Exit condition: minimum velocity not reached, but allow a bit of error */
    float dv   = fabsf(v3_dot( player->rb.v, inf->dir )),
          minv = k_grind_axel_min_vel*0.8f;
 
@@ -1978,6 +1936,10 @@ VG_STATIC enum skate_activity skate_availible_grind( player_instance *player )
 {
    struct player_skate *s = &player->_skate;
 
+   if( s->grind_cooldown > 100 ){
+      vg_fatal_exit_loop( "wth!\n" );
+   }
+
    /* debounces this state manager a little bit */
    if( s->grind_cooldown ){
       s->grind_cooldown --;
@@ -2837,7 +2799,6 @@ VG_STATIC void player__skate_animate( player_instance *player,
 
    mdl_keyframe grind_pose[32];
    {
-      /* TODO: factor balance into this sampler */
       float grind_frame = 0.5f;
 
       if( s->state.activity == k_skate_activity_grind_front50 ){