basic replayable replays
[carveJwlIkooP6JGAAIwe30JlM.git] / skaterift.c
index c036a50188582ff0805abe0ea6ba52c4587d5505..3fec7e0e6a3161ab4dd792aecb223909cc0ede9c 100644 (file)
  * =============================================================================
  */
 
+#if 1
+
 #define SR_NETWORKED
 #define VG_DEVWINDOW
-#include "common.h"
-#include "conf.h"
+
+/* 
+ *     system headers
+ * --------------------- */
+
+#include "skaterift.h"
 #include "steam.h"
 #include "render.h"
 #include "audio.h"
-#include "world.h"
-#include "font.h"
 
+#include "world.h"
 
+#include "font.h"
 #include "player.h"
-static player_instance localplayer;
-VG_STATIC struct player_avatar localplayer_avatar;
-VG_STATIC glmesh localplayer_meshes[3];
-vg_tex2d localplayer_texture = { .path = "textures/ch_gradient.qoi" };
-
-player_instance *tmp_localplayer(void)
-{
-   return &localplayer;
-}
 
 #include "network.h"
 #include "menu.h"
 #include "vehicle.h"
+#include "pointcloud.h"
+#include "save.h"
+
+/*    unity build
+ * ----------------- */
+
+#include "world.c"
+#include "player.c"
+#include "vehicle.c"
+#include "entity.c"
+#include "workshop.c"
+#include "addon.c"
+#include "highscores.c"
+#include "save.c"
 
-static int cl_ui      = 1,
-           cl_light_edit = 0;
+static struct player_avatar localplayer_avatar;
 
 int main( int argc, char *argv[] )
 {
    vg_mem.use_libc_malloc = 0;
    vg_set_mem_quota( 160*1024*1024 );
    vg_enter( argc, argv, "Voyager Game Engine" ); 
-
    return 0;
 }
 
-VG_STATIC void highscores_save_at_exit(void)
-{
-   highscores_serialize_all();
-}
-
 VG_STATIC void vg_launch_opt(void)
 {
-
-}
-
-VG_STATIC int __kill( int argc, const char *argv[] )
-{
-#if 0
-   player_use_device( &localplayer, &player_device_dead, &localplayer_dead );
-#endif
-   return 0;
-}
-
-VG_STATIC int __respawn( int argc, const char *argv[] )
-{
-   ent_spawn *rp = NULL, *r;
-   world_instance *world = get_active_world();
-
-   if( argc == 1 ){
-      for( u32 i=0; i<mdl_arrcount(&world->ent_spawn); i++ ){
-         r = mdl_arritm( &world->ent_spawn, i );
-         if( !strcmp( mdl_pstr(&world->meta, r->pstr_name),argv[0] ) ){
-            rp = r;
-            break;
-         }
-      }
-
-      if( !rp )
-         vg_warn( "No spawn named '%s'\n", argv[0] );
-   }
-
-   if( !rp ){
-      float min_dist = INFINITY;
-
-      for( u32 i=0; i<mdl_arrcount(&world->ent_spawn); i++ ){
-         r = mdl_arritm( &world->ent_spawn, i );
-         float d = v3_dist2( r->transform.co, localplayer.rb.co );
-         
-         if( d < min_dist ){
-            min_dist = d;
-            rp = r;
-         }
-      }
-   }
-
-   if( !rp ){
-      vg_error( "No spawn found\n" );
-
-      if( !mdl_arrcount(&world->ent_spawn) )
-         return 0;
-
-      rp = mdl_arritm( &world->ent_spawn, 0 );
-   }
-
-   player__spawn( &localplayer, rp );
-   return 1;
 }
 
 VG_STATIC void vg_preload(void)
 {
-   g_conf_init();
-
-   common_var_temp();
-
-   vg_var_push( (struct vg_var){
-      .name = "cl_ui",
-      .data = &cl_ui,
-      .data_type = k_var_dtype_i32,
-      .opt_i32 = { .min=0, .max=1, .clamp=1 },
-      .persistent = 0
-   });
-
-   vg_var_push( (struct vg_var){
-      .name = "ledit",
-      .data = &cl_light_edit,
-      .data_type = k_var_dtype_i32,
-      .opt_i32 = { .min=0, .max=1, .clamp=1 },
-      .persistent = 0
-   });
-
-   vg_function_push( (struct vg_cmd) {
-      .name = "respawn",
-      .function = __respawn,
-      //.poll_suggest = reset_player_poll
-   });
-
-   vg_function_push( (struct vg_cmd) {
-      .name = "ded",
-      .function = __kill,
-      //.poll_suggest = reset_player_poll
-   });
+   skaterift_read_savedata();
 
 vg_info(" Copyright  .        . .       -----, ,----- ,---.   .---.  \n" );
-vg_info(" 2021-2022  |\\      /| |           /  |      |    | |    /| \n" );
+vg_info(" 2021-2023  |\\      /| |           /  |      |    | |    /| \n" );
 vg_info("            | \\    / | +--        /   +----- +---'  |   / | \n" );
 vg_info("            |  \\  /  | |         /    |      |   \\  |  /  | \n" );
 vg_info("            |   \\/   | |        /     |      |    \\ | /   | \n" );
 vg_info("            '        ' '--' [] '----- '----- '     ' '---'  " 
         "SOFTWARE\n" );
 
-   highscores_init( 2000, 50 );
-   if( !highscores_read() )
-      highscores_create_db();
-
-   vg_loader_step( NULL, highscores_save_at_exit );
-
    steam_init();
    vg_loader_step( NULL, steam_end );
    vg_loader_step( network_init, network_end );
@@ -167,75 +81,105 @@ vg_info("            '        ' '--' [] '----- '----- '     ' '---'  "
 
 VG_STATIC void load_playermodels(void)
 {
-   vg_linear_clear( vg_mem.scratch );
-
-   /* 
-    * load in other player models. This may need to be more sophisticated in
-    * the futre if we have more of these guys
-    */
-   mdl_context ctx_default,
-               ctx_outlaw,
-               ctx_jordan;
-
-   mdl_open( &ctx_default, "models/ch_new.mdl", vg_mem.scratch );
-   mdl_load_metadata_block( &ctx_default, vg_mem.scratch );
-   mdl_load_mesh_block( &ctx_default, vg_mem.scratch );
-   mdl_close( &ctx_default );
-
-   mdl_open( &ctx_outlaw, "models/ch_outlaw.mdl", vg_mem.scratch );
-   mdl_load_metadata_block( &ctx_outlaw, vg_mem.scratch );
-   mdl_load_mesh_block( &ctx_outlaw, vg_mem.scratch );
-   mdl_close( &ctx_outlaw );
-
-   mdl_open( &ctx_jordan, "models/ch_jordan.mdl", vg_mem.scratch );
-   mdl_load_metadata_block( &ctx_jordan, vg_mem.scratch );
-   mdl_load_mesh_block( &ctx_jordan, vg_mem.scratch );
-   mdl_close( &ctx_jordan );
-   
-   vg_acquire_thread_sync();
-   {
-      mdl_unpack_glmesh( &ctx_default, &localplayer_meshes[0] );
-      mdl_unpack_glmesh( &ctx_outlaw,  &localplayer_meshes[1] );
-      mdl_unpack_glmesh( &ctx_jordan,  &localplayer_meshes[2] );
-   }
-   vg_release_thread_sync();
-
    /* FIXME: hack */
    shader_model_character_view_register();
-   vg_acquire_thread_sync();
-   {
-      vg_tex2d_init( (vg_tex2d *[]){ &localplayer_texture }, 1 );
-   }
-   vg_release_thread_sync();
+   shader_model_board_view_register();
+   shader_model_entity_register();
+}
+
+VG_STATIC void async_skaterift_player_start( void *payload, u32 size ){
+   localplayer.viewable_world = world_current_instance();
+   localplayer_cmd_respawn( 1, (const char *[]){ "start" } );
 }
 
-void temp_update_playermodel(void){
-   player__use_mesh( &localplayer, &localplayer_meshes[cl_playermdl_id] );
+static void async_call_ready( void *payload, u32 size ){
+   skaterift.op = k_async_op_none;
+}
+
+static void skaterift_restore_state(void){
+   vg_msg sav = {0};
+   sav.buf = savedata.buf;
+   sav.len = savedata.len;
+   sav.max = sizeof(savedata.buf);
+
+   vg_msg player = sav;
+   if( vg_msg_seekframe( &player, "player", 0 ) ){
+      addon_alias q;
+
+      /* board */
+      skaterift_read_addon_alias( &player, "board", k_addon_type_board, &q );
+      u32 reg_id = addon_match( &q );
+      if( reg_id != 0xffffffff ){
+         localplayer.board_view_slot = 
+            addon_cache_create_viewer( k_addon_type_board, reg_id );
+      }
+
+      /* playermodel */
+      skaterift_read_addon_alias( &player, "playermodel", 
+                                  k_addon_type_player, &q );
+      reg_id = addon_match( &q );
+
+      if( reg_id == 0xffffffff ) reg_id = 0;
+      localplayer.playermodel_view_slot = 
+         addon_cache_create_viewer( k_addon_type_player, reg_id );
+   }
+
+   vg_msg world = sav;
+   if( vg_msg_seekframe( &world, "world", 0 ) ){
+      addon_alias q;
+
+      /* world */
+      skaterift_read_addon_alias( &world, "alias", k_addon_type_world, &q );
+      u32 reg_id = addon_match( &q );
+      if( reg_id != 0xffffffff ){
+         addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
+
+         world_loader.generate_point_cloud = 0;
+         world_loader.reg = reg;
+         world_loader.state = k_world_loader_load;
+         skaterift_world_changer_thread(NULL);
+
+         world_static.active_world = vg_msg_seekkvu32( &world, "index", 0 );
+         world_static.active_trigger_volume_count = 0;
+         localplayer.viewable_world = world_current_instance();
+
+         vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 );
+         v3f pos;
+         vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos );
+         player__setpos( &localplayer, pos );
+      }
+   }
 }
 
 VG_STATIC void vg_load(void)
 {
+   vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL );
+
    vg_loader_step( render_init, NULL );
    vg_loader_step( menu_init, NULL );
+   vg_loader_step( pointcloud_init, NULL );
    vg_loader_step( world_init, NULL );
+   vg_loader_step( vehicle_init, NULL );
    vg_loader_step( font3d_init, NULL );
+   vg_loader_step( gui_init, NULL );
 
-   font3d_load( &world_global.font, "models/rs_font.mdl", vg_mem.rtmemory );
+   vg_loader_step( player_init, NULL );
+   vg_loader_step( player_ragdoll_init, NULL );
 
-   //vg_loader_step( player_init, NULL );
-   //vg_loader_step( vehicle_init, NULL );
-   //
-   //vg_loader_step( player_model_init, NULL );
+   /* content stuff */
+   vg_loader_step( addon_system_init, NULL );
+   vg_loader_step( workshop_init, NULL );
+   vg_loader_step( skateshop_init, NULL );
    
    /* ----------------- */
    vg_loader_step( load_playermodels, NULL );
   
    /* player setup */
+   local_replay_init( (1024*1024*1)/2 );
    player__create( &localplayer );
-   player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" );
+   player_avatar_load( &localplayer_avatar, "models/ch_none.mdl" );
    player__use_avatar( &localplayer, &localplayer_avatar );
-   player__use_mesh( &localplayer, &localplayer_meshes[cl_playermdl_id] );
-   player__use_texture( &localplayer, &localplayer_texture );
+   player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
    player__bind( &localplayer );
 
    /* --------------------- */
@@ -244,24 +188,72 @@ VG_STATIC void vg_load(void)
    vg_loader_step( audio_init, audio_free );
 
    /* 'systems' are completely loaded now */
+   
+   /* load home/permanent world manually */
+   world_loader.reg = NULL;
+   strcpy( world_loader.override_name, "mp_spawn" );
+   world_loader.generate_point_cloud = 1;
+   world_loader.world_index = 0;
+   world_load_mdl( "maps/mp_spawn/main.mdl" );
+
+   vg_async_call( async_skaterift_player_start, NULL, 0 );
+   vg_async_stall();
+
+   /* Completing addon registrations
+    * -------------------------------------
+    */
 
-   /* load home world */
-   world_load( &world_global.worlds[0], "maps/mp_gridmap.mdl" );
-   //world_load( &world_global.worlds[0], "maps/mp_mtzero.mdl" );
+   /* understate diy. */
+   addon_reg *spawn = addon_mount_local_addon( "maps/mp_spawn", 
+                                                k_addon_type_world, 
+                                                ".mdl" );
+   {
+      vg_msg msg = {0};
+      msg.buf = spawn->metadata;
+      msg.max = sizeof(spawn->metadata);
+      vg_msg_frame( &msg, "workshop" );
+      vg_msg_wkvstr( &msg, "title", "Understate DIY" );
+      vg_msg_end_frame( &msg );
+      vg_msg_wkvstr( &msg, "location", "USA" );
+      spawn->metadata_len = msg.cur;
+   }
 
-#if 0
-   world_load( &world_global.worlds[1], "maps/mp_gridmap.mdl" );
-   world_link_nonlocal_gates( 0, 1 );
-   world_load( &world_global.worlds[2], "maps/mp_mtzero.mdl" );
-   world_link_nonlocal_gates( 0, 2 );
-#endif
+   /* mtzero island */
+   addon_reg *mtzero = addon_mount_local_addon( "maps/mp_mtzero",
+                                                k_addon_type_world,
+                                                ".mdl" );
+   {
+      vg_msg msg = {0};
+      msg.buf = mtzero->metadata;
+      msg.max = sizeof(mtzero->metadata);
+      vg_msg_frame( &msg, "workshop" );
+      vg_msg_wkvstr( &msg, "title", "Mt.Zero Island" );
+      vg_msg_end_frame( &msg );
+      vg_msg_wkvstr( &msg, "location", "Australia" );
+      mtzero->metadata_len = msg.cur;
+   }
 
-   vg_console_load_autos();
-}
+   global_skateshop.selected_world_id=1;
+   global_skateshop.pointcloud_world_id=1;
+   skateshop_world_preview_loader_thread( mtzero ); /* HACK */
 
-VG_STATIC void vg_start(void)
-{
-   __respawn( 1, (const char *[]){ "start" } );
+   vg_console_load_autos();
+   menu_link();
+
+   addon_mount_content_folder( k_addon_type_player, 
+                               "playermodels", ".mdl" );
+   addon_mount_content_folder( k_addon_type_board, "boards", ".mdl" );
+   addon_mount_content_folder( k_addon_type_world, "maps", ".mdl" );
+   addon_mount_workshop_items();
+   vg_async_call( async_addon_reg_update, NULL, 0 );
+   vg_async_stall();
+
+   /* and now */
+   skaterift_restore_state();
+   vg_loader_step( NULL, skaterift_write_savedata );
+
+   board_processview_thread(NULL);
+   vg_async_call( async_call_ready, NULL, 0 );
 }
 
 VG_STATIC void draw_origin_axis(void)
@@ -271,147 +263,69 @@ VG_STATIC void draw_origin_axis(void)
    vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 0.0f, 1.0f }, 0xff0000ff );
 }
 
+static void skaterift_change_world_preupdate(void);
 VG_STATIC void vg_update(void)
 {
    steam_update();
+   skaterift_preupdate_inputs();
+   if( skaterift.op == k_async_op_clientloading ) return;
 
-   if( vg.is_loaded ){
-      draw_origin_axis();
-      network_update();
-      
-#if 0
-      if( !gzoomer.inside )
-         player_update_pre();
-#endif
-
-      player__pre_update( &localplayer );
-      world_update( get_active_world(), localplayer.rb.co );
-      audio_ambient_sprites_update( get_active_world(), localplayer.rb.co );
+   if( world_loader.state == k_world_loader_preload ){
+      skaterift_change_world_preupdate();
    }
-}
 
-VG_STATIC void vg_update_fixed(void)
-{
-   if( vg.is_loaded ){
-#if 0
-      if( !gzoomer.inside )
-         player_update_fixed();
+   draw_origin_axis();
+   network_update();
+   
+   player__pre_update( &localplayer );
+   global_skateshop_preupdate();
 
-      vehicle_update_fixed();
-#endif
-      world_routes_fixedupdate( get_active_world() );
-      player__update( &localplayer );
-   }
+   world_update( world_current_instance(), localplayer.rb.co );
+   audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
+   //gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" );
 }
 
-VG_STATIC void vg_update_post(void)
+VG_STATIC void vg_update_fixed(void)
 {
-   if( vg.is_loaded )
-   {
-#if 0
-      if( gzoomer.inside )
-      {
-         vehicle_camera();
-      }
-      else
-      {
-         player_update_post();
-      }
-#endif
-
-      player__post_update( &localplayer );
-
-      
-      float inr3 = 0.57735027,
-            inr2 = 0.70710678118;
-
-      v3f sample_directions[] = {
-         { -1.0f,  0.0f,  0.0f },
-         {  1.0f,  0.0f,  0.0f },
-         {  0.0f,  0.0f,  1.0f },
-         {  0.0f,  0.0f, -1.0f },
-         {  0.0f,  1.0f,  0.0f },
-         {  0.0f, -1.0f,  0.0f },
-         { -inr3,  inr3,  inr3 },
-         {  inr3,  inr3,  inr3 },
-         { -inr3,  inr3, -inr3 },
-         {  inr3,  inr3, -inr3 },
-         { -inr2,  0.0f,  inr2 },
-         {  inr2,  0.0f,  inr2 },
-         { -inr2,  0.0f, -inr2 },
-         {  inr2,  0.0f, -inr2 },
-      };
-
-      static int si = 0;
-      static float distances[16];
-
-      ray_hit ray;
-      ray.dist = 5.0f;
-
-      v3f rc, rd, ro;
-      v3_copy( sample_directions[ si ], rd );
-      v3_add( localplayer.rb.co, (v3f){0.0f,1.5f,0.0f}, ro );
-      v3_copy( ro, rc );
-
-      float dist = 200.0f;
-
-      for( int i=0; i<10; i++ ){
-         if( ray_world( get_active_world(), rc, rd, &ray ) ){
-            dist = (float)i*5.0f + ray.dist;
-            break;
-         }
-         else{
-            v3_muladds( rc, rd, ray.dist, rc );
-         }
-      }
+   if( skaterift.op == k_async_op_clientloading ) return;
 
-      distances[si] = dist;
-
-
-      for( int i=0; i<14; i++ ){
-         if( distances[i] != 200.0f ){
-            u32 colours[] = { VG__RED, VG__BLUE, VG__GREEN,
-                              VG__CYAN, VG__YELOW, VG__PINK,
-                              VG__WHITE };
+   world_routes_fixedupdate( world_current_instance() );
+   player__update( &localplayer );
+   vehicle_update_fixed();
+}
 
-            u32 colour = colours[i%7];
+VG_STATIC void vg_update_post(void){
+   if( skaterift.op == k_async_op_clientloading ) return;
 
-            v3f p1;
-            v3_muladds( ro, sample_directions[i], distances[i], p1 );
-            vg_line( ro, p1, colour );
-            vg_line_pt3( p1, 0.1f, colour );
-         }
-      }
+   player__post_update( &localplayer );
 
-      si ++;
-      if( si >= 14 )
-         si = 0;
+   float dist;
+   int sample_index;
+   world_audio_sample_distances( localplayer.rb.co, &sample_index, &dist );
 
+   audio_lock();
+   vg_dsp.echo_distances[sample_index] = dist;
 
-      /* FIXME: TEMP */
-      audio_lock();
-      vg_dsp.echo_distances[si] = dist;
+   v3f ears = { 1.0f,0.0f,0.0f };
+   m3x3_mulv( main_camera.transform, ears, ears );
+   v3_copy( ears, vg_audio.external_listener_ears );
+   v3_copy( main_camera.transform[3], vg_audio.external_listener_pos );
 
-      v3f ears = { 1.0f,0.0f,0.0f };
-      m3x3_mulv( main_camera.transform, ears, ears );
-      v3_copy( ears, vg_audio.external_listener_ears );
-      v3_copy( main_camera.transform[3], vg_audio.external_listener_pos );
+   if( localplayer.gate_waiting ){
+      m4x3_mulv( localplayer.gate_waiting->transport,
+                 vg_audio.external_listener_pos, 
+                 vg_audio.external_listener_pos );
+   }
 
-      /* TODO: this is transformed back and fourth twice. */
-      if( localplayer.gate_waiting ){
-         m4x3_mulv( localplayer.gate_waiting->transport,
-                    vg_audio.external_listener_pos, 
-                    vg_audio.external_listener_pos );
-      }
+   v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity );
+   audio_unlock();
 
-      v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity );
-      audio_unlock();
+   f32 target = 1.0f-(f32)(menu.active||k_replay_test);
+   skaterift.time_rate = vg_lerpf( skaterift.time_rate, target,
+                                   vg.time_frame_delta * 6.0f );
 
-      menu_update();
-#if 0
-      vehicle_update_post();
-#endif
-   }
+   vg.time_rate = skaterift.time_rate;
+   vehicle_update_post();
 }
 
 VG_STATIC void vg_framebuffer_resize( int w, int h )
