X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=23b1db0311dd68a53079e491f714f16bd94d1983;hb=fbd4abfae41847dcdf4e32ac2c43d79ecaf0f708;hp=2bc0e4c7f1384cd7011aee2b4f3a2cedf1dd3349;hpb=bdd98e4458be4a143cd415e5077b373129b1b0d9;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 2bc0e4c..23b1db0 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -55,6 +55,10 @@
 #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"
+#include "freecam.c"
 
 static int k_tools_mode = 0;
 
@@ -79,6 +83,10 @@ static void vg_launch_opt(void){
    if( vg_long_opt( "tools" ) ){
       k_tools_mode = 1;
    }
+
+   if( vg_long_opt( "demo" ) ){
+      skaterift.demo_mode = 1;
+   }
 }
 
 static void vg_preload(void){
@@ -90,6 +98,12 @@ vg_info("            |   \\/   | |        /     |      |    \\ | /   | \n" );
 vg_info("            '        ' '--' [] '----- '----- '     ' '---'  " 
         "SOFTWARE\n" );
 
+   /* please forgive me! */
+   u32 sz; char *drm;
+   if( (drm = vg_file_read_text( vg_mem.scratch, "DRM", &sz )) )
+      if( !strcmp(drm, "blibby!") )
+         skaterift.demo_mode = 0;
+
    vg_loader_step( remote_players_init, NULL );
 
    if( k_tools_mode )
@@ -122,12 +136,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;
 
@@ -153,9 +167,9 @@ static void skaterift_restore_state(void){
    kvsav.cur = orig;
 }
 
-static addon_reg *skaterift_mount_world_unloadable( const char *path ){
+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;
+   reg->flags |= (ADDON_REG_HIDDEN | ext);
    return reg;
 }
 
@@ -168,6 +182,8 @@ static void vg_load(void){
    vg_console_reg_cmd( "load_world", skaterift_load_world_command, NULL );
    vg_console_reg_cmd( "switch_active_instance", 
                         skaterift_switch_instance_cmd, NULL );
+   vg_console_reg_cmd( "fc", freecam_cmd, NULL );
+   vg_console_reg_var( "immobile", &localplayer.immobile, k_var_dtype_i32, 0 );
 
    vg_loader_step( render_init, NULL );
    vg_loader_step( menu_init, NULL );
@@ -193,11 +209,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();
@@ -210,9 +229,12 @@ static void vg_load(void){
     */
 
    /* hub world */
-   addon_reg *hub = skaterift_mount_world_unloadable( "maps/dev_hub" );
-   skaterift_mount_world_unloadable( "maps/mp_spawn" );
-   skaterift_mount_world_unloadable( "maps/mp_mtzero" );
+   addon_reg *hub = skaterift_mount_world_unloadable( "maps/dev_hub", 0 );
+   skaterift_mount_world_unloadable( "maps/mp_spawn", 
+         ADDON_REG_CITY|ADDON_REG_PREMIUM );
+   skaterift_mount_world_unloadable( "maps/mp_mtzero", 
+         ADDON_REG_MTZERO|ADDON_REG_PREMIUM );
+   skaterift_mount_world_unloadable( "maps/dev_tutorial", 0 );
 
    /* load home/permanent world manually */
    world_static.load_state = k_world_loader_load;
@@ -239,6 +261,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);
@@ -286,6 +310,7 @@ static void vg_pre_update(void){
    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 );
@@ -473,6 +498,16 @@ 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 );
+   particle_system_render( &particles_grind, &skaterift.cam );
+
    /* 
     * render transition 
     */
@@ -514,8 +549,16 @@ static void skaterift_composite_maincamera(void){
    camera_lerp( &localplayer.cam, &world_static.focus_cam,
                 vg_smoothstepf(world_static.focus_strength), &skaterift.cam );
 
-   if( skaterift.activity == k_skaterift_replay ){
-      skaterift_get_replay_camera( &skaterift.cam );
+   if( skaterift.freecam ){
+      freecam_preupdate();
+      v3_copy( skaterift.replay_freecam.pos, skaterift.cam.pos );
+      v3_copy( skaterift.replay_freecam.angles, skaterift.cam.angles );
+      skaterift.cam.fov = skaterift.replay_freecam.fov;
+   }
+   else {
+      if( skaterift.activity == k_skaterift_replay ){
+         replay_get_camera( &skaterift.replay, &skaterift.cam );
+      }
    }
 
    skaterift.cam.nearz = 0.1f;
@@ -645,6 +688,7 @@ 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();