#include "player_remote.h"
+#include "skeleton.h"
+#include "player_render.h"
+#include "network_common.h"
+#include "addon.h"
static void player_remote_unwatch( struct network_player *player ){
addon_cache_unwatch( k_addon_type_player, player->playermodel_view_slot );
player->board_view_slot = 0;
player->playermodel_view_slot = 0;
- vg_strncpy( playerjoin->username, player->username,
- sizeof(player->username), k_strncpy_always_add_null );
+ struct interp_buffer *buf = &netplayers.interp_data[playerjoin->index];
+ buf->t = -99999999.9;
+ for( u32 i=0; i<vg_list_size(buf->frames); i ++ ){
+ buf->frames[i].active = 0;
+ }
- vg_info( "#%u joined with name: %s\n",
- playerjoin->index, player->username );
+ vg_info( "#%u joined\n", playerjoin->index );
}
else {
vg_error( "inetmsg_playerjoin: player index out of range\n" );
if( update->index < vg_list_size(netplayers.list) ){
struct network_player *player = &netplayers.list[ update->index ];
- vg_strncpy( update->username, player->username,
- sizeof(player->username), k_strncpy_always_add_null );
- vg_info( "#%u changed username: %s\n", player->username );
+ network_msgstring( update->name, msg->m_cbSize, sizeof(*update),
+ player->username, sizeof(player->username) );
+
+ vg_info( "#%u changed username to: %s\n",
+ update->index, player->username );
}
else {
vg_error( "inetmsg_playerleave: player index out of range\n" );
else if( tmp->inetmsg_id == k_inetmsg_playerframe ){
u32 datasize = msg->m_cbSize - sizeof(netmsg_playerframe);
- if( datasize > sizeof(netplayers.list[0].animdata) ){
+ if( datasize > sizeof(union interp_animdata) ){
vg_error( "Player frame data exceeds animdata size\n" );
return;
}
return;
}
+ struct interp_buffer *ib = &netplayers.interp_data[ frame->client ];
+ struct interp_frame *dest = NULL;
+
+ f64 min_time = INFINITY;
+ for( u32 i=0; i<vg_list_size(ib->frames); i++ ){
+ struct interp_frame *ifr = &ib->frames[i];
+
+ if( !ifr->active ){
+ dest = ifr;
+ break;
+ }
+
+ if( ifr->timestamp < min_time ){
+ min_time = ifr->timestamp;
+ dest = ifr;
+ }
+ }
+
+ dest->active = 1;
+ dest->timestamp = frame->timestamp;
+ dest->subsystem = frame->subsystem;
+
struct network_player *player = &netplayers.list[ frame->client ];
- memcpy( &player->animdata, frame->animdata, datasize );
+ memcpy( &dest->data, frame->animdata, datasize );
player->subsystem = frame->subsystem;
player->down_bytes += msg->m_cbSize;
}
+ else if( tmp->inetmsg_id == k_inetmsg_playeritem ){
+ netmsg_playeritem *item = msg->m_pData;
+ if( !packet_minsize( msg, sizeof(*item)+1 )) return;
+
+ if( item->client >= vg_list_size(netplayers.list) ){
+ vg_error( "inetmsg_playerframe: player index out of range\n" );
+ return;
+ }
+
+ vg_info( "Client #%u equiped: [%u] %s\n",
+ item->client, item->type, item->uid );
+
+ struct network_player *player = &netplayers.list[ item->client ];
+
+ char uid[ ADDON_UID_MAX ];
+ network_msgstring( item->uid, msg->m_cbSize, sizeof(*item),
+ uid, ADDON_UID_MAX );
+
+ if( item->type == k_addon_type_board ){
+ addon_cache_unwatch( k_addon_type_board, player->board_view_slot );
+ player->board_view_slot =
+ addon_cache_create_viewer_from_uid( k_addon_type_board, uid );
+ }
+ else if( item->type == k_addon_type_player ){
+ addon_cache_unwatch( k_addon_type_player,
+ player->playermodel_view_slot );
+ player->playermodel_view_slot =
+ addon_cache_create_viewer_from_uid( k_addon_type_player, uid );
+ }
+ }
}
+/*
+ * Write localplayer pose to network
+ */
static void remote_player_send_playerframe(void){
u8 sysid = localplayer.subsystem;
if( sysid >= k_player_subsystem_max ) return;
frame->inetmsg_id = k_inetmsg_playerframe;
frame->client = 0;
frame->subsystem = localplayer.subsystem;
+ frame->timestamp = vg.time_real;
memcpy( frame->animdata, sys->animator_data, sys->animator_size );
netplayers.up_bytes += size;
}
}
+/*
+ * Updates network traffic stats
+ */
static void remote_player_debug_update(void){
if( (vg.time_real - netplayers.last_data_measurement) > 1.0 ){
netplayers.last_data_measurement = vg.time_real;
}
}
-static void remote_player_network_imgui(void){
+/*
+ * Debugging information
+ */
+static void remote_player_network_imgui( m4x4f pv ){
if( !network_client.network_info )
return;
snprintf( buf, 512, "#%u: %s [%s] D%.1fkbs",
i, player->username, sysname, player->down_kbs );
ui_info( panel, buf );
+
+ v4f wpos = { 0.0f, 2.0f, 0.0f, 1.0f };
+ struct player_avatar *av = localplayer.playeravatar;
+ m4x3_mulv( netplayers.final_mtx[av->sk.bone_count*i], wpos, wpos );
+ 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] = 17;
+ ui_fill( wr, (ui_colour(k_ui_bg)&0x00ffffff)|0x50000000 );
+ ui_text( wr, buf, 1, k_ui_align_middle_center, 0 );
+ }
}
}
}
ui_info( panel, "offline" );
}
}
+
+/*
+ * write the remote players final_mtx
+ */
+static void pose_remote_player( u32 index,
+ struct interp_frame *f0,
+ struct interp_frame *f1 ){
+
+ struct interp_buffer *buf = &netplayers.interp_data[ index ];
+ struct player_avatar *av = localplayer.playeravatar;
+ struct skeleton *sk = &localplayer.playeravatar->sk;
+ m4x3f *final_mtx = &netplayers.final_mtx[ av->sk.bone_count*index ];
+ struct player_board_pose *board_pose = &netplayers.board_poses[index];
+
+ struct player_subsystem_interface *sys0 = player_subsystems[f0->subsystem],
+ *sys1 = NULL;
+
+ player_pose pose0, pose1, posed;
+
+ sys0->pose( &f0->data, &pose0 );
+
+ if( f1 ){
+ f32 t = (buf->t - f0->timestamp) / (f1->timestamp - f0->timestamp);
+ t = vg_clampf( t, 0.0f, 1.0f );
+
+ sys1 = player_subsystems[f1->subsystem];
+ sys1->pose( &f1->data, &pose1 );
+
+ lerp_player_pose( &pose0, &pose1, t, &posed );
+ apply_full_skeleton_pose( &av->sk, &posed, final_mtx );
+ memcpy( board_pose, &posed.board, sizeof(*board_pose) );
+ }
+ else {
+ apply_full_skeleton_pose( &av->sk, &pose0, final_mtx );
+ memcpy( board_pose, &pose0.board, sizeof(*board_pose) );
+ }
+}
+
+/*
+ * animate remote player and store in final_mtx
+ */
+static void animate_remote_player( u32 index ){
+
+ /*
+ * Trys to keep the cursor inside the buffer
+ */
+ f64 min_time = -999999999.9,
+ max_time = 999999999.9,
+ abs_max_time = -999999999.9;
+
+ struct interp_frame *minframe = NULL,
+ *maxframe = NULL,
+ *abs_max_frame = NULL;
+
+ struct interp_buffer *buf = &netplayers.interp_data[index];
+ for( u32 i=0; i<vg_list_size(buf->frames); i ++ ){
+ struct interp_frame *ifr = &buf->frames[i];
+
+ if( ifr->active ){
+ if( (ifr->timestamp > min_time) && (ifr->timestamp < buf->t) ){
+ min_time = ifr->timestamp;
+ minframe = ifr;
+ }
+
+ if( (ifr->timestamp < max_time) && (ifr->timestamp > buf->t) ){
+ max_time = ifr->timestamp;
+ maxframe = ifr;
+ }
+
+ if( ifr->timestamp > abs_max_time ){
+ abs_max_time = ifr->timestamp;
+ abs_max_frame = ifr;
+ }
+ }
+ }
+
+ if( minframe && maxframe ){
+ pose_remote_player( index, minframe, maxframe );
+ buf->t += vg.time_frame_delta;
+ }
+ else {
+ buf->t = abs_max_time - 0.25;
+
+ if( abs_max_frame )
+ pose_remote_player( index, abs_max_frame, NULL );
+ else
+ return;
+ }
+}
+
+/*
+ * Update full final_mtx for all remote players
+ */
+static void animate_remote_players(void){
+ for( u32 i=0; i<vg_list_size(netplayers.list); i ++ ){
+ struct network_player *player = &netplayers.list[i];
+ if( !player->active ) continue;
+
+ animate_remote_player( i );
+ }
+}
+
+/*
+ * Draw remote players
+ */
+static void render_remote_players( world_instance *world, camera *cam ){
+
+ SDL_AtomicLock( &addon_system.sl_cache_using_resources );
+
+ for( u32 i=0; i<NETWORK_MAX_PLAYERS; i ++ ){
+ struct network_player *player = &netplayers.list[i];
+ if( !player->active ) continue;
+
+ struct player_avatar *av = localplayer.playeravatar;
+ m4x3f *final_mtx = &netplayers.final_mtx[ av->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 );
+
+ 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 );
+ }
+
+ SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
+}
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff