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

diff --git a/player_remote.c b/player_remote.c
index 7a85910..2234c6d 100644
--- a/player_remote.c
+++ b/player_remote.c
@@ -5,6 +5,8 @@
 #include "addon.h"
 #include "font.h"
 #include "gui.h"
+#include "ent_miniworld.h"
+#include "ent_region.h"
 
 static i32 k_show_own_name = 0;
 
@@ -175,7 +177,24 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
          .buffer_len = datasize,
          .bytes = 0,
       };
-         
+      
+      /* 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 ){
+         memset( &dest->data, 0, sys->animator_size );
+         sys->network_animator_exchange( &ctx, &dest->data );
+      }
+      else {
+         bitpack_bytes( &ctx, sys->animator_size, sys->animator_data );
+      }
 
       /* sfx
        * -------------------------------------------------------------*/
@@ -209,24 +228,6 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
             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 ){
-         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;
@@ -276,6 +277,29 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
          relink_remote_player_worlds( item->client );
       }
    }
+   else if( tmp->inetmsg_id == k_inetmsg_chat ){
+      netmsg_chat *chat = msg->m_pData;
+      
+      struct network_player *player = &netplayers.list[ chat->client ];
+      network_msgstring( chat->msg, msg->m_cbSize, sizeof(netmsg_chat),
+                         player->chat, NETWORK_MAX_CHAT );
+      player->chat_time = vg.time_real;
+      vg_info( "[%d]: %s\n", chat->client, player->chat );
+   }
+   else if( tmp->inetmsg_id == k_inetmsg_region ){
+      netmsg_region *region = msg->m_pData;
+      struct network_player *player = &netplayers.list[ region->client ];
+
+      u32 l = network_msgstring( 
+               region->loc, msg->m_cbSize, sizeof(netmsg_region),
+               player->region, NETWORK_REGION_MAX );
+      player->region_flags = region->flags;
+
+      if( l )
+         player->region_flags |= k_ent_region_flag_hasname;
+
+      player->effect_data.spark.colour = region_spark_colour(region->flags);
+   }
 }
 
 /*
@@ -305,13 +329,6 @@ static void remote_player_send_playerframe(void){
          .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 
        * -----------------------------------------------*/
 
