X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.c;h=75b65fc7df76ec46b12a46a4f553ee628b771904;hb=HEAD;hp=6d9aa924a1cbfc00dcb51bcb2828882c94675884;hpb=4c3dc94e7221f599491e7d111cac3d51d8d83b17;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_skate.c b/player_skate.c
index 6d9aa92..75b65fc 100644
--- a/player_skate.c
+++ b/player_skate.c
@@ -1,18 +1,47 @@
-#ifndef PLAYER_SKATE_C
-#define PLAYER_SKATE_C
-
+#include "player_skate.h"
 #include "player.h"
 #include "audio.h"
 #include "vg/vg_perlin.h"
+#include "vg/vg_lines.h"
 #include "menu.h"
 #include "ent_skateshop.h"
 #include "addon.h"
+#include "input.h"
+#include "ent_tornado.h"
+
+#include "vg/vg_rigidbody.h"
+#include "scene_rigidbody.h"
+#include "player_glide.h"
+#include "player_dead.h"
+#include "player_walk.h"
+#include <string.h>
+
+struct player_skate player_skate;
+struct player_subsystem_interface player_subsystem_skate = 
+{
+   .system_register = player__skate_register,
+   .bind = player__skate_bind,
+   .pre_update = player__skate_pre_update,
+   .update = player__skate_update,
+   .post_update = player__skate_post_update,
+   .im_gui = player__skate_im_gui,
+   .animate = player__skate_animate,
+   .pose = player__skate_pose,
+   .effects = player__skate_effects,
+   .post_animate = player__skate_post_animate,
+   .network_animator_exchange = player__skate_animator_exchange,
+   .sfx_oneshot = player__skate_sfx_oneshot,
+   .sfx_comp = player__skate_comp_audio,
+   .sfx_kill = player__skate_kill_audio,
+
+   .animator_data = &player_skate.animator,
+   .animator_size = sizeof(player_skate.animator),
+   .name = "Skate"
+};
 
