X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_remote.c;h=8cbbed6eed8cab2983f47c48c940b37dd93205e9;hb=4f3f29420a3ae0253a195b9ca9a8ca7db67f0a7c;hp=f81cdf50ec3259a256a655a61aa24a3f9e68febf;hpb=d00cf977616e5d238c49fd42a1fc8c87200a8672;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_remote.c b/player_remote.c
index f81cdf5..8cbbed6 100644
--- a/player_remote.c
+++ b/player_remote.c
@@ -4,18 +4,56 @@
 #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;
 
@@ -31,13 +69,6 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
          /* 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;
@@ -57,7 +88,7 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
       
       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 );
       }
@@ -120,11 +151,68 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
       }
 
       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 ++ ){
+         struct net_sfx sfx;
+         net_sfx_exchange( &ctx, &sfx );
+
+         f64 t = (frame->timestamp - NETWORK_FRAMERATE) + 
+                 (sfx.subframe*NETWORK_FRAMERATE);
+
+         f32 remaining = t - ib->t;
+
+         if( remaining <= 0.0f )
+            net_sfx_play( &sfx );
+         else{
+            struct net_sfx *dst = NULL;
+
+            for( u32 j=0; j<NETWORK_SFX_QUEUE_LENGTH; j ++ ){
+               struct net_sfx *sj = &netplayers.sfx_queue[j];
+               if( sj->system == k_player_subsystem_invalid ){
+                  dst = sj;
+                  break;
+               }
+
+               if( sj->priority < sfx.priority )
+                  dst = sj;
+            }
+
+            *dst = sfx;
+            dst->subframe = remaining;
+         }
+      }
+      
+      /* 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;
    }
@@ -132,26 +220,46 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
       netmsg_playeritem *item = msg->m_pData;
       if( !packet_minsize( msg, sizeof(*item)+1 )) return;
 
-      vg_info( "Client #%u equiped: [%u] %s\n", 
-               item->client, item->type, item->uid );
+      if( item->client >= vg_list_size(netplayers.list) ){
+         vg_error( "inetmsg_playerframe: player index out of range\n" );
+         return;
+      }
+
+      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 );
+      }
    }
 }
 
@@ -165,19 +273,46 @@ static void remote_player_send_playerframe(void){
    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 );
    }
 }
@@ -205,6 +340,31 @@ static void remote_player_debug_update(void){
    }
 }
 
+static void remote_player_nametag( m4x4f pv, v3f co, const char *name ){
+   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
  */
@@ -249,7 +409,7 @@ static void remote_player_network_imgui( m4x4f pv ){
    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 );
 
@@ -265,30 +425,23 @@ static void remote_player_network_imgui( m4x4f pv ){
                       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 );
-            }
+            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" );
 }
 
 /*
@@ -298,18 +451,21 @@ static void pose_remote_player( u32 index,
                                 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 );
@@ -317,11 +473,38 @@ static void pose_remote_player( u32 index,
       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 ];
+      }
    }
 }
 
@@ -361,7 +544,10 @@ static void animate_remote_player( u32 index ){
             abs_max_frame = ifr;
          }
       }
-   } 
+   }
+
+   struct network_player *player = &netplayers.list[ index ];
+   player->active_world = NULL;
    
    if( minframe && maxframe ){
       pose_remote_player( index, minframe, maxframe );
@@ -396,9 +582,10 @@ static void render_remote_players( world_instance *world, camera *cam ){
 
    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 ];
@@ -413,15 +600,31 @@ static void render_remote_players( world_instance *world, camera *cam ){
       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 );
 }
+
+static void remote_players_init(void){
+   for( u32 i=0; i<NETWORK_SFX_QUEUE_LENGTH; i ++ ){
+      netplayers.sfx_queue[i].system = k_player_subsystem_invalid;
+   }
+}
+
+static void remote_sfx_pre_update(void){
+   for( u32 i=0; i<NETWORK_SFX_QUEUE_LENGTH; i ++ ){
+      struct net_sfx *si = &netplayers.sfx_queue[i];
+
+      if( si->system != k_player_subsystem_invalid ){
+         si->subframe -= vg.time_frame_delta;
+         if( si->subframe <= 0.0f ){
+            net_sfx_play( si );
+            si->system = k_player_subsystem_invalid;
+         }
+      }
+   }
+}