@@ -322,6 +339,13 @@ static void remote_player_send_playerframe(void){
       else
          bitpack_bytes( &ctx, sys->animator_size, sys->animator_data );
 
+      /* 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] );
+
       u32 wire_size = base_size + ctx.bytes;
       netplayers.up_bytes += wire_size;
 
@@ -359,6 +383,20 @@ static void remote_player_debug_update(void){
  * Debugging information
  */
 static void remote_player_network_imgui( m4x4f pv ){
+   if( network_client.user_intent == k_server_intent_online ){
+      if( !(steam_ready &&
+         (network_client.state == k_ESteamNetworkingConnectionState_Connected)))
+      {
+         char buf[128];
+         vg_str str;
+         vg_strnull( &str, buf, sizeof(buf) );
+         u32 fg = 0;
+         network_status_string( &str, &fg );
+         ui_text( (ui_rect){ vg.window_x - 200, 0, 200, 48 }, buf, 1, 
+                  k_ui_align_middle_center, fg );
+      }
+   }
+
    if( !network_client.network_info ) 
       return;
 
@@ -422,6 +460,11 @@ static void remote_player_network_imgui( m4x4f pv ){
    }
 }
 
+static void remote_player_effect( struct network_player *player, 
+                                  player_pose *final_pose ){
+   /* effects */
+}
+
 /*
  * write the remote players final_mtx 
  */
@@ -439,6 +482,9 @@ static void pose_remote_player( u32 index,
    struct player_subsystem_interface *sys0 = player_subsystems[f0->subsystem],
                                      *sys1 = NULL;
 
+   struct player_board *board = 
+      addon_cache_item_if_loaded( k_addon_type_board, player->board_view_slot );
+
    player_pose pose0, pose1, posed;
    sys0->pose( &f0->data, &pose0 );
 
@@ -462,15 +508,28 @@ static void pose_remote_player( u32 index,
       }
 
       instance_id = f1->instance_id;
-
       lerp_player_pose( &pose0, &pose1, t, &posed );
+      effect_blink_apply( &player->effect_data.blink, &posed, vg.time_delta );
+
       apply_full_skeleton_pose( sk, &posed, final_mtx );
+
+      if( t < 0.5f ){
+         if( sys0->effects ) 
+            sys0->effects( &f0->data, final_mtx, board, &player->effect_data );
+      }
+      else{
+         if( sys1->effects ) 
+            sys1->effects( &f1->data, final_mtx, board, &player->effect_data );
+      }
+
       memcpy( board_pose, &posed.board, sizeof(*board_pose) );
    }
    else {
       instance_id = f0->instance_id;
-
+      effect_blink_apply( &player->effect_data.blink, &pose0, vg.time_delta );
       apply_full_skeleton_pose( sk, &pose0, final_mtx );
+      if( sys0->effects ) 
+         sys0->effects( &f0->data, final_mtx, board, &player->effect_data );
       memcpy( board_pose, &pose0.board, sizeof(*board_pose) );
    }
 
@@ -517,7 +576,8 @@ static void animate_remote_player( u32 index ){
    }
 
    struct network_player *player = &netplayers.list[ index ];
-   player->active_world = NULL;
+   if( player->active != 2 )
+      player->active_world = NULL;
    
    if( minframe && maxframe ){
       pose_remote_player( index, minframe, maxframe );
@@ -556,6 +616,8 @@ static void render_remote_players( world_instance *world, camera *cam ){
       struct network_player *player = &netplayers.list[i];
       if( !player->active || player->isblocked ) continue;
       if( player->active_world != world ) continue;
+      if( !player->isfriend && 
+            (world-world_static.instances == k_world_purpose_hub)) continue;
       
       m4x3f *final_mtx = &netplayers.final_mtx[ sk->bone_count*i ];
 
@@ -580,12 +642,17 @@ 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->active = (vg_randu32() & 0x1)? 2: 0;
       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;
 
+      if( player->world_match[0] )
+         player->active_world = &world_static.instances[0];
+      else
+         player->active_world = NULL;
+
       for( int i=0; i<sizeof(player->username)-1; i ++ ){
          player->username[i] = 'a' + (vg_randu32() % 30);
          player->username[i+1] = '\0';
@@ -601,8 +668,8 @@ static int remote_players_randomize( int argc, const char *argv[] ){
       v3f pos;
 
       vg_rand_sphere( pos );
-      v3_muls( pos, 100.0f,
-               netplayers.final_mtx[ i*localplayer.skeleton.bone_count][3] );
+      v3_muladds( localplayer.rb.co, pos, 100.0f,
+                  netplayers.final_mtx[ i*localplayer.skeleton.bone_count][3] );
    }
 
    return 0;
@@ -631,21 +698,27 @@ static void remote_sfx_pre_update(void){
    }
 }
 
+/*
+ * animator->root_co of remote player
+ */
+static void remote_player_position( int id, v3f out_co ){
+   struct skeleton *sk = &localplayer.skeleton;
+   m4x3f *final_mtx = &netplayers.final_mtx[ sk->bone_count*id ];
+   v3_copy( final_mtx[0][3], out_co );
+}
+
 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
+/*
+ * Given players' root_co, get the screen point where we should draw tag info.
  */
-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;
+static int player_tag_position( m4x4f pv, v3f root_co, ui_point out_point ){
    v4f wpos;
-   v3_copy( co, wpos );
+   v3_copy( root_co, wpos );
    wpos[1] += 2.0f;
    wpos[3] = 1.0f;
 
@@ -654,54 +727,100 @@ static void remote_player_nametag( m4x4f pv, v3f co, const char *name,
    if( wpos[3] > 0.0f ){
       v2_muls( wpos, (1.0f/wpos[3]) * 0.5f, wpos );
       v2_add( wpos, (v2f){ 0.5f, 0.5f }, wpos );
+
+      float k_max = 32000.0f;
       
-      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;
+      out_point[0] = vg_clampf(wpos[0] * vg.window_x, -k_max, k_max );
+      out_point[1] = vg_clampf((1.0f-wpos[1]) * vg.window_y, -k_max, k_max );
+      return 1;
+   }
+   else
+      return 0;
+}
 
-         if( cols ){
-            f32 w = (f32)wr[2] / (f32)cols;
-            cols = 0;
+/*
+ * Draw chat box relative to the root tag position on the screen
+ */
+static void chat_box( ui_point tag_root, f64 time, const char *message ){
+   if( (vg.time_real - time) > 15.0 ) 
+      return;
 
-            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 };
+   ui_rect wr;
+   wr[2] = ui_text_line_width( message ) + 8;
+   wr[3] = vg_ui.font->glyph_height + 2;
+   wr[0] = tag_root[0]-(wr[2]/2);
+   wr[1] = tag_root[1] - wr[3] - 8;
 
-                  vg_strnull( &str, buf, 32 );
-                  vg_strcatch( &str, (char)k_SRglyph_ps4_circle );
-                  vg_strcati32( &str, medals[i] );
+   ui_fill( wr, ui_opacity( ui_colour(k_ui_bg), 0.23f ) );
+   ui_text( wr, message, 1, k_ui_align_middle_center, 0 );
+}
 
-                  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 ++;
-               }
-            }
+/*
+ * Draw full imgui for remote player
+ */
+static void remote_player_nametag( ui_point tag_root, 
+                                   struct network_player *player ){
+   vg_ui.font = &vg_ui_font_big;
+
+   ui_rect wr;
+   wr[2] = VG_MAX( ui_text_line_width( player->username ), 140 ) + 8;
+   wr[3] = 32;
+   wr[0] = tag_root[0]-(wr[2]/2);
+   wr[1] = tag_root[1]-(wr[3]/2);
+
+   ui_fill( wr, ui_opacity( ui_colour(k_ui_bg), 0.23f ) );
+   ui_text( wr, player->username, 1, k_ui_align_middle_center, 0 );
+
+   vg_ui.font = &vg_ui_font_small;
+
+   /* medals */
+   int cols = 0;
+   for( int i=0; i<3; i ++ )
+      if( player->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( player->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_vg_circle );
+            vg_strcati32( &str, player->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 ++;
          }
       }
+   }
+}
 
+static void remote_player_world_gui( m4x4f pv, v3f root_co, 
+                                     struct network_player *player  ){
+   ui_point tag_root;
+   if( !player_tag_position( pv, root_co, tag_root ) )
+      return;
+
+   if( player ){
+      remote_player_nametag( tag_root, player );
+      chat_box( tag_root, player->chat_time, player->chat );
+   }
+   else {
+      if( netplayers.chatting )
+         chat_box( tag_root, vg.time_real, netplayers.chat_buffer );
+      else
+         chat_box( tag_root, netplayers.chat_time, netplayers.chat_message );
    }
-   vg_ui.font = &vg_ui_font_small;
 }
 
 static void remote_player_gui_info( ui_rect box, 
@@ -723,7 +842,12 @@ static void remote_player_gui_info( ui_rect box,
    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 );
+   u32 fg;
+   
+   if( type == k_remote_player_gui_type_friend )
+      fg = ui_colour( k_ui_yellow + (in_world? k_ui_brighter: 0) );
+   else
+      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 );
@@ -733,15 +857,20 @@ static void remote_player_gui_info( ui_rect box,
 }
 
 static void remote_players_imgui_lobby(void){
-    /*
-    * TODO: send location string over the network */
+   if( network_client.user_intent == k_server_intent_online ){
+      if( !(steam_ready &&
+         (network_client.state == k_ESteamNetworkingConnectionState_Connected)))
+      {
+         return;
+      }
+   }
 
    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 );
+            "In World", 1, k_ui_align_middle_center, 0 );
    vg_ui.font = &vg_ui_font_small;
 
 
