plish

[carveJwlIkooP6JGAAIwe30JlM.git] / player_skate.c

diff --git a/player_skate.c b/player_skate.c
index 4e354e5e8ed009f448a71754a89bcdc958548d97..fa59d24e1718a534169a693a587f74cd69ad783b 100644 (file)
--- a/player_skate.c
+++ b/player_skate.c
@@ -684,6 +684,12 @@ VG_STATIC void skate_apply_interface_model( player_instance *player,
          s->state.lift_frames = 0;
          v3f projected, axis;
 
+         if( s->state.activity_prev == k_skate_activity_air )
+         {
+            player->cam_land_punch_v += v3_dot( player->rb.v, surface_avg ) *
+                                          k_cam_punch;
+         }
+
          float const DOWNFORCE = -k_downforce*VG_TIMESTEP_FIXED;
          v3_muladds( player->rb.v, player->rb.to_world[1], 
                      DOWNFORCE, player->rb.v );
@@ -1239,18 +1245,16 @@ VG_STATIC void player__skate_animate( player_instance *player,
    m4x3_mulv( player->rb.to_local, s->state.cog, offset );
    v3_muls( offset, -4.0f, offset );
 
-   static float speed_wobble = 0.0f, speed_wobble_2 = 0.0f;
-
    float curspeed  = v3_length( player->rb.v ),
          kickspeed = vg_clampf( curspeed*(1.0f/40.0f), 0.0f, 1.0f ),
          kicks     = (vg_randf()-0.5f)*2.0f*kickspeed,
          sign      = vg_signf( kicks );
 
    s->wobble[0] = vg_lerpf( s->wobble[0], kicks*kicks*sign, 6.0f*vg.time_delta);
-   s->wobble[1] = vg_lerpf( s->wobble[1], speed_wobble,     2.4f*vg.time_delta);
+   s->wobble[1] = vg_lerpf( s->wobble[1], s->wobble[0],     2.4f*vg.time_delta);
 
    offset[0] *= 0.26f;
-   offset[0] += speed_wobble_2*3.0f;
+   offset[0] += s->wobble[1]*3.0f;
 
    offset[1] *= -0.3f;
    offset[2] *= 0.01f;
@@ -1449,10 +1453,7 @@ VG_STATIC void player__skate_animate( player_instance *player,
       v3_muladds( player->rb.co, player->rb.to_world[1], 0.5f, rotation_point );
       v3_sub( dest->root_co, rotation_point, rco );
       
-      /* FIXME: q_mul v3 */
-      m3x3f TEMP;
-      q_m3x3( qflip, TEMP );
-      m3x3_mulv( TEMP, rco, rco );
+      q_mulv( qflip, rco, rco );
       v3_add( rco, rotation_point, dest->root_co );
    }
 }
@@ -1462,34 +1463,17 @@ VG_STATIC void skate_camera_firstperson( player_instance *player )
    struct player_skate *s = &player->_skate;
    struct player_avatar *av = player->playeravatar;
 
+#if 0
    /* FIXME: viewpoint entity */
-   v3f vp = {-0.1f,1.8f,0.0f};
+   v3f vp = {-0.0f,1.8f,0.0f};
    m4x3_mulv( av->sk.final_mtx[ av->id_head-1 ], vp, player->fpv_pos );
+   v3_muladds( player->fpv_pos, player->rb.to_world[0], 
+               -0.35f, player->fpv_pos );
    v3_zero( player->fpv_angles );
 
-   v3f flat_dir,
-       vel_dir,
-       look_dir;
-
-   v3_copy( player->rb.v, vel_dir );
-   //v3_normalize( vel_dir );
-
-   float tti = s->land_dist;
-   v3f   norm;
-   v3_copy( s->land_normal, norm );
-
-   if( s->state.activity == k_skate_activity_ground )
-   {
-      tti = 0.0f;
-      v3_copy( player->rb.to_world[1], norm );
-   }
-
-   v3_muladds( vel_dir, norm, -v3_dot(vel_dir,norm), flat_dir );
-   //v3_normalize( flat_dir );
-
-   v3_lerp( flat_dir, vel_dir, vg_clampf( tti / 2.0f, 0.4f, 1.0f ), look_dir );
-   v3_lerp( s->state.vl, look_dir, 4.0f*vg.time_delta, s->state.vl );
-   player_vector_angles( player->fpv_angles, s->state.vl, 1.0f, 0.25f );
+   v3_lerp( s->state.vl, player->rb.v, 4.0f*vg.time_delta, s->state.vl );
+   player_vector_angles( player->fpv_angles, s->state.vl, 0.7f, 0.25f );
+#endif
 }
 
 VG_STATIC void skate_camera_thirdperson( player_instance *player )
@@ -1500,7 +1484,10 @@ VG_STATIC void skate_camera_thirdperson( player_instance *player )
    v3f origin, dir, target;
    v3_copy( player->rb.co, origin );
    v3_add( origin, (v3f){0.0f,1.35f,0.0f}, origin );
+
+#if 0
    player_set_follower_subject( player, origin );
+#endif
 }
 
 VG_STATIC void player__skate_post_animate( player_instance *player )
@@ -1510,11 +1497,14 @@ VG_STATIC void player__skate_post_animate( player_instance *player )
 
    skate_camera_thirdperson( player );
    skate_camera_firstperson( player );
+
+#if 0
    player->cam_angles_override_strength = 0.0f;
    player->cam_position_override_strength = 0.0f;
+#endif
 
 
-
+   player->cam_velocity_influence = 1.0f;
 
    /* FIXME: Organize this. Its int wrong fucking place */
    v3f vp0 = {0.0f,0.1f, 0.6f},