option between water plane / water trigger

[carveJwlIkooP6JGAAIwe30JlM.git] / player_walk.c

diff --git a/player_walk.c b/player_walk.c
index 560d61a69a32fec28bf85268523f01e8825e1323..843a50e979e45ade99aedd860659264e8b639277 100644 (file)
--- a/player_walk.c
+++ b/player_walk.c
@@ -1,11 +1,33 @@
-#pragma once
-
 #include "vg/vg_rigidbody_collision.h"
-#include "scene_rigidbody.h"
 
+#include "skaterift.h"
+#include "player_walk.h"
+#include "player_skate.h"
+#include "player_dead.h"
 #include "player.h"
 #include "input.h"
 #include "audio.h"
+#include "scene_rigidbody.h"
+
+struct player_walk player_walk;
+struct player_subsystem_interface player_subsystem_walk = 
+{
+   .system_register = player__walk_register,
+   .bind = player__walk_bind,
+   .pre_update = player__walk_pre_update,
+   .update = player__walk_update,
+   .post_update = player__walk_post_update,
+   .im_gui = player__walk_im_gui,
+   .animate = player__walk_animate,
+   .post_animate = player__walk_post_animate,
+   .pose = player__walk_pose,
+   .network_animator_exchange = player__walk_animator_exchange,
+
+   .animator_data = &player_walk.animator,
+   .animator_size = sizeof(player_walk.animator),
+   .name = "Walk"
+};
+
 
 static void player_walk_drop_in_vector( v3f vec ){
    v3f axis, init_dir;
@@ -341,7 +363,7 @@ static void player_walk_pre_popoff(void){
    }
 }
 
