some refactors before the storm

[carveJwlIkooP6JGAAIwe30JlM.git] / skaterift.c

diff --git a/skaterift.c b/skaterift.c
index 23b1db0311dd68a53079e491f714f16bd94d1983..422202f5655cb3151ebbbffc6a93b777dd58fd1d 100644 (file)
--- a/skaterift.c
+++ b/skaterift.c
@@ -11,10 +11,7 @@
  * =============================================================================
  */
 
-#if 1
-
 #define SR_NETWORKED
-#define SR_USE_LOCALHOST
 
 #ifndef VG_RELEASE
  #define VG_DEVWINDOW
@@ -51,7 +48,7 @@
 #include "addon.c"
 #include "highscores.c"
 #include "save.c"
-#include "respawn.c"
+#include "world_map.c"
 #include "network.c"
 #include "player_remote.c"
 #include "vg/vg_audio_dsp.h"
@@ -114,13 +111,6 @@ vg_info("            '        ' '--' [] '----- '----- '     ' '---'  "
    vg_loader_step( network_init, network_end );
 }
 
-static void load_playermodels(void){
-   /* FIXME: hack */
-   shader_model_character_view_register();
-   shader_model_board_view_register();
-   shader_model_entity_register();
-}
-
 static void async_skaterift_player_start( void *payload, u32 size ){
    world_switch_instance(0);
 }
@@ -199,9 +189,6 @@ static void vg_load(void){
    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 */
    u32 bytes = 1024*1024*10;
@@ -297,7 +284,7 @@ static void vg_pre_update(void){
    /* time rate */
    f32 target = 1;
    if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu|
-                             k_skaterift_respawning) ){
+                             k_skaterift_world_map) ){
       target = 0;
    }
 
@@ -314,7 +301,7 @@ static void vg_pre_update(void){
 
    world_update( world_current_instance(), localplayer.rb.co );
    audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
-   respawn_chooser_pre_update();
+   world_map_pre_update();
 }
 
 static void vg_fixed_update(void){
@@ -466,7 +453,7 @@ static void render_scene(void){
       }
    }
 
-   if( skaterift.activity == k_skaterift_respawning ){
+   if( skaterift.activity == k_skaterift_world_map ){
       world_instance *world = world_current_instance();
       glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } );
       
@@ -489,7 +476,7 @@ static void render_scene(void){
       m4x3f identity;
       m4x3_identity( identity );
       render_world_override( world, world, identity, &skaterift.cam, 
-                             respawn_chooser.spawn, 
+                             world_map.spawn, 
                              (v4f){world->tar_min, world->tar_max, 1.0f, 0.0f});
       render_world_routes( world, world, identity, &skaterift.cam, 0, 1 );
       return;
@@ -498,11 +485,6 @@ static void render_scene(void){
    world_instance *view_world = get_view_world();
    render_world( view_world, &skaterift.cam, 0, 0, 1, 1 );
 
-#if 0
-   particle_spawn( &particles_grind, localplayer.rb.co, 
-                  (v3f){vg_randf64()*2.0f,vg_randf64()*3.0f,vg_randf64()*2.0f}, 
-                  vg_randf64(), 0xff0000ff );
-#endif
    particle_system_update( &particles_grind, vg.time_delta );
    //particle_system_debug( &particles_grind );
    particle_system_prerender( &particles_grind );
@@ -564,8 +546,8 @@ static void skaterift_composite_maincamera(void){
    skaterift.cam.nearz = 0.1f;
    skaterift.cam.farz  = 2100.0f;
 
-   if( skaterift.activity == k_skaterift_respawning ){
-      camera_copy( &respawn_chooser.cam, &skaterift.cam );
+   if( skaterift.activity == k_skaterift_world_map ){
+      camera_copy( &world_map.cam, &skaterift.cam );
       skaterift.cam.nearz = 4.0f;
       skaterift.cam.farz = 3100.0f;
    }
@@ -576,12 +558,9 @@ static void skaterift_composite_maincamera(void){
       global_miniworld.t += s * dt;
 
       if( (global_miniworld.t > 1.0f) || (global_miniworld.t < 0.0f) ){
-         /* TODO: maybe next frame! */
          global_miniworld.t = vg_clampf( global_miniworld.t, 0.0f, 1.0f );
          global_miniworld.transition = 0;
       }
-      else {
-      }
    }
 
    camera_update_transform( &skaterift.cam );
@@ -604,7 +583,7 @@ static void render_main_game(void){
    skaterift_composite_maincamera();
 
    /* --------------------------------------------------------------------- */
-   if( skaterift.activity != k_skaterift_respawning ){
+   if( skaterift.activity != k_skaterift_world_map ){
       world_instance *world = world_current_instance();
       render_world_cubemaps( world );
 
@@ -631,7 +610,7 @@ static void render_main_game(void){
 
    /* continue with variable rate */
    if( !global_miniworld.transition && 
-         (skaterift.activity != k_skaterift_respawning) ){
+         (skaterift.activity != k_skaterift_world_map) ){
       render_fb_bind( gpipeline.fb_main, 1 );
       render_world_gates( get_view_world(), &skaterift.cam );
    }
@@ -694,7 +673,7 @@ static void vg_gui(void){
    render_view_framebuffer_ui();
    remote_player_network_imgui( vg.pv );
 
-   if( skaterift.activity == k_skaterift_respawning ){
+   if( skaterift.activity == k_skaterift_world_map ){
       remote_players_imgui_world( world_current_instance(), vg.pv, 2000.0f, 0 );
       remote_players_imgui_lobby();
    }
@@ -703,10 +682,3 @@ static void vg_gui(void){
       remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 );
    }
 }
-
-
-#else
-
-#include "skaterift_imgui_dev.c"
-
-#endif