@@ -432,16 +346,20 @@ VG_STATIC void present_view_with_post_processing(void)
    v2f inverse;
    render_fb_inverse_ratio( gpipeline.fb_main, inverse );
 
-   if( cl_blur ){
+   if( k_blur_effect ){
       shader_blitblur_use();
       shader_blitblur_uTexMain( 0 );
       shader_blitblur_uTexMotion( 1 );
-      shader_blitblur_uBlurStrength(cl_blur_strength / (vg.frame_delta*60.0f));
+      shader_blitblur_uBlurStrength( k_blur_strength / 
+                                     (vg.time_frame_delta*60.0) );
       shader_blitblur_uInverseRatio( inverse );
 
-      v2f menu_blurring;
-      v2_muls( (v2f){ 0.04f, 0.001f }, menu_opacity, menu_blurring );
-      shader_blitblur_uOverrideDir( menu_blurring );
+      v2f override;
+      if( menu.active )
+         v2_muls( (v2f){ 0.04f, 0.001f }, 1.0f-skaterift.time_rate, override );
+      else 
+         v2_zero( override );
+      shader_blitblur_uOverrideDir( override );
 
       render_fb_bind_texture( gpipeline.fb_main, 0, 0 );
       render_fb_bind_texture( gpipeline.fb_main, 1, 1 );
@@ -494,50 +412,37 @@ VG_STATIC void render_scene(void)
       return;
    }
 
+   for( u32 i=0; i<vg_list_size(world_static.worlds); i++ ){
+      if( world_static.worlds[i].status == k_world_status_loaded ){
+         world_prerender( &world_static.worlds[i] );
+      }
+   }
+
    render_world( view_world, &main_camera, 0 );
 
    render_water_texture( view_world, &main_camera, 0 );
    render_fb_bind( gpipeline.fb_main, 1 );
    render_water_surface( view_world, &main_camera );
+}
+
+VG_STATIC void render_scene_gate_subview(void)
+{
+   render_fb_bind( gpipeline.fb_main, 1 );
+   world_instance *view_world = localplayer.viewable_world;
+   if( !view_world ) return; /* ??? */
 
    int depth = 1;
    if( localplayer.gate_waiting ) depth = 0;
    render_world_gates( view_world, &main_camera, depth );
-
-   if( !cl_menu )
-      render_player_transparent();
 }
 
 VG_STATIC void render_main_game(void)
 {
-#if 0
-   static float fov = 60.0f;
-   float fov_target = vg_lerpf( 90.0f, 110.0f, cl_fov );
-
-   if( player.controller == k_player_controller_skate )
-      fov_target = vg_lerpf( 97.0f, 135.0f, cl_fov );
-
-   if( cl_menu )
-      fov_target = menu_fov_target;
-   fov = vg_lerpf( fov, fov_target, vg.frame_delta * 2.0f );
-   fov = freecam? 60.0f: fov;
-
-   main_camera.fov   = fov;
-#endif
-
    player__pre_render( &localplayer );
+   main_camera.fov = localplayer.cam.fov;
+   v3_copy( localplayer.cam.pos, main_camera.pos );
+   v3_copy( localplayer.cam.angles, main_camera.angles );
 
-   v3_lerp( localplayer.cam.pos, menu_camera_pos, menu_opacity, 
-            main_camera.pos );
-   main_camera.angles[0] = 
-      vg_alerpf(  localplayer.cam.angles[0], menu_camera_angles[0], 
-                  menu_opacity );
-   main_camera.angles[1] = 
-      vg_lerpf ( localplayer.cam.angles[1], menu_camera_angles[1], 
-                 menu_opacity );
-
-   main_camera.fov = vg_lerpf( localplayer.cam.fov, menu_smooth_fov,
-                               menu_opacity );
    main_camera.nearz = 0.1f;
    main_camera.farz  = 2100.0f;
 
@@ -560,27 +465,27 @@ VG_STATIC void render_main_game(void)
 
    render_scene();
 
-   if( cl_menu ) {
-      glClear( GL_DEPTH_BUFFER_BIT );
-      menu_render_bg();
-      glEnable( GL_DEPTH_TEST );
-      render_player_transparent();
-   }
-
-   present_view_with_post_processing();
+   glEnable( GL_DEPTH_TEST );
 
-   if( cl_menu )
-      menu_render_fg( &main_camera );
+   render_player_transparent();
+   render_scene_gate_subview();
 
+   present_view_with_post_processing();
    /* =========== End Frame =========== */
 }
 
 VG_STATIC void vg_render(void)
 {
+   if( skaterift.op == k_async_op_clientloading ){
+      _vg_loader_render();
+      return;
+   }
+
    glBindFramebuffer( GL_FRAMEBUFFER, 0 );
 
    glViewport( 0,0, vg.window_x, vg.window_y );
    glDisable( GL_DEPTH_TEST );
+   glDisable( GL_BLEND );
 
    glClearColor( 1.0f, 0.0f, 0.0f, 0.0f );
    glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
@@ -594,15 +499,30 @@ VG_STATIC void vg_render(void)
    glDisable(GL_DEPTH_TEST);
    vg_lines_drawall();
    glViewport( 0,0, vg.window_x, vg.window_y );
+   gui_draw();
 }
 
-VG_STATIC void vg_ui(void)
+VG_STATIC void vg_gui(void)
 {
-#if 0
+   if( skaterift.op == k_async_op_clientloading ) return;
+
+   menu_update();
+   if( menu.active ){
+      glClear( GL_DEPTH_BUFFER_BIT );
+      menu_render();
+   }
+
    player__im_gui( &localplayer );
-#endif
-   world_instance *world = get_active_world();
-   menu_crap_ui();
-   
+   world_instance *world = world_current_instance();
+
+   replay_imgui( &localplayer );
+   workshop_form_gui();
    render_view_framebuffer_ui();
 }
+
+
+#else
+
+#include "skaterift_imgui_dev.c"
+
+#endif