X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=8aa061bb85ce3a183d4d245d521a750c1b0f771d;hb=b35ac7383d4aba1d0b8a74be7bf1695996ff57f4;hp=0e1f85221bbb9cd8abbcb03c1992af2e822664b9;hpb=2179a91415c4d0726fd134ad942acfc0515844eb;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 0e1f852..8aa061b 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -57,7 +57,6 @@
 #include "player_remote.c"
 #include "vg/vg_audio_dsp.h"
 
-static struct player_avatar localplayer_avatar;
 static int k_tools_mode = 0;
 
 int main( int argc, char *argv[] ){
@@ -84,8 +83,6 @@ static void vg_launch_opt(void){
 }
 
 static void vg_preload(void){
-   //skaterift_read_savedata();
-
 vg_info(" Copyright  .        . .       -----, ,----- ,---.   .---.  \n" );
 vg_info(" 2021-2023  |\\      /| |           /  |      |    | |    /| \n" );
 vg_info("            | \\    / | +--        /   +----- +---'  |   / | \n" );
@@ -94,12 +91,13 @@ vg_info("            |   \\/   | |        /     |      |    \\ | /   | \n" );
 vg_info("            '        ' '--' [] '----- '----- '     ' '---'  " 
         "SOFTWARE\n" );
 
+   vg_loader_step( remote_players_init, NULL );
+
    if( k_tools_mode )
       return;
 
    steam_init();
    vg_loader_step( NULL, steam_end );
-   vg_loader_step( remote_players_init, NULL );
    vg_loader_step( network_init, network_end );
 }
 
@@ -217,14 +215,7 @@ static void vg_load(void){
    skaterift.replay.size = bytes;
    replay_clear( &skaterift.replay );
 
-   player_avatar_load( &localplayer_avatar, "models/ch_none.mdl" );
-   player__use_avatar( &localplayer_avatar );
-
-   /* FIXME FIXME FIXME FIXME FIXME */
-   u32 mtx_size = sizeof(m4x3f)*localplayer_avatar.sk.bone_count;
-   localplayer.final_mtx = vg_linear_alloc( vg_mem.rtmemory, mtx_size );
-   netplayers.final_mtx = vg_linear_alloc( vg_mem.rtmemory, 
-                                           mtx_size*NETWORK_MAX_PLAYERS );
+   player_load_animation_reference( "models/ch_none.mdl" );
 
    player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
    player__bind();
@@ -678,7 +669,12 @@ static void vg_gui(void){
    workshop_form_gui();
    render_view_framebuffer_ui();
    remote_player_network_imgui( vg.pv );
-   remote_players_imgui();
+
+
+   remote_players_imgui_world( world_current_instance(), vg.pv, INFINITY );
+   if( skaterift.activity == k_skaterift_respawning ){
+      remote_players_imgui_lobby();
+   }
 }