-#include "ent_tornado.c"
-
-static void player__skate_bind(void){
+void player__skate_bind(void){
    struct skeleton *sk = &localplayer.skeleton;
-   rb_update_transform( &localplayer.rb );
+   rb_update_matrices( &localplayer.rb );
 
    struct { struct skeleton_anim **anim; const char *name; }
    bindings[] = {
@@ -34,7 +63,7 @@ static void player__skate_bind(void){
       *bindings[i].anim = skeleton_get_anim( sk, bindings[i].name );
 }
 
-static void player__skate_kill_audio(void){
+void player__skate_kill_audio(void){
    audio_lock();
    if( player_skate.aud_main ){
       player_skate.aud_main = 
@@ -61,11 +90,11 @@ static void player__skate_kill_audio(void){
  * Does collision detection on a sphere vs world, and applies some smoothing
  * filters to the manifold afterwards
  */
-static int skate_collide_smooth( m4x3f mtx, rb_sphere *sphere, rb_ct *man ){
+static int skate_collide_smooth( m4x3f mtx, f32 r, rb_ct *man ){
    world_instance *world = world_current_instance();
 
    int len = 0;
-   len = rb_sphere__scene( mtx, sphere, NULL, &world->rb_geo.inf.scene, man,
+   len = rb_sphere__scene( mtx, r, NULL, world->geo_bh, man,
                            k_material_flag_walking );
 
    for( int i=0; i<len; i++ ){
@@ -338,10 +367,11 @@ static int create_jumps_to_hit_target( jump_info *jumps,
    return valid_count;
 }
 
-static void player__approximate_best_trajectory(void){
+void player__approximate_best_trajectory(void)
+{
    world_instance *world0 = world_current_instance();
 
-   float k_trace_delta = k_rb_delta * 10.0f;
+   float k_trace_delta = vg.time_fixed_delta * 10.0f;
    struct player_skate_state *state = &player_skate.state;
 
    state->air_start = vg.time;
@@ -711,10 +741,10 @@ static void skate_apply_trick_model(void){
    v3_add( Fd, Fs, F );
    v3_mul( strength, F, F );
 
-   v3_muladds( state->trick_residualv, F, k_rb_delta, 
+   v3_muladds( state->trick_residualv, F, vg.time_fixed_delta, 
                state->trick_residualv );
    v3_muladds( state->trick_residuald, state->trick_residualv,
-               k_rb_delta, state->trick_residuald );
+               vg.time_fixed_delta, state->trick_residuald );
 
    if( state->activity <= k_skate_activity_air_to_grind ){
       if( v3_length2( state->trick_vel ) < 0.0001f )
@@ -739,10 +769,10 @@ static void skate_apply_trick_model(void){
 
 
       /* integrate trick velocities */
-      v3_muladds( state->trick_euler, state->trick_vel, k_rb_delta,
+      v3_muladds( state->trick_euler, state->trick_vel, vg.time_fixed_delta,
                   state->trick_euler );
 
-      if( !carry_on && (state->trick_time + k_rb_delta/interval >= next_end) ){
+      if( !carry_on && (state->trick_time + vg.time_fixed_delta/interval >= next_end) ){
          state->trick_time = 0.0f;
          state->trick_euler[0] = roundf( state->trick_euler[0] );
          state->trick_euler[1] = roundf( state->trick_euler[1] );
@@ -756,12 +786,13 @@ static void skate_apply_trick_model(void){
          audio_unlock();
       }
       else 
-         state->trick_time += k_rb_delta / interval;
+         state->trick_time += vg.time_fixed_delta / interval;
    }
    else{
       if( (v3_length2(state->trick_vel) >= 0.0001f ) &&
           state->trick_time > 0.2f)
       {
+         vg_info( "player fell off due to lack of skill\n" );
          player__dead_transition( k_player_die_type_feet );
       }
 
@@ -787,7 +818,7 @@ static void skate_apply_grab_model(void){
    else
       v2_zero( state->grab_mouse_delta );
 
-   state->grabbing = vg_lerpf( state->grabbing, grabt, 8.4f*k_rb_delta );
+   state->grabbing = vg_lerpf( state->grabbing, grabt, 8.4f*vg.time_fixed_delta );
 }
 
 static void skate_apply_steering_model(void){
@@ -826,7 +857,7 @@ static void skate_apply_steering_model(void){
       else if( state->activity >= k_skate_activity_grind_any ){
          rate *= fabsf(steer);
 
-         float a = 0.8f * -steer * k_rb_delta;
+         float a = 0.8f * -steer * vg.time_fixed_delta;
 
          v4f q;
          q_axis_angle( q, localplayer.rb.to_world[1], a );
@@ -865,13 +896,13 @@ static void skate_apply_steering_model(void){
       }
    }
 
-   vg_slewf( &state->skid, skid_target, k_rb_delta*(1.0f/0.1f) );
+   vg_slewf( &state->skid, skid_target, vg.time_fixed_delta*(1.0f/0.1f) );
    steer = vg_lerpf( steer, state->skid*k_steer_ground*0.5f, 
                      fabsf(state->skid*0.8f) );
 
    float current  = v3_dot( localplayer.rb.to_world[1], localplayer.rb.w ),
          addspeed = (steer * -top) - current,
-         maxaccel = rate * k_rb_delta,
+         maxaccel = rate * vg.time_fixed_delta,
          accel    = vg_clampf( addspeed, -maxaccel, maxaccel );
 
    v3_muladds( localplayer.rb.w, localplayer.rb.to_world[1], 
@@ -918,8 +949,8 @@ static void skate_apply_friction_model(void){
    else if( player_skate.surface == k_surface_prop_sand )
       lat *= 0.6f;
 
-   vel[0] += vg_cfrictf( vel[0], lat * k_rb_delta );
-   vel[2] += vg_cfrictf( vel[2], k_friction_resistance * k_rb_delta );
+   vel[0] += vg_cfrictf( vel[0], lat * vg.time_fixed_delta );
+   vel[2] += vg_cfrictf( vel[2], k_friction_resistance * vg.time_fixed_delta );
 
    /* Pushing additive force */
 
@@ -959,13 +990,13 @@ static void skate_apply_jump_model(void){
    }
 
    if( state->charging_jump ){
-      state->jump_charge += k_rb_delta * k_jump_charge_speed;
+      state->jump_charge += vg.time_fixed_delta * k_jump_charge_speed;
 
       if( !charging_jump_prev )
          state->jump_dir = state->reverse>0.0f? 1: 0;
    }
    else{
-      state->jump_charge -= k_jump_charge_speed * k_rb_delta;
+      state->jump_charge -= k_jump_charge_speed * vg.time_fixed_delta;
    }
 
    state->jump_charge = vg_clampf( state->jump_charge, 0.0f, 1.0f );
@@ -1064,10 +1095,11 @@ static void skate_apply_pump_model(void){
    }
    else{
       /* Collect */
-      float doty = v3_dot( localplayer.rb.to_world[1], state->throw_v );
+      f32 doty = v3_dot( localplayer.rb.to_world[1], state->throw_v );
       
       v3f Fl, Fv;
       v3_muladds( state->throw_v, localplayer.rb.to_world[1], -doty, Fl);
+      player_skate.collect_feedback = v3_length(Fl) * 4.0f;
 
       if( state->activity == k_skate_activity_ground ){
          if( v3_length2(localplayer.rb.v)<(20.0f*20.0f) ){
@@ -1078,7 +1110,7 @@ static void skate_apply_pump_model(void){
       }
 
       v3_muls( localplayer.rb.to_world[1], -doty, Fv );
-      v3_muladds( localplayer.rb.v,     Fv, k_mmcollect_vert, localplayer.rb.v );
+      v3_muladds( localplayer.rb.v, Fv, k_mmcollect_vert, localplayer.rb.v );
       v3_muladds( state->throw_v, Fv, k_mmcollect_vert, state->throw_v );
    }
 
@@ -1089,7 +1121,7 @@ static void skate_apply_pump_model(void){
       v3_normalize( dir );
 
       float max = v3_dot( dir, state->throw_v ),
-            amt = vg_minf( k_mmdecay * k_rb_delta, max );
+            amt = vg_minf( k_mmdecay * vg.time_fixed_delta, max );
       v3_muladds( state->throw_v, dir, -amt, state->throw_v );
    }
 }
@@ -1110,29 +1142,29 @@ static void skate_apply_cog_model(void){
    v3_sub( localplayer.rb.v, state->cog_v, rv );
 
    v3f F;
-   v3_muls( ideal_diff, -k_cog_spring * k_rb_rate, F );
-   v3_muladds( F, rv,   -k_cog_damp * k_rb_rate, F );
+   v3_muls( ideal_diff, -k_cog_spring * 60.0f, F );
+   v3_muladds( F, rv,   -k_cog_damp * 60.0f, F );
 
    float ra = k_cog_mass_ratio,
          rb = 1.0f-k_cog_mass_ratio;
 
    /* Apply forces & intergrate */
    v3_muladds( state->cog_v, F, -rb, state->cog_v );
-   state->cog_v[1] += -9.8f * k_rb_delta;
-   v3_muladds( state->cog, state->cog_v, k_rb_delta, state->cog );
+   state->cog_v[1] += -9.8f * vg.time_fixed_delta;
+   v3_muladds( state->cog, state->cog_v, vg.time_fixed_delta, state->cog );
 }
 
 static void skate_integrate(void){
    struct player_skate_state *state = &player_skate.state;
 
-   float rate_x = 1.0f - (k_rb_delta * 3.0f),
+   float rate_x = 1.0f - (vg.time_fixed_delta * 3.0f),
          rate_z = rate_x,
          rate_y = 1.0f;
 
    if( state->activity >= k_skate_activity_grind_any ){
-      rate_x = 1.0f-(16.0f*k_rb_delta);
-      rate_y = 1.0f-(10.0f*k_rb_delta);
-      rate_z = 1.0f-(40.0f*k_rb_delta);
+      rate_x = 1.0f-(16.0f*vg.time_fixed_delta);
+      rate_y = 1.0f-(10.0f*vg.time_fixed_delta);
+      rate_z = 1.0f-(40.0f*vg.time_fixed_delta);
    }
 
    float wx = v3_dot( localplayer.rb.w, localplayer.rb.to_world[0] ) * rate_x,
@@ -1145,8 +1177,8 @@ static void skate_integrate(void){
    v3_muladds( localplayer.rb.w, localplayer.rb.to_world[2], wz, 
                localplayer.rb.w );
 
-   state->flip_time += state->flip_rate * k_rb_delta;
-   rb_update_transform( &localplayer.rb );
+   state->flip_time += state->flip_rate * vg.time_fixed_delta;
+   rb_update_matrices( &localplayer.rb );
 }
 
 static enum trick_type player_skate_trick_input(void){
@@ -1156,7 +1188,7 @@ static enum trick_type player_skate_trick_input(void){
           (button_press( k_srbind_trick2 )     );
 }
 
-static void player__skate_pre_update(void){
+void player__skate_pre_update(void){
    struct player_skate_state *state = &player_skate.state;
 
    if( state->activity == k_skate_activity_handplant ){
@@ -1209,7 +1241,7 @@ static void player__skate_pre_update(void){
       m3x3_q( transfer, qtransfer );
       q_mul( qtransfer, state->store_smoothed, state->smoothed_rotation );
       q_normalize( state->smoothed_rotation );
-      rb_update_transform( &localplayer.rb );
+      rb_update_matrices( &localplayer.rb );
 
       if( end ){
          state->activity = k_skate_activity_air;
@@ -1220,9 +1252,9 @@ static void player__skate_pre_update(void){
    if( button_down(k_srbind_use) && (v3_length2(state->trick_vel) < 0.01f) ){
       localplayer.subsystem = k_player_subsystem_walk;
 
-      if( state->activity <= k_skate_activity_air_to_grind ){
-         localplayer.subsystem = k_player_subsystem_glide;
-         player__begin_holdout( (v3f){0,0,0} );
+      if( (state->activity <= k_skate_activity_air_to_grind) &&
+           localplayer.have_glider ){
+         player_glide_transition();
          return;
       }
 
@@ -1281,7 +1313,7 @@ static void player__skate_pre_update(void){
       state->trick_type = k_trick_type_none;
 }
 
-static void player__skate_comp_audio( void *_animator ){
+void player__skate_comp_audio( void *_animator ){
    struct player_skate_animator *animator = _animator;
    audio_lock();
 
@@ -1297,7 +1329,7 @@ static void player__skate_comp_audio( void *_animator ){
    f32 gate = skaterift.time_rate;
 
    if( skaterift.activity == k_skaterift_replay ){
-      gate = vg_minf( 1.0f, fabsf(skaterift.track_velocity) );
+      gate = vg_minf( 1.0f, fabsf(player_replay.track_velocity) );
    }
 
    f32
@@ -1425,7 +1457,7 @@ static void player__skate_comp_audio( void *_animator ){
    audio_unlock();
 }
 
-static void player__skate_post_update(void){
+void player__skate_post_update(void){
    struct player_skate_state *state = &player_skate.state;
 
    for( int i=0; i<player_skate.possible_jump_count; i++ ){
@@ -1694,7 +1726,7 @@ static void skate_grind_friction( struct grind_info *inf, float strength ){
          dir      = vg_signf( v3_dot( localplayer.rb.v, inf->dir ) ),
          F        = a * -dir * k_grind_max_friction;
 
-   v3_muladds( localplayer.rb.v, inf->dir, F*k_rb_delta*strength, 
+   v3_muladds( localplayer.rb.v, inf->dir, F*vg.time_fixed_delta*strength, 
                localplayer.rb.v );
 }
 
@@ -1706,7 +1738,7 @@ static void skate_grind_decay( struct grind_info *inf, float strength ){
    v3f v_grind;
    m3x3_mulv( mtx_inv, localplayer.rb.v, v_grind );
 
-   float decay = 1.0f - ( k_rb_delta * k_grind_decayxy * strength );
+   float decay = 1.0f - ( vg.time_fixed_delta * k_grind_decayxy * strength );
    v3_mul( v_grind, (v3f){ 1.0f, decay, decay }, v_grind );
    m3x3_mulv( mtx, v_grind, localplayer.rb.v );
 }
@@ -1726,7 +1758,7 @@ static void skate_grind_truck_apply( float sign, struct grind_info *inf,
    v3_sub( inf->co, wsp, delta );
 
    /* spring force */
-   v3_muladds( localplayer.rb.v, delta, k_spring_force*strength*k_rb_delta, 
+   v3_muladds( localplayer.rb.v, delta, k_spring_force*strength*vg.time_fixed_delta, 
                localplayer.rb.v );
 
    skate_grind_decay( inf, strength );
@@ -1766,12 +1798,12 @@ static void skate_grind_truck_apply( float sign, struct grind_info *inf,
    rb_effect_spring_target_vector( &localplayer.rb, up, target_up,
                                     k_grind_spring, 
                                     k_grind_dampener,
-                                    k_rb_delta );
+                                    vg.time_fixed_delta );
 
    rb_effect_spring_target_vector( &localplayer.rb, fwd, target_fwd,
                                     k_grind_spring*strength, 
                                     k_grind_dampener*strength,
-                                    k_rb_delta );
+                                    vg.time_fixed_delta );
 
    vg_line_arrow( localplayer.rb.co, target_up, 1.0f, VG__GREEN );
    vg_line_arrow( localplayer.rb.co, fwd, 0.8f, VG__RED );
@@ -1829,7 +1861,7 @@ static void skate_5050_apply( struct grind_info *inf_front,
    rb_effect_spring_target_vector( &localplayer.rb, up, target_up,
                                     k_grind_spring, 
                                     k_grind_dampener,
-                                    k_rb_delta );
+                                    vg.time_fixed_delta );
    vg_line_arrow( localplayer.rb.co, up, 1.0f, VG__GREEN );
    vg_line_arrow( localplayer.rb.co, target_up, 1.0f, VG__GREEN );
 
@@ -1847,7 +1879,7 @@ static void skate_5050_apply( struct grind_info *inf_front,
    rb_effect_spring_target_vector( &localplayer.rb, fwd_nplane, dir_nplane,
                                     1000.0f,
                                     k_grind_dampener,
-                                    k_rb_delta );
+                                    vg.time_fixed_delta );
    vg_line_arrow( localplayer.rb.co, fwd_nplane, 0.8f, VG__RED );
    vg_line_arrow( localplayer.rb.co, dir_nplane, 0.8f, VG__RED );
 
@@ -1862,7 +1894,7 @@ static void skate_5050_apply( struct grind_info *inf_front,
    v3_sub( inf_back->co,  pos_back, delta_back );
    v3_add( delta_front, delta_back, delta_total );
 
-   v3_muladds( localplayer.rb.v, delta_total, 50.0f * k_rb_delta, 
+   v3_muladds( localplayer.rb.v, delta_total, 50.0f * vg.time_fixed_delta, 
                localplayer.rb.v );
 
    /* Fake contact */
@@ -1991,12 +2023,12 @@ static void skate_boardslide_apply( struct grind_info *inf ){
    rb_effect_spring_target_vector( &localplayer.rb, localplayer.rb.to_world[0],
                                     dir, 
                                     k_grind_spring, k_grind_dampener,
-                                    k_rb_delta );
+                                    vg.time_fixed_delta );
 
    rb_effect_spring_target_vector( &localplayer.rb, localplayer.rb.to_world[2],
                                     perp,
                                     k_grind_spring, k_grind_dampener,
-                                    k_rb_delta );
+                                    vg.time_fixed_delta );
 
    vg_line_arrow( localplayer.rb.co, dir, 0.5f, VG__GREEN );
    vg_line_arrow( localplayer.rb.co, perp, 0.5f, VG__BLUE );
@@ -2195,23 +2227,14 @@ static enum skate_activity skate_availible_grind(void){
    return new_activity;
 }
 
-static void player__skate_update(void){
+void player__skate_update(void){
    struct player_skate_state *state = &player_skate.state;
    world_instance *world = world_current_instance();
 
-   if( state->activity == k_skate_activity_handplant ){
+   if( state->activity == k_skate_activity_handplant )
       return;
-   }
 
-   if( world->water.enabled ){
-      if( localplayer.rb.co[1]+0.25f < world->water.height ){
-         player__networked_sfx( k_player_subsystem_walk, 32, 
-                                k_player_walk_soundeffect_splash,
-                                localplayer.rb.co, 1.0f );
-         player__dead_transition( k_player_die_type_generic );
-         return;
-      }
-   }
+   if( !world_water_player_safe( world, 0.25f ) ) return;
 
    v3_copy( localplayer.rb.co, state->prev_pos );
    state->activity_prev = state->activity;
@@ -2263,7 +2286,7 @@ static void player__skate_update(void){
       float vy = vg_maxf( 0.0f, localplayer.rb.v[1] );
       slap = vg_clampf( (min_dist/0.5f) + vy, 0.0f, 1.0f )*0.3f;
    }
-   state->slap = vg_lerpf( state->slap, slap, 10.0f*k_rb_delta );
+   state->slap = vg_lerpf( state->slap, slap, 10.0f*vg.time_fixed_delta );
 
    wheels[0].pos[1] = state->slap;
    wheels[1].pos[1] = state->slap;
@@ -2271,7 +2294,7 @@ static void player__skate_update(void){
 
    const int k_wheel_count = 2;
 
-   player_skate.substep = k_rb_delta;
+   player_skate.substep = vg.time_fixed_delta;
    player_skate.substep_delta = player_skate.substep;
    player_skate.limit_count = 0;
 
@@ -2376,7 +2399,7 @@ grinding:;
    ent_tornado_debug();
    v3f a;
    ent_tornado_forces( localplayer.rb.co, localplayer.rb.v, a );
-   v3_muladds( localplayer.rb.v, a, k_rb_delta, localplayer.rb.v );
+   v3_muladds( localplayer.rb.v, a, vg.time_fixed_delta, localplayer.rb.v );
 
 begin_collision:;
 
@@ -2441,7 +2464,7 @@ begin_collision:;
 
    /* clamp to a fraction of delta, to prevent locking */
    float rate_lock = substep_count;
-   rate_lock *= k_rb_delta * 0.1f;
+   rate_lock *= vg.time_fixed_delta * 0.1f;
    rate_lock *= rate_lock;
 
    max_time = vg_maxf( max_time, rate_lock );
@@ -2466,7 +2489,7 @@ begin_collision:;
       v3_add( localplayer.rb.co, cg_offset, localplayer.rb.co );
    }
 
-   rb_update_transform( &localplayer.rb );
+   rb_update_matrices( &localplayer.rb );
    localplayer.rb.v[1] += -state->gravity_bias * player_skate.substep_delta;
 
    player_skate.substep -= player_skate.substep_delta;
@@ -2486,8 +2509,9 @@ begin_collision:;
                           k_material_flag_walking ) != -1) )
    {
       v3_lerp( start_co, localplayer.rb.co, t, localplayer.rb.co );
-      rb_update_transform( &localplayer.rb );
+      rb_update_matrices( &localplayer.rb );
 
+      vg_info( "player fell of due to hitting head\n" );
       player__dead_transition( k_player_die_type_head );
       return;
    }
@@ -2504,12 +2528,10 @@ begin_collision:;
       m4x3f mtx;
       m3x3_identity( mtx );
       m4x3_mulv( localplayer.rb.to_world, wheels[i].pos, mtx[3] );
-      
-      rb_sphere collider = { .radius = wheels[i].radius };
 
       rb_ct *man = &manifold[ manifold_len ];
 
-      int l = skate_collide_smooth( mtx, &collider, man );
+      int l = skate_collide_smooth( mtx, wheels[i].radius, man );
       if( l )
          wheels[i].state = k_collider_state_colliding;
 
@@ -2517,8 +2539,8 @@ begin_collision:;
    }
 
    float grind_radius = k_board_radius * 0.75f;
-   rb_capsule capsule = { .height = (k_board_length+0.2f)*2.0f, 
-                          .radius=grind_radius };
+   rb_capsule capsule = { .h = (k_board_length+0.2f)*2.0f, 
+                          .r = grind_radius };
    m4x3f mtx;
    v3_muls( localplayer.rb.to_world[0],  1.0f, mtx[0] );
    v3_muls( localplayer.rb.to_world[2], -1.0f, mtx[1] );
@@ -2528,7 +2550,7 @@ begin_collision:;
 
    rb_ct *cman = &manifold[manifold_len];
 
-   int l = rb_capsule__scene( mtx, &capsule, NULL, &world->rb_geo.inf.scene,
+   int l = rb_capsule__scene( mtx, &capsule, NULL, world->geo_bh,
                               cman, k_material_flag_walking );
 
    /* weld joints */
@@ -2538,9 +2560,7 @@ begin_collision:;
    l = rb_manifold_apply_filtered( cman, l );
 
    manifold_len += l;
-
-   if( vg_lines.draw )
-      vg_line_capsule( mtx, capsule.radius, capsule.height, VG__WHITE );
+   vg_line_capsule( mtx, capsule.r, capsule.h, VG__WHITE );
 
    /* add limits */
    if( state->activity >= k_skate_activity_grind_any ){
@@ -2601,7 +2621,7 @@ begin_collision:;
           * regular dance; calculate velocity & total mass, apply impulse.
           */
 
-         struct contact *ct = &manifold[i];
+         rb_ct *ct = &manifold[i];
          
          v3f rv, delta;
          v3_sub( ct->co, world_cog, delta ); 
@@ -2640,7 +2660,7 @@ begin_collision:;
    v3f dt;
    rb_depenetrate( manifold, manifold_len, dt );
    v3_add( dt, localplayer.rb.co, localplayer.rb.co );
-   rb_update_transform( &localplayer.rb );
+   rb_update_matrices( &localplayer.rb );
 
    substep_count ++;
 
@@ -2655,6 +2675,7 @@ begin_collision:;
    f32 nforce = v3_length(normal_total);
    if( nforce > 4.0f ){
       if( nforce > 17.6f ){
+         vg_info( "player fell off due to hitting ground too hard\n" );
          v3_muladds( localplayer.rb.v, normal_total, -1.0f, localplayer.rb.v );
          player__dead_transition( k_player_die_type_feet );
          return;
@@ -2710,7 +2731,9 @@ begin_collision:;
       q_mul( transport_rotation, localplayer.rb.q, localplayer.rb.q );
       q_mul( transport_rotation, state->smoothed_rotation,
                                  state->smoothed_rotation );
-      rb_update_transform( &localplayer.rb );
+      q_normalize( localplayer.rb.q );
+      q_normalize( state->smoothed_rotation );
+      rb_update_matrices( &localplayer.rb );
       player__pass_gate( id );
    }
 
@@ -2773,7 +2796,7 @@ begin_collision:;
    }
 }
 
-static void player__skate_im_gui(void){
+void player__skate_im_gui(void){
    struct player_skate_state *state = &player_skate.state;
    player__debugtext( 1, "V:  %5.2f %5.2f %5.2f",localplayer.rb.v[0],
                                                 localplayer.rb.v[1],
@@ -2818,7 +2841,7 @@ static void player__skate_im_gui(void){
                            state->trick_euler[2] );
 }
 
-static void player__skate_animate(void){
+void player__skate_animate(void){
    struct player_skate_state *state = &player_skate.state;
    struct player_skate_animator *animator = &player_skate.animator;
 
@@ -3032,7 +3055,7 @@ static void player__skate_animate(void){
    if( (state->activity <= k_skate_activity_air_to_grind) &&
        (fabsf(state->flip_rate) > 0.01f) ){
       float substep = vg.time_fixed_extrapolate;
-      float t     = state->flip_time+state->flip_rate*substep*k_rb_delta;
+      float t  = state->flip_time+state->flip_rate*substep*vg.time_fixed_delta;
             sign  = vg_signf( t );
 
       t  = 1.0f - vg_minf( 1.0f, fabsf( t * 1.1f ) );
@@ -3107,7 +3130,7 @@ static void player__skate_animate(void){
    animator->handplant_t = state->handplant_t;
 }
                         
-static void player__skate_pose( void *_animator, player_pose *pose ){
+void player__skate_pose( void *_animator, player_pose *pose ){
    struct skeleton *sk = &localplayer.skeleton;
    struct player_skate_animator *animator = _animator;
 
@@ -3359,7 +3382,7 @@ static void player__skate_pose( void *_animator, player_pose *pose ){
          *kf_hand_r  = &pose->keyframes[localplayer.id_ik_hand_r-1],
          *kf_hip     = &pose->keyframes[localplayer.id_hip-1];
 
-      float warble = perlin1d( vg.time, 2.0f, 2, 300 );
+      float warble = vg_perlin_fract_1d( vg.time, 2.0f, 2, 300 );
             warble *= vg_maxf(animator->grind, fabsf(animator->weight)) * 0.3f;
 
       v4f qrot;
@@ -3430,7 +3453,7 @@ static void player__skate_pose( void *_animator, player_pose *pose ){
 #endif
 }
 
-static void player__skate_effects( void *_animator, m4x3f *final_mtx,
+void player__skate_effects( void *_animator, m4x3f *final_mtx,
                                    struct player_board *board,
                                    struct player_effects_data *effect_data ){
    struct skeleton *sk = &localplayer.skeleton;
@@ -3497,9 +3520,10 @@ static void player__skate_effects( void *_animator, m4x3f *final_mtx,
    }
 }
 
-static void player__skate_post_animate(void){
+void player__skate_post_animate(void){
    struct player_skate_state *state = &player_skate.state;
    localplayer.cam_velocity_influence = 1.0f;
+   localplayer.cam_dist = 1.8f;
 
    v3f head = { 0.0f, 1.8f, 0.0f };
    m4x3_mulv( localplayer.final_mtx[ localplayer.id_head ], 
@@ -3508,7 +3532,7 @@ static void player__skate_post_animate(void){
               state->head_position, state->head_position );
 }
 
-static void player__skate_reset_animator(void){
+void player__skate_reset_animator(void){
    struct player_skate_state *state = &player_skate.state;
 
    memset( &player_skate.animator, 0, sizeof(player_skate.animator) );
@@ -3519,7 +3543,8 @@ static void player__skate_reset_animator(void){
       player_skate.animator.fly = 0.0f;
 }
 
-static void player__skate_clear_mechanics(void){
+void player__skate_clear_mechanics(void)
+{
    struct player_skate_state *state = &player_skate.state;
    state->jump_charge    = 0.0f;
    state->charging_jump  = 0;
@@ -3554,11 +3579,14 @@ static void player__skate_clear_mechanics(void){
    v3_copy( localplayer.rb.to_world[1], player_skate.surface_picture );
    v3_copy( localplayer.rb.co, state->prev_pos );
    v3_zero( player_skate.weight_distribution );
+
+   v3f head = { 0.0f, 1.8f, 0.0f };
+   m4x3_mulv( localplayer.rb.to_world, head, state->head_position );
 }
 
 #include "network_compression.h"
 
-static void player__skate_animator_exchange( bitpack_ctx *ctx, void *data ){
+void player__skate_animator_exchange( bitpack_ctx *ctx, void *data ){
    struct player_skate_animator *animator = data;
    
    bitpack_qv3f( ctx, 24, -1024.0f, 1024.0f, animator->root_co );
@@ -3610,7 +3638,7 @@ static void player__skate_animator_exchange( bitpack_ctx *ctx, void *data ){
    bitpack_bytes( ctx, 1, &animator->activity );
 }
 
-static void player__skate_sfx_oneshot( u8 id, v3f pos, f32 volume ){
+void player__skate_sfx_oneshot( u8 id, v3f pos, f32 volume ){
    audio_lock();
 
    if( id == k_player_skate_soundeffect_jump ){
@@ -3638,5 +3666,3 @@ static void player__skate_sfx_oneshot( u8 id, v3f pos, f32 volume ){
 
    audio_unlock();
 }
-
-#endif /* PLAYER_SKATE_C */