X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=714ed11cbdd44f05a73585a2e998aa8a0a406c40;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=8ed749ceb324087ed31b773be3fd4d6e49636715;hpb=2c91a71533b4ce86b9e7fd708420ae05c74d8f52;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 8ed749c..714ed11 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -55,6 +55,9 @@
 #include "network.c"
 #include "player_remote.c"
 #include "vg/vg_audio_dsp.h"
+#include "world_routes_ui.c"
+#include "particle.c"
+#include "player_effects.c"
 
 static int k_tools_mode = 0;
 
@@ -122,12 +125,12 @@ static void skaterift_restore_state(void){
 
    vg_msg kvsav;
    vg_msg_init( &kvsav, sav.buf, sizeof(sav.buf) );
+   skaterift.achievements |= vg_msg_getkvu32( &kvsav, "ach", 0 );
 
    u32 board_reg_id = 0,
        player_reg_id = 0;
 
    vg_msg_cursor orig = kvsav.cur;
-
    if( vg_msg_seekframe( &kvsav, "player" ) ){
       addon_alias q;
 
@@ -151,36 +154,12 @@ static void skaterift_restore_state(void){
       addon_cache_create_viewer( k_addon_type_player, player_reg_id );
 
    kvsav.cur = orig;
+}
 
-#if 0
-   if( vg_msg_seekframe( &kvsav, "world" ) ){
-      addon_alias q;
-
-      /* world */
-      skaterift_read_addon_alias( &kvsav, "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_static.load_state = k_world_loader_load;
-         struct world_load_args args = {
-            .purpose = k_world_purpose_client,
-            .reg = reg
-         };
-         skaterift_world_load_thread( &args );
-
-         world_set_active_instance( vg_msg_getkvu32( &kvsav, "index", 0 ) );
-         world_static.active_trigger_volume_count = 0;
-         localplayer.viewable_world = world_current_instance();
-      }
-
-      v3f pos;
-      vg_msg_getkvv3f( &kvsav, "position", pos, (v3f){0.0f,0.0f,0.0f} );
-
-      if( v3_length2(pos) > 1.0f )
-         player__setpos( pos );
-   }
-#endif
+static addon_reg *skaterift_mount_world_unloadable( const char *path, u32 ext ){
+   addon_reg *reg = addon_mount_local_addon( path, k_addon_type_world, ".mdl" );
+   reg->flags |= (ADDON_REG_HIDDEN | ext);
+   return reg;
 }
 
 static void vg_load(void){
@@ -217,11 +196,14 @@ static void vg_load(void){
    skaterift.replay.size = bytes;
    replay_clear( &skaterift.replay );
 
-   player_load_animation_reference( "models/ch_none.mdl" );
+   particle_alloc( &particles_grind, 300 );
 
+   player_load_animation_reference( "models/ch_none.mdl" );
    player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
    player__bind();
 
+   player_board_load( &localplayer.fallback_board, "models/board_none.mdl" );
+
    /* --------------------- */
 
    vg_bake_shaders();
@@ -234,37 +216,10 @@ static void vg_load(void){
     */
 
    /* hub world */
-   addon_reg *hub = 
-      addon_mount_local_addon( "maps/dev_hub", k_addon_type_world, ".mdl" );
-   hub->metadata_len = 0;
-
-   /* understate diy. */
-   addon_reg *spawn = addon_mount_local_addon( "maps/mp_spawn", 
-                                                k_addon_type_world, 
-                                                ".mdl" );
-   {
-      vg_msg msg;
-      vg_msg_init( &msg, spawn->metadata, 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.co;
-   }
-
-   /* mtzero island */
-   addon_reg *mtzero = addon_mount_local_addon( "maps/mp_mtzero",
-                                                k_addon_type_world,
-                                                ".mdl" );
-   {
-      vg_msg msg;
-      vg_msg_init( &msg, spawn->metadata, 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.co;
-   }
+   addon_reg *hub = skaterift_mount_world_unloadable( "maps/dev_hub", 0 );
+   skaterift_mount_world_unloadable( "maps/mp_spawn", ADDON_REG_CITY );
+   skaterift_mount_world_unloadable( "maps/mp_mtzero", ADDON_REG_MTZERO );
+   skaterift_mount_world_unloadable( "maps/dev_tutorial", 0 );
 
    /* load home/permanent world manually */
    world_static.load_state = k_world_loader_load;
@@ -291,6 +246,8 @@ static void vg_load(void){
 
    /* and now */
    skaterift_restore_state();
+   update_ach_models();
+
    vg_loader_step( NULL, skaterift_autosave_synchronous );
 
    //board_processview_thread(NULL);
@@ -325,7 +282,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_respawning) ){
       target = 0;
    }
 
@@ -333,10 +290,12 @@ static void vg_pre_update(void){
    vg.time_rate = vg_smoothstepf( skaterift.time_rate );
    
    /* TODO: how can we compress this? */
+   ent_miniworld_preupdate();
    player__pre_update();
    world_entity_focus_preupdate();
    skaterift_replay_pre_update();
    remote_sfx_pre_update();
+   skateshop_world_preupdate( world_current_instance() );
 
    world_update( world_current_instance(), localplayer.rb.co );
    audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
@@ -472,18 +431,20 @@ static void render_player_transparent(void){
    player__render( &small_cam );
 }
 
+static world_instance *get_view_world(void){
+   world_instance *view_world = world_current_instance();
+   if( localplayer.gate_waiting && 
+         (localplayer.gate_waiting->flags & k_ent_gate_nonlocal) ){
+      view_world = &world_static.instances[world_static.active_instance ^ 0x1];
+   }
+
+   return view_world;
+}
+
 static void render_scene(void){
    /* Draw world */
    glEnable( GL_DEPTH_TEST );
 
-   world_instance *view_world = localplayer.viewable_world;
-
-   if( view_world == NULL ){
-      glClearColor( 0.25f, 0.25f, 0.0f, 1.0f );
-      glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT );
-      return;
-   }
-
    for( u32 i=0; i<vg_list_size(world_static.instances); i++ ){
       if( world_static.instances[i].status == k_world_status_loaded ){
          world_prerender( &world_static.instances[i] );
@@ -491,38 +452,82 @@ static void render_scene(void){
    }
 
    if( skaterift.activity == k_skaterift_respawning ){
+      world_instance *world = world_current_instance();
       glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } );
-      glClearColor( 0.624f, 0.659f, 0.769f, 0.0f );
-      glClearColor( 0.824f, 0.0f, 0.1f, 0.0f );
+      
+      v3f bg;
+      v3_muls( world->ub_lighting.g_daysky_colour,
+                  world->ub_lighting.g_day_phase - 
+                  world->ub_lighting.g_sunset_phase*0.1f, bg );
+
+      v3_muladds( bg, world->ub_lighting.g_sunset_colour,
+                  (1.0f-0.5f)*world->ub_lighting.g_sunset_phase, bg );
+
+      v3_muladds( bg, world->ub_lighting.g_nightsky_colour,
+                  (1.0f-world->ub_lighting.g_day_phase), bg );
+
+      glClearColor( bg[0], bg[1], bg[2], 0.0f );
       glClear( GL_COLOR_BUFFER_BIT );
       glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0, 
                                     GL_COLOR_ATTACHMENT1 } );
+
+      m4x3f identity;
+      m4x3_identity( identity );
+      render_world_override( world, world, identity, &skaterift.cam, 
+                             respawn_chooser.spawn, 
+                             (v4f){world->tar_min, world->tar_max, 1.0f, 0.0f});
+      render_world_routes( world, world, identity, &skaterift.cam, 0, 1 );
+      return;
+   }
+
+   world_instance *view_world = get_view_world();
+   render_world( view_world, &skaterift.cam, 0, 0, 1, 1 );
+
 #if 0
-      view_world = &world_static.instances[respawn_chooser.world_id];
-      render_world_override( view_world );
-      render_world_routes( view_world, &skaterift.cam, 1 );
+   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 );
+   particle_system_render( &particles_grind, &skaterift.cam );
+
+   /* 
+    * render transition 
+    */
+   if( global_miniworld.transition == 0 ) 
+      return;
+
+   world_instance *holdout_world = NULL;
+   f32 t = 0.0f;
+
+   if( global_miniworld.transition == 1 ){
+      holdout_world = &world_static.instances[ k_world_purpose_hub ];
+      t = global_miniworld.t;
    }
    else{
-      render_world( view_world, &skaterift.cam, 0 );
-      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 );
-      ent_miniworld_render( view_world );
+      holdout_world = &world_static.instances[ k_world_purpose_client ];
+      t = 1.0f-global_miniworld.t;
    }
 
-}
+   if( holdout_world->status != k_world_status_loaded )
+      return;
 
-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; /* ??? */
-   if( skaterift.activity == k_skaterift_respawning ) return;
+   t = vg_smoothstepf( t );
+
+   glEnable( GL_STENCIL_TEST );
+   glDisable( GL_DEPTH_TEST );
+   glStencilOp( GL_KEEP, GL_KEEP, GL_REPLACE );  
+   glStencilFunc( GL_ALWAYS, 1, 0xFF ); 
+   glStencilMask( 0xFF );
+
+   shader_blit_transition_use();
+   shader_blit_transition_uInverseRatio( (v2f){1.0f,1.0f} );
+   shader_blit_transition_uT( -(sqrtf(2)+0.5f) * t );
 
-   int depth = 1;
-   if( localplayer.gate_waiting ) depth = 0;
-   render_world_gates( view_world, &skaterift.cam, depth );
+   render_fsquad();
+   render_world( holdout_world, &global_miniworld.cam, 1, 0, 1, 1 );
 }
 
 static void skaterift_composite_maincamera(void){
@@ -539,22 +544,24 @@ static void skaterift_composite_maincamera(void){
    if( skaterift.activity == k_skaterift_respawning ){
       camera_copy( &respawn_chooser.cam, &skaterift.cam );
       skaterift.cam.nearz = 4.0f;
-      skaterift.cam.farz  = 3100.0f;
+      skaterift.cam.farz = 3100.0f;
    }
 
-   camera_update_transform( &skaterift.cam );
+   if( global_miniworld.transition ){
+      f32 dt = vg.time_frame_delta / 2.0f,
+          s  = vg_signf( global_miniworld.transition );
+      global_miniworld.t += s * dt;
 
-   if( skaterift.activity != k_skaterift_respawning ){
-      if( localplayer.gate_waiting ){
-         m3x3_mul( localplayer.basis_gate, skaterift.cam.transform, 
-                   skaterift.cam.transform );
+      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{
-         m3x3_mul( localplayer.basis, skaterift.cam.transform, 
-                   skaterift.cam.transform );
+      else {
       }
    }
-   
+
+   camera_update_transform( &skaterift.cam );
    camera_update_view( &skaterift.cam );
    camera_update_projection( &skaterift.cam );
    camera_finalize( &skaterift.cam );
@@ -574,10 +581,13 @@ static void render_main_game(void){
    skaterift_composite_maincamera();
 
    /* --------------------------------------------------------------------- */
+   if( skaterift.activity != k_skaterift_respawning ){
+      world_instance *world = world_current_instance();
+      render_world_cubemaps( world );
 
-   world_instance *view_world = localplayer.viewable_world;
-   if( (view_world != NULL) && (skaterift.activity != k_skaterift_respawning) ){
-      render_world_cubemaps( view_world );
+      ent_gate *nlg = world->rendering_gate;
+      if( nlg && nlg->flags & k_ent_gate_nonlocal )
+         render_world_cubemaps( &world_static.instances[nlg->target] );
    }
 
    /* variable res target */
@@ -597,7 +607,11 @@ static void render_main_game(void){
                                    portals */
 
    /* continue with variable rate */
-   render_scene_gate_subview();
+   if( !global_miniworld.transition && 
+         (skaterift.activity != k_skaterift_respawning) ){
+      render_fb_bind( gpipeline.fb_main, 1 );
+      render_world_gates( get_view_world(), &skaterift.cam );
+   }
 
    /* composite */
    present_view_with_post_processing();
@@ -651,15 +665,14 @@ static void vg_gui(void){
    player__im_gui();
    world_instance *world = world_current_instance();
 
+   world_routes_imgui( world );
    skaterift_replay_imgui();
    workshop_form_gui();
    render_view_framebuffer_ui();
    remote_player_network_imgui( vg.pv );
 
-
    if( skaterift.activity == k_skaterift_respawning ){
-      remote_players_imgui_world( world_current_instance(), vg.pv, 
-                                  2000.0f, 0 );
+      remote_players_imgui_world( world_current_instance(), vg.pv, 2000.0f, 0 );
       remote_players_imgui_lobby();
    }
    else {