X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=f089f79be657241387e807c4e5e1f2f884081615;hb=730f202673d6ceb2a5199cf244d5c0bddc064fcf;hp=7f384f63780f276d71178e17cb8d001a638e2f7f;hpb=46f4e9ee87dc67402166e4c6b05efbe922cd7574;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 7f384f6..f089f79 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -201,6 +201,12 @@ static void vg_load(void){
 
    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*32 );
+
    player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
    player__bind();
 
@@ -276,7 +282,7 @@ static void vg_load(void){
    skaterift_restore_state();
    vg_loader_step( NULL, skaterift_autosave_synchronous );
 
-   board_processview_thread(NULL);
+   //board_processview_thread(NULL);
    vg_async_call( async_call_ready, NULL, 0 );
 }
 
@@ -301,6 +307,7 @@ static void vg_pre_update(void){
       skaterift_change_client_world_preupdate();
 
    draw_origin_axis();
+   skateshop_autostart_loading();
    network_update();
 
    /* time rate */
@@ -481,6 +488,7 @@ static void render_scene(void){
       render_water_texture( view_world, &skaterift.cam, 0 );
       render_fb_bind( gpipeline.fb_main, 1 );
       render_water_surface( view_world, &skaterift.cam );
+      render_remote_players( view_world, &skaterift.cam );
    }
 }
 
@@ -538,6 +546,7 @@ static void render_main_game(void){
       player__animate();
       skaterift_record_frame( &skaterift.replay, 0 );
    }
+   animate_remote_players();
    player__pre_render();
 
    skaterift_composite_maincamera();
@@ -636,7 +645,7 @@ static void vg_gui(void){
    skaterift_replay_imgui();
    workshop_form_gui();
    render_view_framebuffer_ui();
-   remote_player_network_imgui();
+   remote_player_network_imgui( vg.pv );
 }