@@ -754,25 +883,121 @@ static void remote_players_imgui_lobby(void){
    for( u32 i=0; i<NETWORK_MAX_PLAYERS; i ++ ){
       struct network_player *player = &netplayers.list[i];
       if( !player->active || player->isblocked ) continue;
+
+      int in_same_world = player->active_world == world_current_instance();
+      if( !player->isfriend && !in_same_world )
+         continue;
+
+      const char *location = in_same_world? "": "another world";
+      if( player->region_flags & k_ent_region_flag_hasname ){
+         location = player->region;
+      }
       
       ui_rect box = { x, y, width, height };
-      remote_player_gui_info( 
-            box, player->username, "<null>", 
-            player->isfriend,
-            player->world_match[ world_static.active_instance ] );
+      remote_player_gui_info( box, player->username, location,
+                              player->isfriend, in_same_world );
       y += height + gap;
    }
 }
 
 static void remote_players_imgui_world( world_instance *world, m4x4f pv,
-                                        f32 max_dist ){
+                                        f32 max_dist, int geo_cull ){
+   ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y );
+
    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 );
+         v3f co;
+         remote_player_position( i, co );
+
+         if( !player->active_world )
+            continue;
+         if( !player->isfriend && 
+               (world-world_static.instances == k_world_purpose_hub)) continue;
+
+         /* their in our active subworld */
+         if( player->active_world != world ){
+            m4x3_mulv( global_miniworld.mmdl, co, co );
+            co[1] -= 2.0f; /* HACK lol */
+         }
+
+         f32 d2 = v3_dist2( co, localplayer.rb.co );
+
+         if( d2 > (max_dist*max_dist) )
+            continue;
+
+         f32 dist = sqrtf(d2);
+         f32 opacity = 0.95f * sqrtf(((max_dist-dist)/max_dist));
+
+         if( geo_cull ){
+            ray_hit hit;
+            hit.dist = dist;
+
+            v3f dir;
+            v3_sub( co, skaterift.cam.pos, dir );
+            v3_normalize( dir );
+
+            if( ray_world( world, skaterift.cam.pos, dir, &hit, 
+                           k_material_flag_ghosts ) ){
+               opacity *= 0.5f;
+            }
+         }
+
+         player->opacity = vg_lerpf( player->opacity, opacity,
+                                     vg.time_frame_delta * 2.0f );
+         
+         remote_player_world_gui( pv, co, player );
+
+         vg_ui.colour[3] = player->opacity;
+         ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y );
+      }
+   }
+
+   vg_ui.colour[3] = 1.0f;
+
+   remote_player_world_gui( pv, localplayer.rb.co, NULL );
+   ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y );
+}
+
+static void chat_escape(void){
+   netplayers.chatting = -1;
+}
+
+static void chat_enter( char *buf, u32 len ){
+   vg_strncpy( buf, netplayers.chat_message, NETWORK_MAX_CHAT, 
+               k_strncpy_always_add_null );
+   netplayers.chatting = -1;
+   netplayers.chat_time = vg.time_real;
+   chat_send_message( buf );
+}
+
+static void remote_players_chat_imgui(void){
+   if( netplayers.chatting == 1 ){
+      ui_rect box = { 0, 0, 400, 40 },
+              window = { 0, 0, vg.window_x, vg.window_y };
+      ui_rect_center( window, box );
+
+      struct ui_textbox_callbacks callbacks = {
+         .enter = chat_enter,
+         .escape = chat_escape
+      };
+
+      ui_textbox( box, NULL, 
+                  netplayers.chat_buffer, NETWORK_MAX_CHAT, 1,
+                  UI_TEXTBOX_AUTOFOCUS, &callbacks );
+   }
+   else {
+      if( netplayers.chatting == -1 ){
+         netplayers.chatting = 0;
+         srinput.state = k_input_state_resume;
+      }
+      else {
+         if( (skaterift.activity == k_skaterift_default) && 
+               button_down( k_srbind_chat ) ){
+            netplayers.chatting = 1;
+            netplayers.chat_buffer[0] = '\0';
+            srinput.state = k_input_state_pause;
+         }
       }
    }
 }