X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=dd040152a60962e00f1561201b2f8503338d4687;hb=95f6ef1a859423a0d9554ac6a9f4c6cbd8bb540c;hp=bc0bd3c79f0b5623c5b36169eb5d337280bb0964;hpb=c8309ca41f8953d6aaa97cd8cbf625640346b80d;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index bc0bd3c..dd04015 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -11,13 +11,10 @@
  * =============================================================================
  */
 
-#define SR_NETWORKED
-#define VG_AUDIO_FORCE_COMPRESSED
-#define SDL_MAIN_HANDLED
 #define SR_ALLOW_REWIND_HUB
 
-#ifndef VG_RELEASE
- #define VG_DEVWINDOW
+#ifdef _WIN32
+ #include <winsock2.h>
 #endif
 
 /* 
@@ -27,7 +24,9 @@
 #include "skaterift.h"
 #include "steam.h"
 #include "render.h"
-#include "audio.h"
+#include "vg/vg_opt.h"
+#include "vg/vg_loader.h"
+#include "vg/vg_io.h"
 
 #include "world.h"
 
@@ -39,45 +38,47 @@
 #include "vehicle.h"
 #include "save.h"
 #include "player_remote.h"
+#include "particle.h"
+#include "trail.h"
+#include "freecam.h"
+#include "ent_tornado.h"
+#include "ent_miniworld.h"
+#include "ent_skateshop.h"
+#include "ent_npc.h"
+#include "world_map.h"
+#include "gui.h"
+#include "workshop.h"
+#include "audio.h"
+#include "player_render.h"
+#include "control_overlay.h"
 
-/*    unity build
- * ----------------- */
-
-#include "world.c"
-#include "player.c"
-#include "vehicle.c"
-#include "entity.c"
-#include "workshop.c"
-#include "addon.c"
-#include "save.c"
-#include "world_map.c"
-#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"
-#include "testing.c"
+struct skaterift_globals skaterift = 
+{ 
+   .op = k_async_op_clientloading, .time_rate = 1.0f, .demo_mode = 1,
+   .hub_world = "maps/dev_hub",
+};
 
 static int k_tools_mode = 0;
 
