X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=8543f6a4e864566749d6e1cf39b830fa8ca35e08;hb=5fa590f62aa7e62a8b6b07e10556c2ecc54cdca6;hp=c23d022fec2911716c2d79bc3cb4b8efb888f5e0;hpb=d3021395f97b2ae244835c6656008386c8874343;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index c23d022..8543f6a 100644 --- a/skaterift.c +++ b/skaterift.c @@ -2,7 +2,7 @@ * ============================================================================= * * Copyright . . . -----, ,----- ,---. .---. - * 2021-2023 |\ /| | / | | | | /| + * 2021-2024 |\ /| | / | | | | /| * | \ / | +-- / +----- +---' | / | * | \ / | | / | | \ | / | * | \/ | | / | | \ | / | @@ -11,14 +11,7 @@ * ============================================================================= */ -#if 1 - -#define SR_NETWORKED -#define SR_USE_LOCALHOST - -#ifndef VG_RELEASE - #define VG_DEVWINDOW -#endif +#define SR_ALLOW_REWIND_HUB /* * system headers @@ -27,7 +20,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,22 +34,24 @@ #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" -/* 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" -#include "respawn.c" -#include "network.c" -#include "player_remote.c" -#include "vg/vg_audio_dsp.h" +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; @@ -65,7 +62,8 @@ int main( int argc, char *argv[] ){ 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; @@ -79,9 +77,18 @@ static void vg_launch_opt(void){ if( vg_long_opt( "tools" ) ){ k_tools_mode = 1; } + + if( vg_long_opt( "demo" ) ){ + skaterift.demo_mode = 1; + } + + if( (arg = vg_long_opt_arg( "world" )) ){ + skaterift.hub_world = arg; + } } -static void vg_preload(void){ +void vg_preload(void) +{ vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" ); vg_info(" | \\ / | +-- / +----- +---' | / | \n" ); @@ -90,6 +97,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 ) @@ -100,13 +113,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); } @@ -115,19 +121,22 @@ static void async_call_ready( void *payload, u32 size ){ skaterift.op = k_async_op_none; } -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) ); - 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; - vg_msg_cursor orig = kvsav.cur; + 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" ) ){ addon_alias q; @@ -153,55 +162,77 @@ 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; + if( !reg ) vg_fatal_error( "world not found\n" ); + reg->flags |= (ADDON_REG_HIDDEN | ext); return reg; } -static void vg_load(void){ +static void skaterift_load_world_content(void){ + /* hub world */ + addon_reg *hub = skaterift_mount_world_unloadable( skaterift.hub_world, 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 ); + skaterift_mount_world_unloadable( "maps/dev_flatworld", 0 ); + + world_static.load_state = k_world_loader_load; + + struct world_load_args args = { + .purpose = k_world_purpose_hub, + .reg = hub + }; + skaterift_world_load_thread( &args ); +} + +static void skaterift_load_player_content(void) +{ + particle_alloc( &particles_grind, 300 ); + particle_alloc( &particles_env, 200 ); + + 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" ); +} + +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_var( "immobile", &localplayer.immobile, k_var_dtype_i32, 0 ); vg_loader_step( render_init, NULL ); vg_loader_step( menu_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( load_playermodels, NULL ); - - /* player setup */ - u32 bytes = 1024*1024*10; - skaterift.replay.data = vg_linear_alloc( vg_mem.rtmemory, bytes ); - skaterift.replay.size = bytes; - replay_clear( &skaterift.replay ); - - player_load_animation_reference( "models/ch_none.mdl" ); - - player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" ); - player__bind(); + vg_loader_step( ent_tornado_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 */ @@ -209,20 +240,8 @@ 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" ); - /* load home/permanent world manually */ - world_static.load_state = k_world_loader_load; - - struct world_load_args args = { - .purpose = k_world_purpose_hub, - .reg = hub - }; - skaterift_world_load_thread( &args ); - + vg_loader_step( skaterift_load_world_content, NULL ); vg_async_call( async_skaterift_player_start, NULL, 0 ); vg_async_stall(); @@ -239,6 +258,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); @@ -250,30 +271,33 @@ 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_respawning) ){ + k_skaterift_world_map) ) + { target = 0; } @@ -282,17 +306,19 @@ static void vg_pre_update(void){ /* TODO: how can we compress this? */ ent_miniworld_preupdate(); - player__pre_update(); world_entity_focus_preupdate(); + player__pre_update(); 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 ); - respawn_chooser_pre_update(); + 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; @@ -301,7 +327,8 @@ static void vg_fixed_update(void){ vehicle_update_fixed(); } -static void vg_post_update(void){ +void vg_post_update(void) +{ if( k_tools_mode ) return; if( skaterift.op == k_async_op_clientloading ) return; @@ -329,19 +356,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(); } @@ -376,10 +398,10 @@ 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 ); @@ -404,7 +426,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 ); @@ -413,9 +435,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 ); @@ -441,7 +463,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 } ); @@ -464,7 +486,8 @@ static void render_scene(void){ m4x3f identity; m4x3_identity( identity ); render_world_override( world, world, identity, &skaterift.cam, - respawn_chooser.spawn, 1.0f ); + 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; } @@ -472,6 +495,18 @@ static void render_scene(void){ world_instance *view_world = get_view_world(); render_world( view_world, &skaterift.cam, 0, 0, 1, 1 ); + 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 ); + + ent_tornado_pre_update(); + particle_system_update( &particles_env, vg.time_delta ); + particle_system_prerender( &particles_env ); + particle_system_render( &particles_env, &skaterift.cam ); + + player_glide_render_effects( &skaterift.cam ); + /* * render transition */ @@ -509,19 +544,31 @@ 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.activity == k_skaterift_replay ){ - skaterift_get_replay_camera( &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_respawning ){ - camera_copy( &respawn_chooser.cam, &skaterift.cam ); + if( skaterift.activity == k_skaterift_world_map ){ + vg_camera_copy( &world_map.cam, &skaterift.cam ); skaterift.cam.nearz = 4.0f; skaterift.cam.farz = 3100.0f; } @@ -532,27 +579,26 @@ 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 ); - 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, 0 ); + skaterift_record_frame( &player_replay.local, + localplayer.deferred_frame_record ); + localplayer.deferred_frame_record = 0; } animate_remote_players(); player__pre_render(); @@ -560,7 +606,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 ); @@ -587,18 +633,18 @@ 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 ); } /* composite */ present_view_with_post_processing(); - skaterift_replay_post_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 ); @@ -608,7 +654,7 @@ static void vg_render(void){ } if( skaterift.op == k_async_op_clientloading ){ - _vg_loader_render(); + vg_loader_render(); return; } @@ -632,9 +678,31 @@ static void vg_render(void){ gui_draw(); } -static void vg_gui(void){ +void vg_gui(void) +{ if( skaterift.op == k_async_op_clientloading ) return; + if( k_tools_mode ){ + ui_rect null; + ui_rect screen = { 0, 0, vg.window_x, vg.window_y }; + ui_rect panel = { 0, 0, 1000, 700 }; + ui_rect_center( screen, panel ); + vg_ui.wants_mouse = 1; + + ui_fill( panel, ui_colour( k_ui_bg+1 ) ); + ui_outline( panel, 1, ui_colour( k_ui_bg+7 ), 0 ); + + ui_rect_pad( panel, (ui_px[2]){ 8, 8 } ); + + return; + } + + if( k_light_editor ) + imgui_world_light_edit( world_current_instance() ); + + 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 ); @@ -644,12 +712,13 @@ 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 ){ + if( skaterift.activity == k_skaterift_world_map ){ remote_players_imgui_world( world_current_instance(), vg.pv, 2000.0f, 0 ); remote_players_imgui_lobby(); } @@ -659,9 +728,57 @@ static void vg_gui(void){ } } - -#else - -#include "skaterift_imgui_dev.c" - -#endif +#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"