X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_walk.c;fp=player_walk.c;h=d673584db88b691c0917bd64e576ad09f2a5ff4d;hb=a109f126d8adab622e38fbcc2d4281e75255246a;hp=560d61a69a32fec28bf85268523f01e8825e1323;hpb=f965094faed4f1828c7a6a6b3ca856bd5f1e5248;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_walk.c b/player_walk.c
index 560d61a..d673584 100644
--- a/player_walk.c
+++ b/player_walk.c
@@ -370,7 +370,7 @@ static void player_accelerate( v3f v, v3f movedir, f32 speed, f32 accel ){
    if( addspeed <= 0 )
       return;
 
-   float accelspeed = accel * k_rb_delta * speed;
+   float accelspeed = accel * vg.time_fixed_delta * speed;
 
    if( accelspeed > addspeed )
       accelspeed = addspeed;
@@ -386,7 +386,7 @@ static void player_friction( v3f v, f32 friction ){
    if( speed < 0.04f )
       return;
 
-   drop += control * friction * k_rb_delta;
+   drop += control * friction * vg.time_fixed_delta;
 
    float newspeed = vg_maxf( 0.0f, speed - drop );
    newspeed /= speed;
@@ -505,7 +505,7 @@ static void player_walk_update_generic(void){
             w->surface = surf->info.surface_prop;
       }
 
-      rb_prepare_contact( ct, k_rb_delta );
+      rb_prepare_contact( ct, vg.time_fixed_delta );
    }
 
    /* 
@@ -600,7 +600,7 @@ static void player_walk_update_generic(void){
 
             float d = -v3_dot(n,localplayer.rb.v);
             v3_muladds( localplayer.rb.v, n, d, localplayer.rb.v );
-            localplayer.rb.v[1] += -k_gravity * k_rb_delta;
+            localplayer.rb.v[1] += -k_gravity * vg.time_fixed_delta;
          }
       }
    }
@@ -614,7 +614,7 @@ static void player_walk_update_generic(void){
 
    /* integrate */
    if( w->state.activity == k_walk_activity_air ){
-      localplayer.rb.v[1] += -k_gravity*k_rb_delta;
+      localplayer.rb.v[1] += -k_gravity*vg.time_fixed_delta;
    }
 
    if( localplayer.immobile ){
@@ -622,7 +622,7 @@ static void player_walk_update_generic(void){
       localplayer.rb.v[2] = 0.0f;
    }
 
-   v3_muladds( localplayer.rb.co, localplayer.rb.v, k_rb_delta, 
+   v3_muladds( localplayer.rb.co, localplayer.rb.v, vg.time_fixed_delta, 
                localplayer.rb.co );
    v3_add( localplayer.rb.co, (v3f){0,1,0}, mtx[3] );
    vg_line_capsule( mtx, w->collider.r, w->collider.h, VG__GREEN );
@@ -691,7 +691,7 @@ static void player__walk_post_update(void){
    v3_add( localplayer.rb.co, (v3f){0,1,0}, mtx[3] );
 
    float substep = vg.time_fixed_extrapolate;
-   v3_muladds( mtx[3], localplayer.rb.v, k_rb_delta*substep, mtx[3] );
+   v3_muladds( mtx[3], localplayer.rb.v, vg.time_fixed_delta*substep, mtx[3] );
    vg_line_capsule( mtx, w->collider.r, w->collider.h, VG__YELOW );
 
    /* Calculate header */