-static void player__walk_pre_update(void){
+void player__walk_pre_update(void){
    struct player_walk *w = &player_walk;
 
    if( localplayer.immobile ) return;
@@ -370,7 +392,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 +408,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;
@@ -446,17 +468,7 @@ static void player_walk_update_generic(void){
    v3_zero( localplayer.rb.w );
 
    world_instance *world = world_current_instance();
-
-   if( world->water.enabled ){
-      if( localplayer.rb.co[1]+0.4f < world->water.height ){
-         player__networked_sfx( k_player_subsystem_walk, 32, 
-                                k_player_walk_soundeffect_splash,
-                                localplayer.rb.co, 1.0f );
-         vg_info( "player fell of due to walking into walker\n" );
-         player__dead_transition( k_player_die_type_generic );
-         return;
-      }
-   }
+   if( !world_water_player_safe( world, 0.4f ) ) return;
 
    enum walk_activity prev_state = w->state.activity;
 
@@ -505,7 +517,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 +612,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 +626,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 +634,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 );
@@ -683,7 +695,7 @@ static void player_walk_update_generic(void){
                             k_runspeed );
 }
 
-static void player__walk_post_update(void){
+void player__walk_post_update(void){
    struct player_walk *w = &player_walk;
 
    m4x3f mtx;
@@ -691,7 +703,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 */
@@ -737,22 +749,19 @@ static void player__walk_post_update(void){
       audio_lock();
       if( w->surface == k_surface_prop_concrete ){
          audio_oneshot_3d( 
-               &audio_footsteps[vg_randu32(&vg.rand) % 
-                                 vg_list_size(audio_footsteps)], 
+               &audio_footsteps[vg_randu32(&vg.rand) % 4],
                localplayer.rb.co, 40.0f, 1.0f 
          );
       }
       else if( w->surface == k_surface_prop_grass ){
          audio_oneshot_3d( 
-           &audio_footsteps_grass[ vg_randu32(&vg.rand) %
-                                    vg_list_size(audio_footsteps_grass)],
+           &audio_footsteps_grass[ vg_randu32(&vg.rand) % 6 ],
             localplayer.rb.co, 40.0f, 1.0f 
          );
       }
       else if( w->surface == k_surface_prop_wood ){
          audio_oneshot_3d( 
-           &audio_footsteps_wood[ vg_randu32(&vg.rand) %
-                                    vg_list_size(audio_footsteps_wood)],
+           &audio_footsteps_wood[ vg_randu32(&vg.rand) % 6 ],
             localplayer.rb.co, 40.0f, 1.0f 
          );
       }
@@ -762,7 +771,7 @@ static void player__walk_post_update(void){
    w->state.step_phase = walk_phase;
 }
 
-static void player__walk_update(void){
+void player__walk_update(void){
    struct player_walk *w = &player_walk;
 
    if( (w->state.activity == k_walk_activity_air) ||
@@ -842,7 +851,7 @@ static void player_walk_animate_generic(void){
    q_mul( localplayer.rb.q, qrev, animator->root_q );
 }
 
-static void player__walk_animate(void){
+void player__walk_animate(void){
    struct player_walk *w = &player_walk;
    player_pose *pose = &localplayer.pose;
    struct player_walk_animator *animator = &w->animator;
@@ -978,7 +987,7 @@ static void player_walk_pose_transition(
       skeleton_lerp_pose( sk, apose, bpose, blend, pose->keyframes );
 }
 
-static void player__walk_pose( void *_animator, player_pose *pose ){
+void player__walk_pose( void *_animator, player_pose *pose ){
    struct player_walk *w = &player_walk;
    struct player_walk_animator *animator = _animator;
    struct skeleton *sk = &localplayer.skeleton;
@@ -1073,7 +1082,7 @@ static void player__walk_pose( void *_animator, player_pose *pose ){
    }
 }
 
-static void player__walk_post_animate(void){
+void player__walk_post_animate(void){
    /* 
     * Camera 
     */
@@ -1081,7 +1090,7 @@ static void player__walk_post_animate(void){
 
 }
 
-static void player__walk_im_gui(void){
+void player__walk_im_gui(void){
    struct player_walk *w = &player_walk;
    player__debugtext( 1, "V:  %5.2f %5.2f %5.2f (%5.2fm/s)",
       localplayer.rb.v[0], localplayer.rb.v[1], localplayer.rb.v[2],
@@ -1112,7 +1121,7 @@ static void player__walk_im_gui(void){
                                              [w->surface] );
 }
 
-static void player__walk_bind(void){
+void player__walk_bind(void){
    struct player_walk *w = &player_walk;
    struct skeleton *sk = &localplayer.skeleton;
 
@@ -1127,7 +1136,7 @@ static void player__walk_bind(void){
    w->anim_popoff       = skeleton_get_anim( sk, "pop_off_short" );
 }
 
-static void player__walk_transition( bool grounded, f32 board_yaw ){
+void player__walk_transition( bool grounded, f32 board_yaw ){
    struct player_walk *w = &player_walk;
    w->state.activity = k_walk_activity_air;
 
@@ -1144,7 +1153,8 @@ static void player__walk_transition( bool grounded, f32 board_yaw ){
    rb_update_matrices( &localplayer.rb );
 }
 
-static void player__walk_reset(void){
+void player__walk_reset(void)
+{
    struct player_walk *w = &player_walk;
    w->state.activity = k_walk_activity_air;
    w->state.transition_t = 0.0f;
@@ -1157,7 +1167,7 @@ static void player__walk_reset(void){
    rb_update_matrices( &localplayer.rb );
 }
 
-static void player__walk_animator_exchange( bitpack_ctx *ctx, void *data ){
+void player__walk_animator_exchange( bitpack_ctx *ctx, void *data ){
    struct player_walk_animator *animator = data;
 
    bitpack_qv3f( ctx, 24, -1024.0f, 1024.0f, animator->root_co );
@@ -1182,7 +1192,7 @@ static void player__walk_animator_exchange( bitpack_ctx *ctx, void *data ){
    bitpack_qf32( ctx, 16, -100.0f, 100.0f, &animator->board_yaw );
 }
 
-static void player__walk_sfx_oneshot( u8 id, v3f pos, f32 volume ){
+void player__walk_sfx_oneshot( u8 id, v3f pos, f32 volume ){
    audio_lock();
 
    if( id == k_player_walk_soundeffect_splash ){