#include "network_common.h"
#include "addon.h"
-static void player_remote_unwatch( 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 );
-}
-static void player_remote_clear( struct network_player *player ){
- player_remote_unwatch( player );
memset( player, 0, sizeof(*player) );
strcpy( player->username, "unknown" );
player->subsystem = k_player_subsystem_invalid;
}
+/*
+ * re-attatches addon_reg pointers on the remote client if we have the same
+ * world loaded.
+ */
+static void relink_remote_player_worlds( u32 client_id ){
+ struct network_player *player = &netplayers.list[client_id];
+
+ player->hub_match = 0;
+ player->client_match = 0;
+
+ addon_alias q0,q1;
+ addon_uid_to_alias( player->items[k_netmsg_playeritem_world0], &q0 );
+ addon_uid_to_alias( player->items[k_netmsg_playeritem_world1], &q1 );
+
+ /*
+ * currently in 10.23, the hub world will always be the same.
+ * this might but probably wont change in the future
+ */
+ if( world_static.addon_hub )
+ if( addon_alias_eq( &q0, &world_static.addon_hub->alias ) )
+ player->hub_match = 1;
+
+ if( world_static.addon_client )
+ if( addon_alias_eq( &q1, &world_static.addon_client->alias ) )
+ player->client_match = 1;
+}
+
+/*
+ * re-attatches addon_reg pointers on the remote client if we have the mod
+ * installed locally.
+ *
+ * Run if local worlds change
+ */
+static void relink_all_remote_player_worlds(void){
+ for( u32 i=0; i<vg_list_size(netplayers.list); i++ ){
+ struct network_player *player = &netplayers.list[i];
+ if( player->active )
+ relink_remote_player_worlds(i);
+ }
+}
+
static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
netmsg_blank *tmp = msg->m_pData;
/* TODO: interpret the uids */
player->board_view_slot = 0;
player->playermodel_view_slot = 0;
-#if 0
- addon_cache_create_viewer_from_uid( k_addon_type_board,
- playerjoin->board_uid );
- player->playermodel_view_slot =
- addon_cache_create_viewer_from_uid( k_addon_type_player,
- playerjoin->playermodel_uid );
-#endif
struct interp_buffer *buf = &netplayers.interp_data[playerjoin->index];
buf->t = -99999999.9;
if( playerleave->index < vg_list_size(netplayers.list) ){
struct network_player *player = &netplayers.list[ playerleave->index ];
- player_remote_unwatch( player );
+ player_remote_clear( player );
player->active = 0;
vg_info( "player leave (%d)\n", playerleave->index );
}
}
dest->active = 1;
- dest->timestamp = frame->timestamp;
dest->subsystem = frame->subsystem;
+ dest->instance_id = frame->instance_id;
+
+ bitpack_ctx ctx = {
+ .mode = k_bitpack_decompress,
+ .buffer = frame->animdata,
+ .buffer_len = datasize,
+ .bytes = 0,
+ };
+
+
+ /* sfx
+ * -------------------------------------------------------------*/
+
+ for( u32 i=0; i<frame->sound_effects; i ++ ){
+ /* CHEATING for now */
+ struct net_sfx sfx;
+ net_sfx_exchange( &ctx, &sfx );
+ net_sfx_play( &sfx );
+ }
+
+ /* animation
+ * -------------------------------------------------------------*/
+
+ dest->timestamp = frame->timestamp;
+ dest->boundary_hash = frame->boundary_hash;
struct network_player *player = &netplayers.list[ frame->client ];
- memcpy( &dest->data, frame->animdata, datasize );
+ struct player_subsystem_interface *sys =
+ player_subsystems[ frame->subsystem ];
+
+ if( sys->network_animator_exchange ){
+ memset( &dest->data, 0, sys->animator_size );
+ sys->network_animator_exchange( &ctx, &dest->data );
+ }
+ else {
+ bitpack_bytes( &ctx, sys->animator_size, sys->animator_data );
+ }
+
player->subsystem = frame->subsystem;
player->down_bytes += msg->m_cbSize;
}
return;
}
- vg_info( "Client #%u equiped: [%u] %s\n",
- item->client, item->type, item->uid );
+ if( item->type_index >= k_netmsg_playeritem_max ){
+ vg_warn( "Client #%d invalid equip type %u\n",
+ (i32)item->client, (u32)item->type_index );
+ return;
+ }
+
+ vg_info( "Client #%d equiped: [%s] %s\n",
+ item->client,
+ (const char *[]){[k_netmsg_playeritem_board]="board",
+ [k_netmsg_playeritem_player]="player",
+ [k_netmsg_playeritem_world0]="world0",
+ [k_netmsg_playeritem_world1]="world1"
+ }[item->type_index], item->uid );
struct network_player *player = &netplayers.list[ item->client ];
+ char *uid = player->items[ item->type_index ];
- 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 ){
+ if( item->type_index == k_netmsg_playeritem_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 ){
+ else if( item->type_index == k_netmsg_playeritem_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 );
}
+ else if( (item->type_index == k_netmsg_playeritem_world0) ||
+ (item->type_index == k_netmsg_playeritem_world1) ){
+ relink_remote_player_worlds( item->client );
+ }
}
}
struct player_subsystem_interface *sys = player_subsystems[sysid];
if( sys->animator_size ){
- u32 size = sizeof(netmsg_playerframe)+sys->animator_size;
- netmsg_playerframe *frame = alloca(size);
+ u32 max_buf_size = sys->animator_size + sizeof(localplayer.sfx_buffer),
+ base_size = sizeof(struct netmsg_playerframe),
+ max_packet = base_size + max_buf_size;
+
+ netmsg_playerframe *frame = alloca( max_packet );
frame->inetmsg_id = k_inetmsg_playerframe;
- frame->client = 0;
+ frame->client = 0xff;
frame->subsystem = localplayer.subsystem;
+ frame->instance_id = world_static.active_instance;
+
+ bitpack_ctx ctx = {
+ .mode = k_bitpack_compress,
+ .buffer = frame->animdata,
+ .buffer_len = max_buf_size,
+ .bytes = 0
+ };
+
+ /* sfx
+ * ---------------------------------------------*/
+
+ frame->sound_effects = localplayer.sfx_buffer_count;
+ for( u32 i=0; i<localplayer.sfx_buffer_count; i ++ )
+ net_sfx_exchange( &ctx, &localplayer.sfx_buffer[i] );
+
+ /* animation
+ * -----------------------------------------------*/
+
frame->timestamp = vg.time_real;
- memcpy( frame->animdata, sys->animator_data, sys->animator_size );
+ frame->boundary_hash = localplayer.boundary_hash;
+ if( sys->network_animator_exchange )
+ sys->network_animator_exchange( &ctx, sys->animator_data );
+ else
+ bitpack_bytes( &ctx, sys->animator_size, sys->animator_data );
- netplayers.up_bytes += size;
+ u32 wire_size = base_size + ctx.bytes;
+ netplayers.up_bytes += wire_size;
SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
hSteamNetworkingSockets, network_client.remote,
- frame, size,
+ frame, wire_size,
k_nSteamNetworkingSend_Unreliable, NULL );
}
}
if( network_client.state == k_ESteamNetworkingConnectionState_Connected ){
ui_info( panel, "#-1: localplayer" );
- snprintf( buf, 512, "U%.1f/D%.1fkbs",
+ snprintf( buf, 512, "U%.3f/D%.3fkbs",
netplayers.up_kbs, netplayers.down_kbs );
ui_info( panel, buf );
struct interp_frame *f0,
struct interp_frame *f1 ){
+ struct network_player *player = &netplayers.list[ index ];
+
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 );
+ u8 instance_id = 0;
+
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 );
+ u16 bounds = f0->boundary_hash^f1->boundary_hash;
+
+ if( bounds & NETMSG_BOUNDARY_BIT )
+ t = 1.0f;
+
+ if( bounds & NETMSG_GATE_BOUNDARY_BIT ){
+ /* TODO: Extra work retransforming the root_co, instance_id.. etc */
+ t = 1.0f;
+ }
+
+ instance_id = f1->instance_id;
+
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 {
+ instance_id = f0->instance_id;
+
apply_full_skeleton_pose( &av->sk, &pose0, final_mtx );
+ memcpy( board_pose, &pose0.board, sizeof(*board_pose) );
+ }
+
+ if( instance_id ){
+ if( player->client_match ){
+ player->active_world = &world_static.instances[ instance_id ];
+ }
+ }
+ else{
+ if( player->hub_match ){
+ player->active_world = &world_static.instances[ instance_id ];
+ }
}
}
abs_max_frame = ifr;
}
}
- }
+ }
+
+ struct network_player *player = &netplayers.list[ index ];
+ player->active_world = NULL;
if( minframe && maxframe ){
pose_remote_player( index, minframe, maxframe );
SDL_AtomicLock( &addon_system.sl_cache_using_resources );
- for( u32 i=0; i<vg_list_size(netplayers.list); i ++ ){
+ 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;
struct player_avatar *av = localplayer.playeravatar;
m4x3f *final_mtx = &netplayers.final_mtx[ av->sk.bone_count*i ];
struct player_board *board =
addon_cache_item_if_loaded( k_addon_type_board,
player->board_view_slot );
-
- /* TODO: Board pose */
-#if 0
render_board( cam, world, board,
final_mtx[localplayer.playeravatar->id_board],
- &localplayer.pose.board,
+ &netplayers.board_poses[ i ],
k_board_shader_player );
-#endif
}
SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
}
+
+/* TODO: Which world is the player in
+ * nametags with occlusion
+ */
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff