}
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 );
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;
+
+ vg_ui.font = &vg_ui_font_big;
+ wr[2] = ui_text_line_width( name );
wr[3] = 32;
- ui_fill( wr, (ui_colour(k_ui_bg)&0x00ffffff)|0x50000000 );
+
+ 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;
+
}
vg_ui.font = &vg_ui_font_small;
}
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 || 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 );
if( !player->active || player->isblocked ) continue;
if( player->active_world != world ) continue;
- struct player_avatar *av = localplayer.playeravatar;
render_remote_player_nametag(
- netplayers.final_mtx[av->sk.bone_count*i][3],
+ netplayers.final_mtx[localplayer.skeleton.bone_count*i][3],
player->username );
}
glDisable(GL_BLEND);
}
+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];
+
+ 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;
+
+ for( int i=0; i<sizeof(player->username)-1; i ++ ){
+ player->username[i] = 'a' + (vg_randu32() % 30);
+ player->username[i+1] = '\0';
+
+ if( (vg_randu32() % 8) == 3 )
+ break;
+ }
+ }
+
+ 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,
- k_remote_player_gui_type_friend
};
static void remote_player_gui_info( ui_rect box,
ui_text( bottom, activity, 1, k_ui_align_middle_center, fg );
}
-static void remote_players_imgui(void){
- /* TODO: or if respawning, override show this and disable input
- * if in menu dont render. */
-
- if( button_down(k_srbind_lobby) )
- netplayers.view_lobby ^= 0x1;
-
- vg_slewf( &netplayers.fview_lobby, netplayers.view_lobby,
- vg.time_frame_delta / 0.5f );
+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 - ((f32)width*netplayers.fview_lobby);
-
- int type = vg.time,
- in_world = vg.time / 3.0;
-
+ x = vg.window_x - width;
vg_ui.font = &vg_ui_font_big;
ui_text( (ui_rect){ x, 0, width, height },
- "In World", 1, k_ui_align_middle_center, 0 );
+ "Online Players", 1, k_ui_align_middle_center, 0 );
vg_ui.font = &vg_ui_font_small;
ui_rect us = { x, y, width, height };
- remote_player_gui_info( us, steam_username_at_startup, "1300 meters away",
- type % 3, in_world % 2 );
+ /* 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->isfriend ) continue;
+ if( !player->active || player->isblocked ) continue;
ui_rect box = { x, y, width, height };
- remote_player_gui_info( box, player->username, "", 0, 0 );
+ 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 );
+ }
+ }
+}
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff