X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_remote.c;h=d9f0065ee9f172d7d2ae0f16fc65323f661c2ac9;hb=70ff4a83e5a4b35436388d9bb999c939559ac23f;hp=c816a26d48ade3b307de9b94c1480f3992a085f9;hpb=01154bc01a470dc1ccfe8c05fe6b56857a08cca9;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_remote.c b/player_remote.c index c816a26..d9f0065 100644 --- a/player_remote.c +++ b/player_remote.c @@ -276,6 +276,15 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){ relink_remote_player_worlds( item->client ); } } + else if( tmp->inetmsg_id == k_inetmsg_chat ){ + netmsg_chat *chat = msg->m_pData; + + struct network_player *player = &netplayers.list[ chat->client ]; + network_msgstring( chat->msg, msg->m_cbSize, sizeof(netmsg_chat), + player->chat, NETWORK_MAX_CHAT ); + player->chat_time = vg.time_real; + vg_info( "[%d]: %s\n", chat->client, player->chat ); + } } /* @@ -652,15 +661,12 @@ enum remote_player_gui_type { k_remote_player_gui_type_you, }; -/* TODO: - * line of sight / distance culling +/* + * Given players' root_co, get the screen point where we should draw tag info. */ -static void remote_player_nametag( m4x4f pv, v3f co, const char *name, - enum remote_player_gui_type type, - u32 medals[3] ){ - vg_ui.font = &vg_ui_font_big; +static int player_tag_position( m4x4f pv, v3f root_co, ui_point out_point ){ v4f wpos; - v3_copy( co, wpos ); + v3_copy( root_co, wpos ); wpos[1] += 2.0f; wpos[3] = 1.0f; @@ -669,54 +675,100 @@ static void remote_player_nametag( m4x4f pv, v3f co, const char *name, if( wpos[3] > 0.0f ){ v2_muls( wpos, (1.0f/wpos[3]) * 0.5f, wpos ); v2_add( wpos, (v2f){ 0.5f, 0.5f }, wpos ); + + float k_max = 32000.0f; - vg_ui.font = &vg_ui_font_big; - ui_rect wr; - wr[2] = VG_MAX( ui_text_line_width( name ), 140 ) + 8; - wr[0] = vg_clampf(wpos[0] * vg.window_x, -32000.0f,32000.0f)-(wr[2]/2); - wr[1] = vg_clampf((1.0f-wpos[1]) * vg.window_y, -32000.0f, 32000.0f ); - wr[3] = 32; - - ui_fill( wr, ui_opacity( ui_colour(k_ui_bg), 0.23f ) ); - ui_text( wr, name, 1, k_ui_align_middle_center, 0 ); - - vg_ui.font = &vg_ui_font_small; - - /* medals */ - int cols = 0; - if( medals ){ - for( int i=0; i<3; i ++ ) - if( medals[i] ) - cols ++; - - char buf[32]; - vg_str str; - - if( cols ){ - f32 w = (f32)wr[2] / (f32)cols; - cols = 0; - - for( int i=0; i<3; i ++ ){ - if( medals[i] ){ - ui_rect col = { wr[0] + (f32)cols*w, wr[1] + wr[3], w, - vg_ui.font->glyph_height }; - - vg_strnull( &str, buf, 32 ); - vg_strcatch( &str, (char)k_SRglyph_vg_circle ); - vg_strcati32( &str, medals[i] ); - - ui_text( col, buf, 1, k_ui_align_middle_center, - ui_colour( (enum ui_scheme_colour[]){ - k_ui_yellow, k_ui_gray, k_ui_orange }[i] ) ); - - cols ++; - } - } + out_point[0] = vg_clampf(wpos[0] * vg.window_x, -k_max, k_max ); + out_point[1] = vg_clampf((1.0f-wpos[1]) * vg.window_y, -k_max, k_max ); + return 1; + } + else + return 0; +} + +/* + * Draw chat box relative to the root tag position on the screen + */ +static void chat_box( ui_point tag_root, f64 time, const char *message ){ + if( (vg.time_real - time) > 15.0 ) + return; + + ui_rect wr; + wr[2] = ui_text_line_width( message ) + 8; + wr[3] = vg_ui.font->glyph_height + 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 ); +} + +/* + * 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; + + ui_rect wr; + wr[2] = VG_MAX( ui_text_line_width( 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; + + /* medals */ + int cols = 0; + for( int i=0; i<3; i ++ ) + if( player->medals[i] ) + cols ++; + + char buf[32]; + vg_str str; + + 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 }; + + vg_strnull( &str, buf, 32 ); + vg_strcatch( &str, (char)k_SRglyph_vg_circle ); + vg_strcati32( &str, player->medals[i] ); + + ui_text( col, buf, 1, k_ui_align_middle_center, + ui_colour( (enum ui_scheme_colour[]){ + k_ui_yellow, k_ui_gray, k_ui_orange }[i] ) ); + + cols ++; } } + } +} + +static void remote_player_world_gui( 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 ); + } + else { + if( netplayers.chatting ) + chat_box( tag_root, vg.time_real, netplayers.chat_buffer ); + else + chat_box( tag_root, netplayers.chat_time, netplayers.chat_message ); } - vg_ui.font = &vg_ui_font_small; } static void remote_player_gui_info( ui_rect box, @@ -825,11 +877,10 @@ 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_nametag( - pv, - netplayers.final_mtx[localplayer.skeleton.bone_count*i][3], - player->username, player->isfriend, player->medals ); + + remote_player_world_gui( + pv, netplayers.final_mtx[localplayer.skeleton.bone_count*i][3], + player ); vg_ui.colour[3] = player->opacity; ui_flush( k_ui_shader_colour ); @@ -837,4 +888,50 @@ static void remote_players_imgui_world( world_instance *world, m4x4f pv, } vg_ui.colour[3] = 1.0f; + + remote_player_world_gui( pv, localplayer.rb.co, NULL ); + ui_flush( k_ui_shader_colour ); +} + +static void chat_escape(void){ + netplayers.chatting = -1; +} + +static void chat_enter( char *buf, u32 len ){ + vg_strncpy( buf, netplayers.chat_message, NETWORK_MAX_CHAT, + k_strncpy_always_add_null ); + netplayers.chatting = -1; + netplayers.chat_time = vg.time_real; + chat_send_message( buf ); +} + +static void remote_players_chat_imgui(void){ + 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 = { + .enter = chat_enter, + .escape = chat_escape + }; + + ui_textbox( box, NULL, + netplayers.chat_buffer, NETWORK_MAX_CHAT, 1, + UI_TEXTBOX_AUTOFOCUS, &callbacks ); + } + else { + if( netplayers.chatting == -1 ){ + netplayers.chatting = 0; + srinput.state = k_input_state_resume; + } + else { + if( (skaterift.activity == k_skaterift_default) && + button_down( k_srbind_chat ) ){ + netplayers.chatting = 1; + netplayers.chat_buffer[0] = '\0'; + srinput.state = k_input_state_pause; + } + } + } }