X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.c;h=a60c8c2613aae02452ee8aae98bd0be3724847ab;hb=5fa590f62aa7e62a8b6b07e10556c2ecc54cdca6;hp=1d690a088bab23a0e39225d9561d8ed167f597ae;hpb=217627b6b4eef904ac89b5f7f7f819b3a0970b20;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player.c b/player.c
index 1d690a0..a60c8c2 100644
--- a/player.c
+++ b/player.c
@@ -1,7 +1,5 @@
-#ifndef PLAYER_C
-#define PLAYER_C
-
 #include "player.h"
+#include "addon.h"
 #include "camera.h"
 #include "player_model.h"
 #include "input.h"
@@ -18,7 +16,40 @@
 #include "shaders/model_character_view.h"
 #include "shaders/model_board_view.h"
 
-static int localplayer_cmd_respawn( int argc, const char *argv[] ){
+#include "player_walk.h"
+#include "player_dead.h"
+#include "player_drive.h"
+#include "player_skate.h"
+#include "player_basic_info.h"
+#include "player_glide.h"
+#include <string.h>
+
+i32 k_invert_y = 0;
+struct localplayer localplayer = 
+{
+   .rb = 
+   {
+      .co = { 0,0,0 },
+      .w = { 0,0,0 },
+      .v = { 0,0,0 },
+      .q = { 0,0,0,1 },
+      .to_world = M4X3_IDENTITY,
+      .to_local = M4X3_IDENTITY
+   }
+};
+
+struct player_subsystem_interface *player_subsystems[] = 
+{
+   [k_player_subsystem_walk]  = &player_subsystem_walk,
+   [k_player_subsystem_dead]  = &player_subsystem_dead,
+   [k_player_subsystem_drive] = &player_subsystem_drive,
+   [k_player_subsystem_skate] = &player_subsystem_skate,
+   [k_player_subsystem_basic_info]=&player_subsystem_basic_info,
+   [k_player_subsystem_glide] = &player_subsystem_glide,
+};
+
+int localplayer_cmd_respawn( int argc, const char *argv[] )
+{
    ent_spawn *rp = NULL, *r;
    world_instance *world = world_current_instance();
 
@@ -36,8 +67,10 @@ static int localplayer_cmd_respawn( int argc, const char *argv[] ){
    return 1;
 }
 
-static void player_init(void){
-   for( u32 i=0; i<vg_list_size(player_subsystems); i++ ){
+void player_init(void)
+{
+   for( u32 i=0; i<k_player_subsystem_max; i++ )
+   {
       struct player_subsystem_interface *sys = player_subsystems[i];
       if( sys->system_register ) sys->system_register();
    }
@@ -50,17 +83,16 @@ static void player_init(void){
    VG_VAR_F32( k_cam_shake_trackspeed );
    VG_VAR_I32( k_player_debug_info, flags=VG_VAR_PERSISTENT );
 
+#if 0
    vg_console_reg_var( "cinema", &k_cinema, k_var_dtype_f32, 0 );
    vg_console_reg_var( "cinema_fixed", &k_cinema_fixed, k_var_dtype_i32, 0 );
-   vg_console_reg_var( "invert_y", &k_invert_y, 
+#endif
+   vg_console_reg_var( "invert_y", &k_invert_y,
                         k_var_dtype_i32, VG_VAR_PERSISTENT );
-
-   shader_model_character_view_register();
-   shader_model_board_view_register();
-   shader_model_entity_register();
 }
 
-static void player__debugtext( int size, const char *fmt, ... ){
+void player__debugtext( int size, const char *fmt, ... )
+{
 	char buffer[ 1024 ];
 
    va_list args;
@@ -76,15 +108,18 @@ static void player__debugtext( int size, const char *fmt, ... ){
  * Appearence
  */
 
-static void player__use_model( u16 reg_id ){
+void player__use_model( u16 reg_id )
+{
    addon_cache_unwatch( k_addon_type_player, 
                         localplayer.playermodel_view_slot );
    localplayer.playermodel_view_slot = 
       addon_cache_create_viewer( k_addon_type_player, reg_id );
 }
 
-static void player__bind(void){
-   for( u32 i=0; i<vg_list_size(player_subsystems); i++ ){
+void player__bind(void)
+{
+   for( u32 i=0; i<k_player_subsystem_max; i++ )
+   {
       struct player_subsystem_interface *sys = player_subsystems[i];
 
       if( sys->bind ) sys->bind();
@@ -96,7 +131,8 @@ static void player__bind(void){
  * ----------------------------------------------------------------------------
  */
 
-static void player__pre_update(void){
+void player__pre_update(void)
+{
    if( button_down( k_srbind_camera ) && !localplayer.immobile &&
        (localplayer.subsystem != k_player_subsystem_dead) ){
       if( localplayer.cam_control.camera_mode == k_cam_firstperson )
@@ -109,7 +145,8 @@ static void player__pre_update(void){
       player_subsystems[ localplayer.subsystem ]->pre_update();
 }
 
-static void player__update(void){
+void player__update(void)
+{
    if( player_subsystems[ localplayer.subsystem ]->update )
       player_subsystems[ localplayer.subsystem ]->update();
 
@@ -118,25 +155,25 @@ static void player__update(void){
       glider_physics( (v2f){0,0} );
 }
 
-static void player__post_update(void)
+void player__post_update(void)
 {
    struct player_subsystem_interface *sys = 
       player_subsystems[ localplayer.subsystem ];
 
    if( sys->post_update ) sys->post_update();
 
-   SDL_AtomicLock( &air_data.sl );
-   air_data.speed = v3_length( localplayer.rb.v ) * vg.time_rate;
-   SDL_AtomicUnlock( &air_data.sl );
+   SDL_AtomicLock( &air_audio_data.sl );
+   air_audio_data.speed = v3_length( localplayer.rb.v ) * vg.time_rate;
+   SDL_AtomicUnlock( &air_audio_data.sl );
 }
 
 /*
  * Applies gate transport to a player_interface
  */
-static void player__pass_gate( u32 id )
+void player__pass_gate( u32 id )
 {
    world_instance *world = world_current_instance();
-   skaterift_record_frame( &skaterift.replay, 1 );
+   skaterift_record_frame( &player_replay.local, 1 );
 
    /* update boundary hash (network animation) */
    u16 index = mdl_entity_id_id(id) & ~NETMSG_BOUNDARY_MASK;
@@ -163,7 +200,7 @@ static void player__pass_gate( u32 id )
       world_static.active_instance = gate->target;
       player__clean_refs();
 
-      replay_clear( &skaterift.replay );
+      replay_clear( &player_replay.local );
    }
    else 
    {
@@ -180,7 +217,7 @@ static void player__pass_gate( u32 id )
    audio_unlock();
 }
 
-static void player_apply_transport_to_cam( m4x3f transport )
+void player_apply_transport_to_cam( m4x3f transport )
 {
    /* Pre-emptively edit the camera matrices so that the motion vectors 
     * are correct */
@@ -197,7 +234,7 @@ static void player_apply_transport_to_cam( m4x3f transport )
    m4x4_mul( world_gates.cam.mtx.v,  transport_4, world_gates.cam.mtx.v );
 }
 
-static void player__im_gui(void)
+void player__im_gui(void)
 {
    if( !k_player_debug_info ) return;
 
@@ -246,22 +283,24 @@ static void player__im_gui(void)
    skaterift_replay_debug_info();
 }
 
-static void player__setpos( v3f pos ){
+void player__setpos( v3f pos )
+{
    v3_copy( pos, localplayer.rb.co );
    v3_zero( localplayer.rb.v );
    rb_update_matrices( &localplayer.rb );
 }
 
-static void player__clean_refs(void){
-   replay_clear( &skaterift.replay );
+void player__clean_refs(void)
+{
+   replay_clear( &player_replay.local );
    gui_helper_clear();
 
    world_static.challenge_target = NULL;
    world_static.challenge_timer = 0.0f;
-   world_static.focused_entity = 0;
    world_static.active_trigger_volume_count = 0;
    world_static.last_use = 0.0;
-   world_entity_unfocus();
+   world_entity_exit_modal();
+   world_entity_clear_focus();
 
    localplayer.boundary_hash ^= NETMSG_BOUNDARY_BIT;
 
@@ -273,7 +312,8 @@ static void player__clean_refs(void){
    }
 }
 
-static void player__reset(void){
+void player__reset(void)
+{
    v3_zero( localplayer.rb.v );
    v3_zero( localplayer.rb.w );
    
@@ -290,28 +330,33 @@ static void player__reset(void){
    localplayer.gate_waiting = NULL;
    localplayer.have_glider = 0;
    localplayer.glider_orphan = 0;
+   localplayer.drowned = 0;
 
    v3_copy( localplayer.rb.co, localplayer.cam_control.tpv_lpf );
    player__clean_refs();
 }
 
-static void player__spawn( ent_spawn *rp ){
+void player__spawn( ent_spawn *rp )
+{
    player__setpos( rp->transform.co );
    player__reset();
 }
 
 
-static void player__kill(void){
+void player__kill(void)
+{
 }
 
-static void player__begin_holdout( v3f offset ){
+void player__begin_holdout( v3f offset )
+{
    memcpy( &localplayer.holdout_pose, &localplayer.pose, 
             sizeof(localplayer.pose) );
    v3_copy( offset, localplayer.holdout_pose.root_co );
    localplayer.holdout_time = 1.0f;
 }
 
-static void net_sfx_exchange( bitpack_ctx *ctx, struct net_sfx *sfx ){
+void net_sfx_exchange( bitpack_ctx *ctx, struct net_sfx *sfx )
+{
    bitpack_bytes( ctx, 1, &sfx->system );
    bitpack_bytes( ctx, 1, &sfx->priority );
    bitpack_bytes( ctx, 1, &sfx->id );
@@ -320,7 +365,8 @@ static void net_sfx_exchange( bitpack_ctx *ctx, struct net_sfx *sfx ){
    bitpack_qv3f( ctx, 16, -1024.0f, 1024.0f, sfx->location );
 }
 
-static void net_sfx_play( struct net_sfx *sfx ){
+void net_sfx_play( struct net_sfx *sfx )
+{
    if( sfx->system < k_player_subsystem_max ){
       struct player_subsystem_interface *sys = player_subsystems[sfx->system];
       if( sys->sfx_oneshot ){
@@ -349,8 +395,9 @@ static struct net_sfx *find_lower_priority_sfx( struct net_sfx *buffer, u32 len,
    return p_sfx;
 }
 
-static void player__networked_sfx( u8 system, u8 priority, u8 id, 
-                                   v3f pos, f32 volume ){
+void player__networked_sfx( u8 system, u8 priority, u8 id, 
+                            v3f pos, f32 volume )
+{
    struct net_sfx sfx,
          *p_net = find_lower_priority_sfx( 
                localplayer.sfx_buffer, 4, 
@@ -375,19 +422,3 @@ static void player__networked_sfx( u8 system, u8 priority, u8 id,
 
    net_sfx_play( &sfx );
 }
-
-/* implementation */
-#include "player_common.c"
-
-#include "player_walk.c"
-#include "player_skate.c"
-#include "player_dead.c"
-#include "player_drive.c"
-#include "player_glide.c"
-#include "player_basic_info.c"
-
-#include "player_render.c"
-#include "player_ragdoll.c"
-#include "player_replay.c"
-
-#endif /* PLAYER_C */