}
}
+static void player_remote_update_friendflags( struct network_player *remote ){
+ ISteamFriends *hSteamFriends = SteamAPI_SteamFriends();
+ remote->isfriend = SteamAPI_ISteamFriends_HasFriend( hSteamFriends,
+ remote->steamid, k_EFriendFlagImmediate );
+ remote->isblocked = SteamAPI_ISteamFriends_HasFriend( hSteamFriends,
+ remote->steamid, k_EFriendFlagBlocked );
+}
+
static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
netmsg_blank *tmp = msg->m_pData;
struct network_player *player = &netplayers.list[ playerjoin->index ];
player_remote_clear( player );
player->active = 1;
+ player->steamid = playerjoin->steamid;
+ player_remote_update_friendflags( player );
/* TODO: interpret the uids */
player->board_view_slot = 0;
buf->frames[i].active = 0;
}
- vg_info( "#%u joined\n", playerjoin->index );
+ vg_info( "#%u joined friend: %d, blocked: %d\n",
+ playerjoin->index, player->isfriend, player->isblocked );
}
else {
vg_error( "inetmsg_playerjoin: player index out of range\n" );
}
}
-static void remote_player_nametag( m4x4f pv, v3f co, const char *name ){
- return;
- vg_ui.font = &vg_ui_font_big;
- v4f wpos;
- v3_copy( co, wpos );
- wpos[1] += 2.0f;
- wpos[3] = 1.0f;
-
- m4x4_mulv( pv, wpos, wpos );
-
- if( wpos[3] > 0.0f ){
- v2_muls( wpos, (1.0f/wpos[3]) * 0.5f, wpos );
- v2_add( wpos, (v2f){ 0.5f, 0.5f }, wpos );
-
- ui_rect wr;
- wr[0] = vg_clampf(wpos[0] * vg.window_x, -32000.0f,32000.0f)-150;
- wr[1] = vg_clampf((1.0f-wpos[1]) * vg.window_y,
- -32000.0f,32000.0f);
- wr[2] = 300;
- wr[3] = 32;
- ui_fill( wr, (ui_colour(k_ui_bg)&0x00ffffff)|0x50000000 );
- ui_text( wr, name, 1, k_ui_align_middle_center, 0 );
- }
- vg_ui.font = &vg_ui_font_small;
-}
-
/*
* Debugging information
*/
snprintf( buf, 512, "#%u: %s [%s] D%.1fkbs",
i, player->username, sysname, player->down_kbs );
ui_info( panel, buf );
-
- struct player_avatar *av = localplayer.playeravatar;
- remote_player_nametag(
- pv,
- netplayers.final_mtx[av->sk.bone_count*i][3],
- player->username );
}
}
}
else {
ui_info( panel, "offline" );
}
-
- struct player_avatar *av = localplayer.playeravatar;
- remote_player_nametag(
- pv,
- localplayer.final_mtx[0][3],
- "Localplayer" );
}
/*
struct network_player *player = &netplayers.list[ index ];
struct interp_buffer *buf = &netplayers.interp_data[ index ];
- struct player_avatar *av = localplayer.playeravatar;
- m4x3f *final_mtx = &netplayers.final_mtx[ av->sk.bone_count*index ];
+ struct skeleton *sk = &localplayer.skeleton;
+ m4x3f *final_mtx = &netplayers.final_mtx[ sk->bone_count*index ];
struct player_board_pose *board_pose = &netplayers.board_poses[index];
struct player_subsystem_interface *sys0 = player_subsystems[f0->subsystem],
instance_id = f1->instance_id;
lerp_player_pose( &pose0, &pose1, t, &posed );
- apply_full_skeleton_pose( &av->sk, &posed, final_mtx );
+ apply_full_skeleton_pose( sk, &posed, final_mtx );
memcpy( board_pose, &posed.board, sizeof(*board_pose) );
}
else {
instance_id = f0->instance_id;
- apply_full_skeleton_pose( &av->sk, &pose0, final_mtx );
+ apply_full_skeleton_pose( sk, &pose0, final_mtx );
memcpy( board_pose, &pose0.board, sizeof(*board_pose) );
}
*/
static void render_remote_players( world_instance *world, camera *cam ){
SDL_AtomicLock( &addon_system.sl_cache_using_resources );
+ struct skeleton *sk = &localplayer.skeleton;
for( u32 i=0; i<NETWORK_MAX_PLAYERS; i ++ ){
struct network_player *player = &netplayers.list[i];
- if( !player->active ) continue;
+ if( !player->active || player->isblocked ) continue;
if( player->active_world != world ) continue;
- struct player_avatar *av = localplayer.playeravatar;
- m4x3f *final_mtx = &netplayers.final_mtx[ av->sk.bone_count*i ];
+ m4x3f *final_mtx = &netplayers.final_mtx[ sk->bone_count*i ];
struct player_model *model =
addon_cache_item_if_loaded( k_addon_type_player,
player->playermodel_view_slot );
if( !model ) model = &localplayer.fallback_model;
- render_playermodel( cam, world, 0, model, &av->sk, final_mtx );
+ render_playermodel( cam, world, 0, model, sk, final_mtx );
struct player_board *board =
addon_cache_item_if_loaded( k_addon_type_board,
player->board_view_slot );
- render_board( cam, world, board,
- final_mtx[localplayer.playeravatar->id_board],
- &netplayers.board_poses[ i ],
- k_board_shader_player );
+ render_board( cam, world, board, final_mtx[localplayer.id_board],
+ &netplayers.board_poses[ i ], k_board_shader_player );
}
SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
}
-static void render_remote_player_nametag( v3f co, const char *name ){
- m4x3f mlocal;
- m4x3_identity( mlocal );
- mlocal[3][0] -= font3d_string_width( 2, name ) * 0.5f;
-
- m4x3f mmdl;
- m3x3_identity( mmdl );
- for( int i=0; i<3; i++ )
- v3_muls( skaterift.cam.mtx.v[i], 0.2f, mmdl[i] );
- m3x3_transpose( mmdl, mmdl );
- v3_add( co, (v3f){0.0f,2.0f,0.0f}, mmdl[3] );
+static int remote_players_randomize( int argc, const char *argv[] ){
+ for( int i=0; i<NETWORK_MAX_PLAYERS; i ++ ){
+ struct network_player *player = &netplayers.list[i];
- m4x3_mul( mmdl, mlocal, mmdl );
- font3d_simple_draw( 2, name, &skaterift.cam, mmdl );
-}
+ player->active = vg_randu32() & 0x1;
+ player->isfriend = vg_randu32() & vg_randu32() & 0x1;
+ player->isblocked = vg_randu32() & vg_randu32() & vg_randu32() & 0x1;
+ player->world_match[ 0 ] = vg_randu32() & 0x1;
+ player->world_match[ 1 ] = 0;
-static void render_remote_players_tags( world_instance *world, camera *cam ){
- glEnable(GL_BLEND);
- glEnable(GL_DEPTH_TEST);
- glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
- glBlendEquation(GL_FUNC_ADD);
+ for( int i=0; i<sizeof(player->username)-1; i ++ ){
+ player->username[i] = 'a' + (vg_randu32() % 30);
+ player->username[i+1] = '\0';
- font3d_bind( &gui.font, k_font_shader_default, 1, NULL, &skaterift.cam );
- font3d_setcolour( (v4f){1.0f,1.0f,1.0f,1.0f} );
+ if( (vg_randu32() % 8) == 3 )
+ break;
+ }
- if( k_show_own_name ){
- render_remote_player_nametag(
- localplayer.final_mtx[0][3],
- steam_username_at_startup );
- }
+ for( int i=0; i<3; i ++ ){
+ player->medals[i] = vg_randu32() % 3;
+ }
- for( u32 i=0; i<NETWORK_MAX_PLAYERS; i ++ ){
- struct network_player *player = &netplayers.list[i];
- if( !player->active ) continue;
- if( player->active_world != world ) continue;
+ v3f pos;
- struct player_avatar *av = localplayer.playeravatar;
- render_remote_player_nametag(
- netplayers.final_mtx[av->sk.bone_count*i][3],
- player->username );
+ vg_rand_sphere( pos );
+ v3_muls( pos, 100.0f,
+ netplayers.final_mtx[ i*localplayer.skeleton.bone_count][3] );
}
- glDisable(GL_BLEND);
+ return 0;
}
static 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 );
for( u32 i=0; i<NETWORK_SFX_QUEUE_LENGTH; i ++ ){
}
}
}
+
+enum remote_player_gui_type {
+ k_remote_player_gui_type_stranger,
+ k_remote_player_gui_type_friend,
+ k_remote_player_gui_type_you,
+};
+
+/* TODO:
+ * line of sight / distance culling
+ */
+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;
+ v4f wpos;
+ v3_copy( co, wpos );
+ wpos[1] += 2.0f;
+ wpos[3] = 1.0f;
+
+ m4x4_mulv( pv, wpos, wpos );
+
+ if( wpos[3] > 0.0f ){
+ v2_muls( wpos, (1.0f/wpos[3]) * 0.5f, wpos );
+ v2_add( wpos, (v2f){ 0.5f, 0.5f }, wpos );
+
+ 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.6f ) );
+ 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_ps4_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 ++;
+ }
+ }
+ }
+ }
+
+ }
+ vg_ui.font = &vg_ui_font_small;
+}
+
+static void remote_player_gui_info( ui_rect box,
+ const char *username,
+ const char *activity,
+ enum remote_player_gui_type type,
+ int in_world ){
+
+ f32 opacity = in_world? 0.6f: 0.3f;
+
+ if( type == k_remote_player_gui_type_you )
+ ui_fill( box, ui_opacity( 0xff555555, opacity ) );
+ else
+ ui_fill( box, ui_opacity( 0xff000000, opacity ) );
+
+ if( type == k_remote_player_gui_type_friend )
+ ui_outline( box, -1, ui_opacity( 0xff00c4f0, opacity ), 0 );
+
+ ui_rect top, bottom;
+ ui_split_ratio( box, k_ui_axis_h, 0.6666f, 1, top, bottom );
+
+ u32 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;
+
+ ui_text( bottom, activity, 1, k_ui_align_middle_center, fg );
+}
+
+static void remote_players_imgui_lobby(void){
+ /*
+ * TODO: send location string over the network */
+
+ 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 },
+ "Online Players", 1, k_ui_align_middle_center, 0 );
+ vg_ui.font = &vg_ui_font_small;
+
+
+ ui_rect us = { x, y, width, height };
+ /* FIXME: your location */
+ remote_player_gui_info( us, steam_username_at_startup, "you",
+ k_remote_player_gui_type_you, 1 );
+ y += height + gap;
+
+ for( u32 i=0; i<NETWORK_MAX_PLAYERS; i ++ ){
+ struct network_player *player = &netplayers.list[i];
+ if( !player->active || player->isblocked ) continue;
+
+ ui_rect box = { x, y, width, height };
+ remote_player_gui_info(
+ box, player->username, "<null>",
+ player->isfriend,
+ player->world_match[ world_static.active_instance ] );
+ y += height + gap;
+ }
+}
+
+static void remote_players_imgui_world( world_instance *world, m4x4f pv,
+ f32 max_dist ){
+ for( u32 i=0; i<NETWORK_MAX_PLAYERS; i++ ){
+ struct network_player *player = &netplayers.list[i];
+ if( player->active ){
+ remote_player_nametag(
+ pv,
+ netplayers.final_mtx[localplayer.skeleton.bone_count*i][3],
+ player->username, player->isfriend, player->medals );
+ }
+ }
+}
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff