-#ifndef PLAYER_C
-#define PLAYER_C
-
#include "player.h"
+#include "addon.h"
#include "camera.h"
#include "player_model.h"
#include "input.h"
#include "ent_miniworld.h"
#include "gui.h"
-static int localplayer_cmd_respawn( int argc, const char *argv[] ){
+#include "shaders/model_entity.h"
+#include "shaders/model_character_view.h"
+#include "shaders/model_board_view.h"
+
+#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"
+
+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();
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();
}
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 );
}
-static void player__debugtext( int size, const char *fmt, ... ){
+void player__debugtext( int size, const char *fmt, ... )
+{
char buffer[ 1024 ];
va_list args;
* 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();
* ----------------------------------------------------------------------------
*/
-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 )
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();
+
+ if( localplayer.glider_orphan &&
+ (skaterift.activity != k_skaterift_replay) )
+ glider_physics( (v2f){0,0} );
}
-static void player__post_update(void){
- if( player_subsystems[ localplayer.subsystem ]->post_update )
- player_subsystems[ localplayer.subsystem ]->post_update();
+void player__post_update(void)
+{
+ struct player_subsystem_interface *sys =
+ player_subsystems[ localplayer.subsystem ];
+
+ if( sys->post_update ) sys->post_update();
+
+ 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( &player_replay.local, 1 );
/* update boundary hash (network animation) */
u16 index = mdl_entity_id_id(id) & ~NETMSG_BOUNDARY_MASK;
world_routes_fracture( world, gate, localplayer.rb.co, localplayer.rb.v );
localplayer.gate_waiting = gate;
+ localplayer.deferred_frame_record = 1;
struct player_cam_controller *cc = &localplayer.cam_control;
m4x3_mulv( gate->transport, cc->tpv_lpf, cc->tpv_lpf );
m4x3_mulv( gate->transport, localplayer.cam.pos, localplayer.cam.pos );
- if( gate->flags & k_ent_gate_nonlocal ){
- /* FIXME: Code dupe with world_load.c */
- ent_spawn *rp = world_find_spawn_by_name( world, "start" );
- if( !rp ) rp = world_find_closest_spawn( world, (v3f){0.0f,0.0f,0.0f} );
- /* TODO: fallback to searching for a safe location using raycasts */
- assert(rp);
- v3_copy( rp->transform.co, world->player_co );
-
+ if( gate->flags & k_ent_gate_nonlocal )
+ {
+ world_default_spawn_pos( world, world->player_co );
world_static.active_instance = gate->target;
player__clean_refs();
+
+ replay_clear( &player_replay.local );
}
else
+ {
world_routes_activate_entry_gate( world, gate );
+ }
v3f v0;
v3_angles_vector( localplayer.angles, v0 );
audio_lock();
audio_oneshot( &audio_gate_pass, 1.0f, 0.0f );
audio_unlock();
-
- replay_clear( &skaterift.replay );
}
-static void player_apply_transport_to_cam( m4x3f transport ){
- /* FIXME: Applies to skaterift.cam directly! */
-
+void player_apply_transport_to_cam( m4x3f transport )
+{
/* Pre-emptively edit the camera matrices so that the motion vectors
* are correct */
m4x3f transport_i;
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;
ui_rect box = {
[k_skaterift_replay] = "replay",
[k_skaterift_ent_focus] = "ent_focus",
[k_skaterift_default] = "default",
- [k_skaterift_respawning]= "map"
+ [k_skaterift_world_map] = "world map"
} [skaterift.activity] );
player__debugtext( 1, "time_rate: %.4f", skaterift.time_rate );
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_transform( &localplayer.rb );
+ 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;
}
}
-static void player__reset(void){
+void player__reset(void)
+{
v3_zero( localplayer.rb.v );
v3_zero( localplayer.rb.w );
if( (l < 0.9f) || (l > 1.1f) )
q_identity( localplayer.rb.q );
- rb_update_transform( &localplayer.rb );
+ rb_update_matrices( &localplayer.rb );
localplayer.subsystem = k_player_subsystem_walk;
player__walk_reset();
localplayer.immobile = 0;
localplayer.gate_waiting = NULL;
+ localplayer.have_glider = 0;
+ localplayer.glider_orphan = 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 );
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 ){
}
};
-static void player__networked_sfx( u8 system, u8 priority, u8 id,
- v3f pos, f32 volume ){
- struct net_sfx null, *sfx = &null;
-
- if( localplayer.sfx_buffer_count < vg_list_size(localplayer.sfx_buffer) )
- sfx = &localplayer.sfx_buffer[ localplayer.sfx_buffer_count ++ ];
+static struct net_sfx *find_lower_priority_sfx( struct net_sfx *buffer, u32 len,
+ u32 *count, u8 priority ){
+ struct net_sfx *p_sfx = NULL;
+ if( *count < len ){
+ p_sfx = &buffer[ *count ];
+ *count = *count+1;
+ }
else {
- for( u32 i=0; i<vg_list_size(localplayer.sfx_buffer); i++ ){
- struct net_sfx *a = &localplayer.sfx_buffer[i];
+ for( u32 i=0; i<len; i++ ){
+ struct net_sfx *a = &buffer[i];
if( a->priority < priority ){
- sfx = a;
+ p_sfx = a;
break;
}
}
}
- sfx->id = id;
- sfx->priority = priority;
- sfx->volume = volume;
- v3_copy( pos, sfx->location );
- sfx->system = system;
+ return p_sfx;
+}
+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,
+ &localplayer.sfx_buffer_count, priority ),
+ *p_replay = find_lower_priority_sfx(
+ localplayer.local_sfx_buffer, 2,
+ &localplayer.local_sfx_buffer_count, priority );
+
+ sfx.id = id;
+ sfx.priority = priority;
+ sfx.volume = volume;
+ v3_copy( pos, sfx.location );
+ sfx.system = system;
+
+ /* we only care about subframe in networked sfx. local replays run at a
+ * high enough framerate. */
f32 t = (vg.time_real - network_client.last_frame) / NETWORK_FRAMERATE;
- sfx->subframe = vg_clampf( t, 0.0f, 1.0f );
+ sfx.subframe = vg_clampf( t, 0.0f, 1.0f );
- net_sfx_play( sfx );
-}
+ if( p_net ) *p_net = sfx;
+ if( p_replay ) *p_replay = sfx;
-static void player__clear_sfx_buffer(void){
- localplayer.sfx_buffer_count = 0;
+ 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_basic_info.c"
-
-#include "player_render.c"
-#include "player_ragdoll.c"
-#include "player_replay.c"
-
-#endif /* PLAYER_C */
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff