X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_remote.c;h=e8ca56c62cb65d4e98ccfccc8bfe368f6f0687dc;hb=0ba0bbe2da453f17f56a88521057e6514ae30b8f;hp=ba07abea312a44ebcae783bb00c9c16d792a05d6;hpb=ec3a96fde91385417ffc20e0f7745d7d8e2889ca;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_remote.c b/player_remote.c index ba07abe..e8ca56c 100644 --- a/player_remote.c +++ b/player_remote.c @@ -1,6 +1,7 @@ #include "player_remote.h" #include "skeleton.h" #include "player_render.h" +#include "player_api.h" #include "network_common.h" #include "addon.h" #include "font.h" @@ -8,10 +9,14 @@ #include "ent_miniworld.h" #include "ent_region.h" #include "shaders/model_entity.h" +#include "vg/vg_steam_friends.h" + +struct global_netplayers netplayers; static i32 k_show_own_name = 0; -static void player_remote_clear( struct network_player *player ){ +static void player_remote_clear( struct network_player *player ) +{ addon_cache_unwatch( k_addon_type_player, player->playermodel_view_slot ); addon_cache_unwatch( k_addon_type_board, player->board_view_slot ); @@ -53,7 +58,8 @@ static void relink_remote_player_worlds( u32 client_id ){ * * Run if local worlds change */ -static void relink_all_remote_player_worlds(void){ +void relink_all_remote_player_worlds(void) +{ for( u32 i=0; iactive ) @@ -61,7 +67,8 @@ static void relink_all_remote_player_worlds(void){ } } -static void player_remote_update_friendflags( struct network_player *remote ){ +void player_remote_update_friendflags( struct network_player *remote ) +{ ISteamFriends *hSteamFriends = SteamAPI_SteamFriends(); remote->isfriend = SteamAPI_ISteamFriends_HasFriend( hSteamFriends, remote->steamid, k_EFriendFlagImmediate ); @@ -69,7 +76,8 @@ static void player_remote_update_friendflags( struct network_player *remote ){ remote->steamid, k_EFriendFlagBlocked ); } -static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){ +void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ) +{ netmsg_blank *tmp = msg->m_pData; if( tmp->inetmsg_id == k_inetmsg_playerjoin ){ @@ -140,6 +148,7 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){ } netmsg_playerframe *frame = msg->m_pData; + if( frame->client >= vg_list_size(netplayers.list) ){ vg_error( "inetmsg_playerframe: player index out of range\n" ); return; @@ -313,7 +322,8 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){ /* * Write localplayer pose to network */ -static void remote_player_send_playerframe(void){ +void remote_player_send_playerframe(void) +{ u8 sysid = localplayer.subsystem; if( sysid >= k_player_subsystem_max ) return; @@ -386,7 +396,8 @@ static void remote_player_send_playerframe(void){ /* * Updates network traffic stats */ -static void remote_player_debug_update(void){ +void remote_player_debug_update(void) +{ if( (vg.time_real - netplayers.last_data_measurement) > 1.0 ){ netplayers.last_data_measurement = vg.time_real; u32 total_down = 0; @@ -409,8 +420,10 @@ static void remote_player_debug_update(void){ /* * Debugging information */ -static void remote_player_network_imgui( m4x4f pv ){ - if( network_client.user_intent == k_server_intent_online ){ +void remote_player_network_imgui( ui_context *ctx, m4x4f pv ) +{ + if( network_client.user_intent == k_server_intent_online ) + { if( !(steam_ready && (network_client.state == k_ESteamNetworkingConnectionState_Connected))) { @@ -419,7 +432,7 @@ static void remote_player_network_imgui( m4x4f pv ){ vg_strnull( &str, buf, sizeof(buf) ); u32 fg = 0; network_status_string( &str, &fg ); - ui_text( (ui_rect){ vg.window_x - 200, 0, 200, 48 }, buf, 1, + ui_text( ctx, (ui_rect){ vg.window_x - 200, 0, 200, 48 }, buf, 1, k_ui_align_middle_center, fg ); } } @@ -428,7 +441,13 @@ static void remote_player_network_imgui( m4x4f pv ){ return; ui_rect panel = { (vg.window_x / 2) - 200, 0, 400, 600 }; - ui_fill( panel, (ui_colour(k_ui_bg)&0x00ffffff)|0x50000000 ); + ui_fill( ctx, panel, (ui_colour(ctx, k_ui_bg)&0x00ffffff)|0x50000000 ); + + ctx->font = &vgf_default_title; + ui_info( ctx, panel, "Network" ); + ctx->font = &vgf_default_large; + ui_info( ctx, panel, "Status" ); + ctx->font = &vgf_default_small; char buf[512]; const char *netstatus = "PROGRAMMING ERROR"; @@ -451,39 +470,46 @@ static void remote_player_network_imgui( m4x4f pv ){ { k_ESteamNetworkingConnectionState_Linger, "Linger" }, { k_ESteamNetworkingConnectionState_Dead, "Dead" } }; - for( u32 i=0; iactive ){ + if( player->active ) + { const char *sysname = "invalid"; - if( player->subsystem < k_player_subsystem_max ){ + if( player->subsystem < k_player_subsystem_max ) + { sysname = player_subsystems[ player->subsystem ]->name; } snprintf( buf, 512, "#%u: %s [%s] D%.1fkbs", i, player->username, sysname, player->down_kbs ); - ui_info( panel, buf ); + ui_info( ctx, panel, buf ); } } } - else { - ui_info( panel, "offline" ); + else + { + ui_info( ctx, panel, "offline" ); } } @@ -596,8 +622,8 @@ static void pose_remote_player( u32 index, /* * animate remote player and store in final_mtx */ -static void animate_remote_player( u32 index ){ - +void animate_remote_player( u32 index ) +{ /* * Trys to keep the cursor inside the buffer */ @@ -652,7 +678,8 @@ static void animate_remote_player( u32 index ){ /* * Update full final_mtx for all remote players */ -static void animate_remote_players(void){ +void animate_remote_players(void) +{ for( u32 i=0; iactive ) continue; @@ -664,7 +691,8 @@ static void animate_remote_players(void){ /* * Draw remote players */ -static void render_remote_players( world_instance *world, camera *cam ){ +void render_remote_players( world_instance *world, vg_camera *cam ) +{ u32 draw_list[ NETWORK_MAX_PLAYERS ], draw_list_count = 0, gliders = 0; @@ -673,8 +701,11 @@ static void render_remote_players( world_instance *world, camera *cam ){ struct network_player *player = &netplayers.list[i]; if( !player->active || player->isblocked ) continue; if( player->active_world != world ) continue; + +#if 0 if( !player->isfriend && (world-world_static.instances == k_world_purpose_hub)) continue; +#endif draw_list[draw_list_count ++] = i; @@ -774,7 +805,8 @@ static int remote_players_randomize( int argc, const char *argv[] ){ return 0; } -static void remote_players_init(void){ +void remote_players_init(void) +{ vg_console_reg_cmd( "add_test_players", remote_players_randomize, NULL ); vg_console_reg_var( "k_show_own_name", &k_show_own_name, k_var_dtype_i32, 0 ); @@ -783,7 +815,8 @@ static void remote_players_init(void){ } } -static void remote_sfx_pre_update(void){ +void remote_sfx_pre_update(void) +{ for( u32 i=0; i 15.0 ) return; ui_rect wr; - wr[2] = ui_text_line_width( message ) + 8; - wr[3] = vg_ui.font->glyph_height + 2; + wr[2] = ui_text_line_width( ctx, message ) + 8; + wr[3] = ctx->font->ch + 2; wr[0] = tag_root[0]-(wr[2]/2); wr[1] = tag_root[1] - wr[3] - 8; - ui_fill( wr, ui_opacity( ui_colour(k_ui_bg), 0.23f ) ); - ui_text( wr, message, 1, k_ui_align_middle_center, 0 ); + ui_fill( ctx, wr, ui_opacity( ui_colour(ctx, k_ui_bg), 0.23f ) ); + ui_text( ctx, wr, message, 1, k_ui_align_middle_center, 0 ); } /* * Draw full imgui for remote player */ -static void remote_player_nametag( ui_point tag_root, - struct network_player *player ){ - vg_ui.font = &vg_ui_font_big; +static void remote_player_nametag( ui_context *ctx, ui_point tag_root, + struct network_player *player ) +{ + ctx->font = &vgf_default_large; ui_rect wr; - wr[2] = VG_MAX( ui_text_line_width( player->username ), 140 ) + 8; + wr[2] = VG_MAX( ui_text_line_width( ctx, player->username ), 140 ) + 8; wr[3] = 32; wr[0] = tag_root[0]-(wr[2]/2); wr[1] = tag_root[1]-(wr[3]/2); - ui_fill( wr, ui_opacity( ui_colour(k_ui_bg), 0.23f ) ); - ui_text( wr, player->username, 1, k_ui_align_middle_center, 0 ); - - vg_ui.font = &vg_ui_font_small; + ui_fill( ctx, wr, ui_opacity( ui_colour(ctx, k_ui_bg), 0.23f ) ); + ui_text( ctx, wr, player->username, 1, k_ui_align_middle_center, 0 ); + ctx->font = &vgf_default_small; /* medals */ int cols = 0; @@ -881,21 +916,26 @@ static void remote_player_nametag( ui_point tag_root, char buf[32]; vg_str str; - if( cols ){ + if( cols ) + { f32 w = (f32)wr[2] / (f32)cols; cols = 0; - for( int i=0; i<3; i ++ ){ - if( player->medals[i] ){ - ui_rect col = { wr[0] + (f32)cols*w, wr[1] + wr[3], w, - vg_ui.font->glyph_height }; + for( int i=0; i<3; i ++ ) + { + if( player->medals[i] ) + { + ui_rect col = { wr[0] + (f32)cols*w, wr[1] + wr[3], + w, ctx->font->ch }; vg_strnull( &str, buf, 32 ); +#if 0 vg_strcatch( &str, (char)k_SRglyph_vg_circle ); +#endif vg_strcati32( &str, player->medals[i] ); - ui_text( col, buf, 1, k_ui_align_middle_center, - ui_colour( (enum ui_scheme_colour[]){ + ui_text( ctx, col, buf, 1, k_ui_align_middle_center, + ui_colour( ctx, (enum ui_scheme_colour[]){ k_ui_yellow, k_ui_gray, k_ui_orange }[i] ) ); cols ++; @@ -904,25 +944,30 @@ static void remote_player_nametag( ui_point tag_root, } } -static void remote_player_world_gui( m4x4f pv, v3f root_co, +static void remote_player_world_gui( ui_context *ctx, m4x4f pv, v3f root_co, struct network_player *player ){ ui_point tag_root; if( !player_tag_position( pv, root_co, tag_root ) ) return; - if( player ){ - remote_player_nametag( tag_root, player ); - chat_box( tag_root, player->chat_time, player->chat ); + if( player ) + { + remote_player_nametag( ctx, tag_root, player ); + chat_box( ctx, tag_root, player->chat_time, player->chat ); } - else { + else + { if( netplayers.chatting ) - chat_box( tag_root, vg.time_real, netplayers.chat_buffer ); + chat_box( ctx, tag_root, vg.time_real, netplayers.chat_buffer ); else - chat_box( tag_root, netplayers.chat_time, netplayers.chat_message ); + { + chat_box( ctx, tag_root, + netplayers.chat_time, netplayers.chat_message ); + } } } -static void remote_player_gui_info( ui_rect box, +static void remote_player_gui_info( ui_context *ctx, ui_rect box, const char *username, const char *activity, enum remote_player_gui_type type, @@ -931,12 +976,12 @@ static void remote_player_gui_info( ui_rect box, f32 opacity = in_world? 0.6f: 0.3f; if( type == k_remote_player_gui_type_you ) - ui_fill( box, ui_opacity( 0xff555555, opacity ) ); + ui_fill( ctx, box, ui_opacity( 0xff555555, opacity ) ); else - ui_fill( box, ui_opacity( 0xff000000, opacity ) ); + ui_fill( ctx, box, ui_opacity( 0xff000000, opacity ) ); if( type == k_remote_player_gui_type_friend ) - ui_outline( box, -1, ui_opacity( 0xff00c4f0, opacity ), 0 ); + ui_outline( ctx, box, -1, ui_opacity( 0xff00c4f0, opacity ), 0 ); ui_rect top, bottom; ui_split_ratio( box, k_ui_axis_h, 0.6666f, 1, top, bottom ); @@ -944,18 +989,18 @@ static void remote_player_gui_info( ui_rect box, u32 fg; if( type == k_remote_player_gui_type_friend ) - fg = ui_colour( k_ui_yellow + (in_world? k_ui_brighter: 0) ); + fg = ui_colour( ctx, k_ui_yellow + (in_world? k_ui_brighter: 0) ); else - fg = ui_colour( in_world? k_ui_fg: k_ui_fg+4 ); - - vg_ui.font = &vg_ui_font_big; - ui_text( top, username, 1, k_ui_align_middle_center, fg ); - vg_ui.font = &vg_ui_font_small; + fg = ui_colour( ctx, in_world? k_ui_fg: k_ui_fg+4 ); - ui_text( bottom, activity, 1, k_ui_align_middle_center, fg ); + ctx->font = &vgf_default_large; + ui_text( ctx, top, username, 1, k_ui_align_middle_center, fg ); + ctx->font = &vgf_default_small; + ui_text( ctx, bottom, activity, 1, k_ui_align_middle_center, fg ); } -static void remote_players_imgui_lobby(void){ +void remote_players_imgui_lobby( ui_context *ctx ) +{ if( network_client.user_intent == k_server_intent_online ){ if( !(steam_ready && (network_client.state == k_ESteamNetworkingConnectionState_Connected))) @@ -967,19 +1012,20 @@ static void remote_players_imgui_lobby(void){ ui_px y = 50, width = 200, height = 42, gap = 2, x = vg.window_x - width; - vg_ui.font = &vg_ui_font_big; - ui_text( (ui_rect){ x, 0, width, height }, + ctx->font = &vgf_default_large; + ui_text( ctx, (ui_rect){ x, 0, width, height }, "In World", 1, k_ui_align_middle_center, 0 ); - vg_ui.font = &vg_ui_font_small; + ctx->font = &vgf_default_small; ui_rect us = { x, y, width, height }; /* FIXME: your location */ - remote_player_gui_info( us, steam_username_at_startup, "you", + remote_player_gui_info( ctx, us, steam_username_at_startup, "you", k_remote_player_gui_type_you, 1 ); y += height + gap; - for( u32 i=0; iactive || player->isblocked ) continue; @@ -993,19 +1039,23 @@ static void remote_players_imgui_lobby(void){ } ui_rect box = { x, y, width, height }; - remote_player_gui_info( box, player->username, location, + remote_player_gui_info( ctx, box, player->username, location, player->isfriend, in_same_world ); y += height + gap; } } -static void remote_players_imgui_world( world_instance *world, m4x4f pv, - f32 max_dist, int geo_cull ){ - ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y ); +void remote_players_imgui_world( ui_context *ctx, + world_instance *world, m4x4f pv, + f32 max_dist, int geo_cull ) +{ + ui_flush( ctx, k_ui_shader_colour, NULL ); - for( u32 i=0; iactive ){ + if( player->active ) + { v3f co; remote_player_position( i, co ); @@ -1015,7 +1065,8 @@ static void remote_players_imgui_world( world_instance *world, m4x4f pv, (world-world_static.instances == k_world_purpose_hub)) continue; /* their in our active subworld */ - if( player->active_world != world ){ + if( player->active_world != world ) + { m4x3_mulv( global_miniworld.mmdl, co, co ); co[1] -= 2.0f; /* HACK lol */ } @@ -1033,10 +1084,10 @@ static void remote_players_imgui_world( world_instance *world, m4x4f pv, hit.dist = dist; v3f dir; - v3_sub( co, skaterift.cam.pos, dir ); + v3_sub( co, g_render.cam.pos, dir ); v3_normalize( dir ); - if( ray_world( world, skaterift.cam.pos, dir, &hit, + if( ray_world( world, g_render.cam.pos, dir, &hit, k_material_flag_ghosts ) ){ opacity *= 0.5f; } @@ -1045,24 +1096,24 @@ static void remote_players_imgui_world( world_instance *world, m4x4f pv, player->opacity = vg_lerpf( player->opacity, opacity, vg.time_frame_delta * 2.0f ); - remote_player_world_gui( pv, co, player ); + remote_player_world_gui( ctx, pv, co, player ); vg_ui.colour[3] = player->opacity; - ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y ); + ui_flush( ctx, k_ui_shader_colour, NULL ); } } vg_ui.colour[3] = 1.0f; - - remote_player_world_gui( pv, localplayer.rb.co, NULL ); - ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y ); + remote_player_world_gui( ctx, pv, localplayer.rb.co, NULL ); + ui_flush( ctx, k_ui_shader_colour, NULL ); } -static void chat_escape(void){ +static void chat_escape( ui_context *ctx ) +{ netplayers.chatting = -1; } -static void chat_enter( char *buf, u32 len ){ +static void chat_enter( ui_context *ctx, char *buf, u32 len ){ vg_strncpy( buf, netplayers.chat_message, NETWORK_MAX_CHAT, k_strncpy_always_add_null ); netplayers.chatting = -1; @@ -1070,27 +1121,33 @@ static void chat_enter( char *buf, u32 len ){ chat_send_message( buf ); } -static void remote_players_chat_imgui(void){ - if( netplayers.chatting == 1 ){ +void remote_players_chat_imgui( ui_context *ctx ) +{ + if( netplayers.chatting == 1 ) + { ui_rect box = { 0, 0, 400, 40 }, window = { 0, 0, vg.window_x, vg.window_y }; ui_rect_center( window, box ); - struct ui_textbox_callbacks callbacks = { + struct ui_textbox_callbacks callbacks = + { .enter = chat_enter, .escape = chat_escape }; - ui_textbox( box, NULL, + ui_textbox( ctx, box, NULL, netplayers.chat_buffer, NETWORK_MAX_CHAT, 1, UI_TEXTBOX_AUTOFOCUS, &callbacks ); } - else { - if( netplayers.chatting == -1 ){ + else + { + if( netplayers.chatting == -1 ) + { netplayers.chatting = 0; srinput.state = k_input_state_resume; } - else { + else + { if( (skaterift.activity == k_skaterift_default) && button_down( k_srbind_chat ) ){ netplayers.chatting = 1;