-int main( int argc, char *argv[] ){
+int main( int argc, char *argv[] )
+{
+   network_set_host( "skaterift.com", NULL );
    vg_mem.use_libc_malloc = 0;
    vg_set_mem_quota( 160*1024*1024 );
    vg_enter( argc, argv, "Voyager Game Engine" ); 
    return 0;
 }
 
-static void vg_launch_opt(void){
+void vg_launch_opt(void)
+{
    const char *arg;
    if( vg_long_opt( "noauth" ) ){
       network_client.auth_mode = eServerModeNoAuthentication;
    }
 
-   if( (arg = vg_long_opt_arg( "server" )) ){
-      vg_strncpy( arg, network_client.server_adress, 64, 
-                  k_strncpy_overflow_fatal );
+   if( (arg = vg_long_opt_arg( "server" )) )
+   {
+      network_set_host( arg, NULL );
    }
 
    if( vg_long_opt( "tools" ) ){
@@ -93,7 +94,8 @@ static void vg_launch_opt(void){
    }
 }
 
-static void vg_preload(void){
+void vg_preload(void)
+{
 vg_info(" Copyright  .        . .       -----, ,----- ,---.   .---.  \n" );
 vg_info(" 2021-2023  |\\      /| |           /  |      |    | |    /| \n" );
 vg_info("            | \\    / | +--        /   +----- +---'  |   / | \n" );
@@ -122,21 +124,30 @@ static void async_skaterift_player_start( void *payload, u32 size ){
    world_switch_instance(0);
 }
 
-static void async_call_ready( void *payload, u32 size ){
+static void async_call_ready( void *payload, u32 size )
+{
    skaterift.op = k_async_op_none;
+
+   if( network_client.auto_connect )
+      network_client.user_intent = k_server_intent_online;
+
+   menu_at_begin();
 }
 
-static void skaterift_restore_state(void){
+static void skaterift_restore_state(void)
+{
    savedata_file sav;
-   strcpy( sav.path, str_skaterift_main_save );
-   savedata_file_read( &sav );
+   skaterift_read_main_savedata( &sav );
 
    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;
+   u32 ach;
+   vg_msg_getkvintg( &kvsav, "ach", k_vg_msg_u32, &ach, NULL );
+   skaterift.achievements |= ach;
+
+   u32 board_reg_id = time(NULL) % addon_count( k_addon_type_board, 0 ),
+       player_reg_id = (time(NULL)+44) % addon_count( k_addon_type_player, 0 );
 
    vg_msg_cursor orig = kvsav.cur;
    if( vg_msg_seekframe( &kvsav, "player" ) ){
@@ -180,6 +191,7 @@ static void skaterift_load_world_content(void){
          ADDON_REG_MTZERO|ADDON_REG_PREMIUM );
    skaterift_mount_world_unloadable( "maps/dev_tutorial", 0 );
    skaterift_mount_world_unloadable( "maps/dev_flatworld", 0 );
+   skaterift_mount_world_unloadable( "maps/mp_line1", ADDON_REG_PREMIUM );
 
    world_static.load_state = k_world_loader_load;
 
@@ -190,12 +202,8 @@ static void skaterift_load_world_content(void){
    skaterift_world_load_thread( &args );
 }
 
-static void skaterift_load_player_content(void){
-   u32 bytes = 1024*1024*10;
-   skaterift.replay.data = vg_linear_alloc( vg_mem.rtmemory, bytes );
-   skaterift.replay.size = bytes;
-   replay_clear( &skaterift.replay );
-
+static void skaterift_load_player_content(void)
+{
    particle_alloc( &particles_grind, 300 );
    particle_alloc( &particles_env, 200 );
 
@@ -205,41 +213,41 @@ static void skaterift_load_player_content(void){
    player_board_load( &localplayer.fallback_board, "models/board_none.mdl" );
 }
 
-static void vg_load(void){
+void vg_load(void)
+{
    if( k_tools_mode ){
       vg_async_call( async_call_ready, NULL, 0 );
       return;
    }
 
+   vg_audio.always_keep_compressed = 1;
+
    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 );
+   vg_loader_step( control_overlay_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 );
 
    vg_loader_step( player_init, NULL );
    vg_loader_step( player_ragdoll_init, NULL );
+   vg_loader_step( npc_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( ent_tornado_init, NULL );
-   vg_loader_step( testing_init, NULL );
-  
+   vg_loader_step( skaterift_replay_init, NULL );
    vg_loader_step( skaterift_load_player_content, NULL );
 
    /* --------------------- */
 
    vg_bake_shaders();
-   vg_loader_step( audio_init, audio_free );
+   vg_loader_step( audio_init, NULL );
 
    /* 'systems' are completely loaded now */
 
@@ -253,7 +261,6 @@ static void vg_load(void){
    vg_async_stall();
 
    vg_console_load_autos();
-   menu_link();
 
    addon_mount_content_folder( k_addon_type_player, 
                                "playermodels", ".mdl" );
@@ -278,30 +285,32 @@ static void draw_origin_axis(void){
    vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 1.0f, 0.0f }, 0xff00ff00 );
    vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 0.0f, 1.0f }, 0xff0000ff );
 }
-static void skaterift_change_client_world_preupdate(void);
+void skaterift_change_client_world_preupdate(void);
 
 /* 
  * UPDATE LOOP
  * ---------------------------------------------------------------------------*/
 
-static void vg_pre_update(void){
+void vg_pre_update(void)
+{
    skaterift_preupdate_inputs();
 
    if( k_tools_mode ) return;
 
    steam_update();
+   skaterift_change_client_world_preupdate();
+
    if( skaterift.op == k_async_op_clientloading ) return;
-   if( world_static.load_state == k_world_loader_preload )
-      skaterift_change_client_world_preupdate();
 
    draw_origin_axis();
-   skateshop_autostart_loading();
+   addon_system_pre_update();
+   skateshop_world_preview_preupdate();
    network_update();
 
    /* time rate */
    f32 target = 1;
-   if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu|
-                             k_skaterift_world_map) ){
+   if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu) )
+   {
       target = 0;
    }
 
@@ -310,8 +319,13 @@ static void vg_pre_update(void){
    
    /* TODO: how can we compress this? */
    ent_miniworld_preupdate();
-   player__pre_update();
    world_entity_focus_preupdate();
+
+   if( skaterift.activity != k_skaterift_menu )
+   {
+      player__pre_update();
+   }
+
    skaterift_replay_pre_update();
    remote_sfx_pre_update();
    skateshop_world_preupdate( world_current_instance() );
@@ -321,17 +335,18 @@ static void vg_pre_update(void){
    world_map_pre_update();
 }
 
-static void vg_fixed_update(void){
+void vg_fixed_update(void)
+{
    if( k_tools_mode ) return;
    if( skaterift.op == k_async_op_clientloading ) return;
 
    world_routes_fixedupdate( world_current_instance() );
    player__update();
    vehicle_update_fixed();
-   testing_update();
 }
 
-static void vg_post_update(void){
+void vg_post_update(void)
+{
    if( k_tools_mode ) return;
    if( skaterift.op == k_async_op_clientloading ) return;
 
@@ -359,19 +374,14 @@ static void vg_post_update(void){
    audio_unlock();
 
    vehicle_update_post();
-
-   if( vg.time - skaterift.last_autosave > 20.0 ){
-      if( skaterift_autosave(1) ){
-         skaterift.last_autosave = vg.time;
-      }
-   }
+   skaterift_autosave_update();
 }
 
 /*
  * RENDERING
  * ---------------------------------------------------------------------------*/
 
-static void vg_framebuffer_resize( int w, int h ){
+void vg_framebuffer_resize( int w, int h ){
    render_fb_resize();
 }
 
@@ -406,15 +416,15 @@ static void present_view_with_post_processing(void){
       f32 glitch_strength = 0.0f;
       if( skaterift.activity == k_skaterift_replay ){
          glitch_strength = 0.005f;
-         if( skaterift.replay_control == k_replay_control_play )
+         if( player_replay.replay_control == k_replay_control_play )
             glitch_strength = 0.005f;
          else 
-            glitch_strength += 0.005f*skaterift.track_velocity;
+            glitch_strength += 0.005f*player_replay.track_velocity;
       }
       shader_blitblur_uGlitchStrength( glitch_strength );
 
       v2f override;
-      if( skaterift.activity == k_skaterift_menu )
+      if( (skaterift.activity == k_skaterift_menu) && !menu_viewing_map() )
          v2_muls( (v2f){ 0.04f, 0.001f }, 1.0f-skaterift.time_rate, override );
       else 
          v2_zero( override );
@@ -434,7 +444,7 @@ static void present_view_with_post_processing(void){
 }
 
 static void render_player_transparent(void){
-   static camera small_cam;      /* DOES NOT NEED TO BE STATIC BUT MINGW 
+   static vg_camera small_cam;      /* DOES NOT NEED TO BE STATIC BUT MINGW 
                                     SAIS OTHERWISE */
 
    m4x3_copy( skaterift.cam.transform, small_cam.transform );
@@ -443,9 +453,9 @@ static void render_player_transparent(void){
    small_cam.nearz = 0.05f;
    small_cam.farz  = 60.0f;
 
-   camera_update_view( &small_cam );
-   camera_update_projection( &small_cam );
-   camera_finalize( &small_cam );
+   vg_camera_update_view( &small_cam );
+   vg_camera_update_projection( &small_cam );
+   vg_camera_finalize( &small_cam );
 
    /* Draw player to window buffer and blend background ontop */
    player__render( &small_cam );
@@ -461,17 +471,21 @@ static world_instance *get_view_world(void){
    return view_world;
 }
 
-static void render_scene(void){
+static void render_scene(void)
+{
    /* Draw world */
    glEnable( GL_DEPTH_TEST );
 
-   for( u32 i=0; i<vg_list_size(world_static.instances); i++ ){
-      if( world_static.instances[i].status == k_world_status_loaded ){
+   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] );
       }
    }
 
-   if( skaterift.activity == k_skaterift_world_map ){
+   if( menu_viewing_map() )
+   {
       world_instance *world = world_current_instance();
       glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } );
       
@@ -494,7 +508,7 @@ static void render_scene(void){
       m4x3f identity;
       m4x3_identity( identity );
       render_world_override( world, world, identity, &skaterift.cam, 
-                             world_map.spawn, 
+                             world_map.close_spawn, 
                              (v4f){world->tar_min, world->tar_max, 1.0f, 0.0f});
       render_world_routes( world, world, identity, &skaterift.cam, 0, 1 );
       return;
@@ -513,6 +527,8 @@ static void render_scene(void){
    particle_system_prerender( &particles_env );
    particle_system_render( &particles_env, &skaterift.cam );
 
+   player_glide_render_effects( &skaterift.cam );
+
    /* 
     * render transition 
     */
@@ -550,27 +566,32 @@ static void render_scene(void){
    render_world( holdout_world, &global_miniworld.cam, 1, 0, 1, 1 );
 }
 
-static void skaterift_composite_maincamera(void){
-   camera_lerp( &localplayer.cam, &world_static.focus_cam,
+static void skaterift_composite_maincamera(void)
+{
+   vg_camera_lerp( &localplayer.cam, &world_static.focus_cam,
                 vg_smoothstepf(world_static.focus_strength), &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 );
+   if( skaterift.activity == k_skaterift_replay )
+   {
+      if( player_replay.use_freecam )
+      {
+         freecam_preupdate();
+         v3_copy( player_replay.replay_freecam.pos, skaterift.cam.pos );
+         v3_copy( player_replay.replay_freecam.angles, skaterift.cam.angles );
+         skaterift.cam.fov = player_replay.replay_freecam.fov;
+      }
+      else
+      {
+         skaterift_get_replay_cam( &skaterift.cam );
       }
    }
 
    skaterift.cam.nearz = 0.1f;
    skaterift.cam.farz  = 2100.0f;
 
-   if( skaterift.activity == k_skaterift_world_map ){
-      camera_copy( &world_map.cam, &skaterift.cam );
+   if( menu_viewing_map() )
+   {
+      vg_camera_copy( &world_map.cam, &skaterift.cam );
       skaterift.cam.nearz = 4.0f;
       skaterift.cam.farz = 3100.0f;
    }
@@ -586,19 +607,19 @@ static void skaterift_composite_maincamera(void){
       }
    }
 
-   camera_update_transform( &skaterift.cam );
-   camera_update_view( &skaterift.cam );
-   camera_update_projection( &skaterift.cam );
-   camera_finalize( &skaterift.cam );
+   vg_camera_update_transform( &skaterift.cam );
+   vg_camera_update_view( &skaterift.cam );
+   vg_camera_update_projection( &skaterift.cam );
+   vg_camera_finalize( &skaterift.cam );
 }
 
 static void render_main_game(void){
    if( skaterift.activity == k_skaterift_replay ){
-      player__animate_from_replay( &skaterift.replay );
+      player__animate_from_replay( &player_replay.local );
    }
    else{
       player__animate();
-      skaterift_record_frame( &skaterift.replay, 
+      skaterift_record_frame( &player_replay.local,
                               localplayer.deferred_frame_record );
       localplayer.deferred_frame_record = 0;
    }
@@ -608,7 +629,8 @@ static void render_main_game(void){
    skaterift_composite_maincamera();
 
    /* --------------------------------------------------------------------- */
-   if( skaterift.activity != k_skaterift_world_map ){
+   if( menu_viewing_map() )
+   {
       world_instance *world = world_current_instance();
       render_world_cubemaps( world );
 
@@ -634,19 +656,20 @@ static void render_main_game(void){
                                    portals */
 
    /* continue with variable rate */
-   if( !global_miniworld.transition && 
-         (skaterift.activity != k_skaterift_world_map) ){
+   if( !global_miniworld.transition && !menu_viewing_map() )
+   {
       render_fb_bind( gpipeline.fb_main, 1 );
       render_world_gates( get_view_world(), &skaterift.cam );
    }
 
    /* composite */
    present_view_with_post_processing();
-
    skaterift_replay_post_render();
+   control_overlay_render();
 }
 
-static void vg_render(void){
+void vg_render(void)
+{
    if( k_tools_mode ){
       glBindFramebuffer( GL_FRAMEBUFFER, 0 );
       glViewport( 0,0, vg.window_x, vg.window_y );
@@ -656,7 +679,7 @@ static void vg_render(void){
    }
 
    if( skaterift.op == k_async_op_clientloading ){
-      _vg_loader_render();
+      vg_loader_render();
       return;
    }
 
@@ -677,12 +700,16 @@ static void vg_render(void){
    glDisable(GL_DEPTH_TEST);
    vg_lines_drawall();
    glViewport( 0,0, vg.window_x, vg.window_y );
-   gui_draw();
+
+   gui_render_icons();
 }
 
-static void vg_gui(void){
+void vg_gui(void)
+{
    if( skaterift.op == k_async_op_clientloading ) return;
 
+   gui_draw();
+
    if( k_tools_mode ){
       ui_rect null;
       ui_rect screen = { 0, 0, vg.window_x, vg.window_y };
@@ -695,17 +722,6 @@ static void vg_gui(void){
 
       ui_rect_pad( panel, (ui_px[2]){ 8, 8 } );
 
-      static i32 example;
-      ui_enum( panel, "example enum", vg_settings_vsync_enum, 3, &example );
-
-      static f32 val = 30.0f;
-      ui_slider( panel, "Slider", 0.0f, 100.0f, &val, NULL );
-
-      ui_dev_colourview();
-
-      static v4f colour = { 0.5f, 0.6f, 0.1f, 1.0f };
-      ui_colourpicker( panel, "hello", colour );
-
       return;
    }
 
@@ -715,12 +731,7 @@ static void vg_gui(void){
    vg_ui.tex_bg = gpipeline.fb_main->attachments[0].id;
    render_fb_inverse_ratio( gpipeline.fb_main, vg_ui.bg_inverse_ratio );
 
-   menu_update();
-   if( skaterift.activity == k_skaterift_menu ){
-      glClear( GL_DEPTH_BUFFER_BIT );
-      menu_render();
-   }
-
+   menu_gui();
    player__im_gui();
    world_instance *world = world_current_instance();
 
@@ -730,12 +741,70 @@ static void vg_gui(void){
    render_view_framebuffer_ui();
    remote_player_network_imgui( vg.pv );
 
-   if( skaterift.activity == k_skaterift_world_map ){
+   if( menu_viewing_map() )
+   {
       remote_players_imgui_world( world_current_instance(), vg.pv, 2000.0f, 0 );
       remote_players_imgui_lobby();
    }
-   else {
+   else 
+   {
       remote_players_chat_imgui(); /* TODO: conditional */
       remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 );
    }
 }
+
+#include "addon.c"
+#include "addon_types.c"
+#include "audio.c"
+#include "ent_challenge.c"
+#include "ent_glider.c"
+#include "entity.c"
+#include "ent_miniworld.c"
+#include "ent_objective.c"
+#include "ent_region.c"
+#include "ent_relay.c"
+#include "ent_route.c"
+#include "ent_skateshop.c"
+#include "ent_tornado.c"
+#include "ent_traffic.c"
+#include "freecam.c"
+#include "menu.c"
+#include "network.c"
+#include "particle.c"
+#include "player_basic_info.c"
+#include "player.c"
+#include "player_common.c"
+#include "player_dead.c"
+#include "player_drive.c"
+#include "player_effects.c"
+#include "player_glide.c"
+#include "player_ragdoll.c"
+#include "player_remote.c"
+#include "player_render.c"
+#include "player_replay.c"
+#include "player_skate.c"
+#include "player_walk.c"
+#include "render.c"
+#include "save.c"
+#include "scene.c"
+#include "steam.c"
+#include "trail.c"
+#include "vehicle.c"
+#include "workshop.c"
+#include "world_audio.c"
+#include "world.c"
+#include "world_entity.c"
+#include "world_gate.c"
+#include "world_gen.c"
+#include "world_load.c"
+#include "world_map.c"
+#include "world_physics.c"
+#include "world_render.c"
+#include "world_routes.c"
+#include "world_routes_ui.c"
+#include "world_sfd.c"
+#include "world_volumes.c"
+#include "world_water.c"
+#include "ent_npc.c"
+#include "model.c"
+#include "control_overlay.c"