X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_remote.c;h=7a85910d2781edd3a03c45bddd0ccaf26aa557e0;hb=4fa9aa9a1e09940e91cc30e171e3de0606515ef3;hp=cfad5e9018d236280207831ffc020eeeaa03095f;hpb=5388f705086600105358d9880e8895673ac0e247;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_remote.c b/player_remote.c
index cfad5e9..7a85910 100644
--- a/player_remote.c
+++ b/player_remote.c
@@ -3,6 +3,10 @@
 #include "player_render.h"
 #include "network_common.h"
 #include "addon.h"
+#include "font.h"
+#include "gui.h"
+
+static i32 k_show_own_name = 0;
 
 static void player_remote_clear( struct network_player *player ){
    addon_cache_unwatch( k_addon_type_player, player->playermodel_view_slot );
@@ -20,24 +24,24 @@ static void player_remote_clear( struct network_player *player ){
 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 );
+   addon_alias q[2];
+   addon_uid_to_alias( player->items[k_netmsg_playeritem_world0], &q[0] );
+   addon_uid_to_alias( player->items[k_netmsg_playeritem_world1], &q[1] );
 
    /*
     * 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;
+   for( u32 i=0; i<k_world_max; i++ ){
+      addon_reg *reg = world_static.instance_addons[ i ];
 
-   if( world_static.addon_client )
-      if( addon_alias_eq( &q1, &world_static.addon_client->alias ) )
-         player->client_match = 1;
+      player->world_match[i] = 0;
+
+      if( reg ){
+         if( addon_alias_eq( &q[i], &world_static.instance_addons[i]->alias ) )
+            player->world_match[i] = 1;
+      }
+   }
 }
 
 /* 
@@ -54,6 +58,14 @@ static void relink_all_remote_player_worlds(void){
    }
 }
 
+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;
 
@@ -65,6 +77,8 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
          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;
@@ -76,7 +90,8 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
             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" );
@@ -151,29 +166,66 @@ 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 ];
-
       struct player_subsystem_interface *sys = 
          player_subsystems[ frame->subsystem ];
 
       if( sys->network_animator_exchange ){
-         bitpack_ctx ctx = {
-            .mode = k_bitpack_decompress,
-            .buffer = frame->animdata,
-            .buffer_len = datasize,
-            .bytes = 0,
-         };
-         
          memset( &dest->data, 0, sys->animator_size );
          sys->network_animator_exchange( &ctx, &dest->data );
       }
       else {
-         memcpy( &dest->data, frame->animdata, datasize );
+         bitpack_bytes( &ctx, sys->animator_size, sys->animator_data );
       }
 
       player->subsystem = frame->subsystem;
@@ -236,35 +288,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 = 0xff;
       frame->subsystem = localplayer.subsystem;
-      frame->timestamp = vg.time_real;
-      frame->boundary_hash = localplayer.boundary_hash;
       frame->instance_id = world_static.active_instance;
 
-      if( sys->network_animator_exchange ){
-         bitpack_ctx ctx = {
-            .mode = k_bitpack_compress,
-            .buffer = frame->animdata,
-            .buffer_len = size,
-            .bytes = 0,
-         };
-         
+      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;
+      frame->boundary_hash = localplayer.boundary_hash;
+      if( sys->network_animator_exchange )
          sys->network_animator_exchange( &ctx, sys->animator_data );
-         size = ctx.bytes;
-      }
-      else{
-         memcpy( frame->animdata, sys->animator_data, sys->animator_size );
-      }
+      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 );
    }
 }
@@ -336,7 +399,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 );
 
@@ -351,25 +414,6 @@ static void remote_player_network_imgui( m4x4f pv ){
             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 );
-            }
          }
       }
    }
@@ -388,8 +432,8 @@ static void pose_remote_player( u32 index,
    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],
@@ -420,26 +464,18 @@ static void pose_remote_player( u32 index,
       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) );
    }
 
-   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 ];
-      }
-   }
+   if( player->world_match[ instance_id ] )
+      player->active_world = &world_static.instances[ instance_id ];
 }
 
 /* 
@@ -513,36 +549,230 @@ static void animate_remote_players(void){
  * Draw remote players
  */
 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 );
 }
 
-/* TODO: Which world is the player in
- *       nametags with occlusion
+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;
+      }
+
+      for( int i=0; i<3; i ++ ){
+         player->medals[i] = vg_randu32() % 3;
+      }
+
+      v3f pos;
+
+      vg_rand_sphere( pos );
+      v3_muls( pos, 100.0f,
+               netplayers.final_mtx[ i*localplayer.skeleton.bone_count][3] );
+   }
+
+   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 ++ ){
+      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;
+         }
+      }
+   }
+}
+
+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 );
+      }
+   }
+}