X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=254c80df27e6a28700d52ed788bdf2b657408ac3;hb=d171c9ad5de05c9ac8563fcf9f23760b93fb50f8;hp=b06db689de4648c2c0217f9b9d16d468ea00d1c5;hpb=6c84fa207dec2cf8e92b3882492bdd2f92ee7afe;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index b06db68..254c80d 100644 --- a/skaterift.c +++ b/skaterift.c @@ -14,7 +14,11 @@ #if 1 #define SR_NETWORKED -#define VG_DEVWINDOW +#define SR_USE_LOCALHOST + +#ifndef VG_RELEASE + #define VG_DEVWINDOW +#endif /* * system headers @@ -33,8 +37,8 @@ #include "network.h" #include "menu.h" #include "vehicle.h" -#include "pointcloud.h" #include "save.h" +#include "player_remote.h" /* unity build * ----------------- */ @@ -47,8 +51,12 @@ #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" -static struct player_avatar localplayer_avatar; +static int k_tools_mode = 0; int main( int argc, char *argv[] ){ vg_mem.use_libc_malloc = 0; @@ -57,11 +65,23 @@ int main( int argc, char *argv[] ){ return 0; } -VG_STATIC void vg_launch_opt(void){} +static 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 ); + } -VG_STATIC void vg_preload(void){ - skaterift_read_savedata(); + if( vg_long_opt( "tools" ) ){ + k_tools_mode = 1; + } +} +static void vg_preload(void){ vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" ); vg_info(" | \\ / | +-- / +----- +---' | / | \n" ); @@ -70,21 +90,25 @@ vg_info(" | \\/ | | / | | \\ | / | \n" ); vg_info(" ' ' '--' [] '----- '----- ' ' '---' " "SOFTWARE\n" ); + vg_loader_step( remote_players_init, NULL ); + + if( k_tools_mode ) + return; + steam_init(); vg_loader_step( NULL, steam_end ); vg_loader_step( network_init, network_end ); } -VG_STATIC void load_playermodels(void){ +static void load_playermodels(void){ /* FIXME: hack */ shader_model_character_view_register(); shader_model_board_view_register(); shader_model_entity_register(); } -VG_STATIC void async_skaterift_player_start( void *payload, u32 size ){ - localplayer.viewable_world = world_current_instance(); - localplayer_cmd_respawn( 1, (const char *[]){ "start" } ); +static void async_skaterift_player_start( void *payload, u32 size ){ + world_switch_instance(0); } static void async_call_ready( void *payload, u32 size ){ @@ -92,66 +116,85 @@ static void async_call_ready( void *payload, u32 size ){ } static void skaterift_restore_state(void){ - vg_msg sav = {0}; - sav.buf = savedata.buf; - sav.len = savedata.len; - sav.max = sizeof(savedata.buf); + savedata_file sav; + strcpy( sav.path, str_skaterift_main_save ); + savedata_file_read( &sav ); + + vg_msg kvsav; + vg_msg_init( &kvsav, sav.buf, sizeof(sav.buf) ); + + u32 board_reg_id = 0, + player_reg_id = 0; - vg_msg player = sav; - if( vg_msg_seekframe( &player, "player", 0 ) ){ + vg_msg_cursor orig = kvsav.cur; + + if( vg_msg_seekframe( &kvsav, "player" ) ){ addon_alias q; /* board */ - skaterift_read_addon_alias( &player, "board", k_addon_type_board, &q ); + skaterift_read_addon_alias( &kvsav, "board", k_addon_type_board, &q ); u32 reg_id = addon_match( &q ); - if( reg_id != 0xffffffff ){ - localplayer.board_view_slot = - addon_cache_create_viewer( k_addon_type_board, reg_id ); - } + if( reg_id != 0xffffffff ) + board_reg_id = reg_id; /* playermodel */ - skaterift_read_addon_alias( &player, "playermodel", + skaterift_read_addon_alias( &kvsav, "playermodel", k_addon_type_player, &q ); reg_id = addon_match( &q ); - - if( reg_id == 0xffffffff ) reg_id = 0; - localplayer.playermodel_view_slot = - addon_cache_create_viewer( k_addon_type_player, reg_id ); + if( reg_id != 0xffffffff ) + player_reg_id = reg_id; } - vg_msg world = sav; - if( vg_msg_seekframe( &world, "world", 0 ) ){ + localplayer.board_view_slot = + addon_cache_create_viewer( k_addon_type_board, board_reg_id ); + localplayer.playermodel_view_slot = + 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( &world, "alias", k_addon_type_world, &q ); + 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_loader.generate_point_cloud = 0; - world_loader.reg = reg; - world_loader.state = k_world_loader_load; - skaterift_world_changer_thread(NULL); + 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_static.active_world = vg_msg_seekkvu32( &world, "index", 0 ); + world_set_active_instance( vg_msg_getkvu32( &kvsav, "index", 0 ) ); world_static.active_trigger_volume_count = 0; localplayer.viewable_world = world_current_instance(); - - vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 ); - v3f pos; - vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos ); - player__setpos( &localplayer, pos ); } + + 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 } -VG_STATIC void vg_load(void){ - vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL ); +static void vg_load(void){ + if( k_tools_mode ){ + vg_async_call( async_call_ready, NULL, 0 ); + return; + } + + vg_console_reg_cmd( "load_world", skaterift_load_world_command, NULL ); + vg_console_reg_cmd( "switch_active_instance", + skaterift_switch_instance_cmd, NULL ); vg_loader_step( render_init, NULL ); vg_loader_step( menu_init, NULL ); - vg_loader_step( pointcloud_init, NULL ); vg_loader_step( world_init, NULL ); vg_loader_step( vehicle_init, NULL ); vg_loader_step( font3d_init, NULL ); @@ -169,16 +212,15 @@ VG_STATIC void vg_load(void){ vg_loader_step( load_playermodels, NULL ); /* player setup */ - u32 bytes = (1024*1024*1)/2; + u32 bytes = 1024*1024*10; skaterift.replay.data = vg_linear_alloc( vg_mem.rtmemory, bytes ); skaterift.replay.size = bytes; replay_clear( &skaterift.replay ); - player__create( &localplayer ); - player_avatar_load( &localplayer_avatar, "models/ch_none.mdl" ); - player__use_avatar( &localplayer, &localplayer_avatar ); + player_load_animation_reference( "models/ch_none.mdl" ); + player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" ); - player__bind( &localplayer ); + player__bind(); /* --------------------- */ @@ -186,34 +228,28 @@ VG_STATIC void vg_load(void){ vg_loader_step( audio_init, audio_free ); /* 'systems' are completely loaded now */ - - /* load home/permanent world manually */ - world_loader.reg = NULL; - strcpy( world_loader.override_name, "mp_spawn" ); - world_loader.generate_point_cloud = 1; - world_loader.world_index = 0; - world_load_mdl( "maps/mp_spawn/main.mdl" ); - - vg_async_call( async_skaterift_player_start, NULL, 0 ); - vg_async_stall(); /* Completing addon registrations * ------------------------------------- */ + /* 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 = {0}; - msg.buf = spawn->metadata; - msg.max = sizeof(spawn->metadata); + 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; + spawn->metadata_len = msg.cur.co; } /* mtzero island */ @@ -221,19 +257,26 @@ VG_STATIC void vg_load(void){ k_addon_type_world, ".mdl" ); { - vg_msg msg = {0}; - msg.buf = mtzero->metadata; - msg.max = sizeof(mtzero->metadata); + 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; + mtzero->metadata_len = msg.cur.co; } - global_skateshop.selected_world_id=1; - global_skateshop.pointcloud_world_id=1; - skateshop_world_preview_loader_thread( mtzero ); /* HACK */ + /* 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_async_call( async_skaterift_player_start, NULL, 0 ); + vg_async_stall(); vg_console_load_autos(); menu_link(); @@ -248,63 +291,73 @@ VG_STATIC void vg_load(void){ /* and now */ skaterift_restore_state(); - vg_loader_step( NULL, skaterift_write_savedata ); + vg_loader_step( NULL, skaterift_autosave_synchronous ); - board_processview_thread(NULL); + //board_processview_thread(NULL); vg_async_call( async_call_ready, NULL, 0 ); } -VG_STATIC void draw_origin_axis(void){ +static void draw_origin_axis(void){ vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 1.0f, 0.0f, 0.0f }, 0xffff0000 ); 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_world_preupdate(void); +static void skaterift_change_client_world_preupdate(void); /* * UPDATE LOOP * ---------------------------------------------------------------------------*/ -VG_STATIC void vg_pre_update(void){ - srinput.enabled = 1; +static void vg_pre_update(void){ + skaterift_preupdate_inputs(); + + if( k_tools_mode ) return; steam_update(); - skaterift_preupdate_inputs(); if( skaterift.op == k_async_op_clientloading ) return; - if( world_loader.state == k_world_loader_preload ) - skaterift_change_world_preupdate(); + if( world_static.load_state == k_world_loader_preload ) + skaterift_change_client_world_preupdate(); draw_origin_axis(); + skateshop_autostart_loading(); network_update(); /* time rate */ f32 target = 1; - if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu) ) + if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu| + k_skaterift_respawning) ) { target = 0; + } - vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * 6.0f ); + vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * (1.0f/0.3f) ); vg.time_rate = vg_smoothstepf( skaterift.time_rate ); - player__pre_update( &localplayer ); - global_skateshop_preupdate(); + /* TODO: how can we compress this? */ + ent_miniworld_preupdate(); + player__pre_update(); + world_entity_focus_preupdate(); skaterift_replay_pre_update(); + remote_sfx_pre_update(); world_update( world_current_instance(), localplayer.rb.co ); audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co ); + respawn_chooser_pre_update(); } -VG_STATIC void vg_fixed_update(void){ +static 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( &localplayer ); + player__update(); vehicle_update_fixed(); } -VG_STATIC void vg_post_update(void){ +static void vg_post_update(void){ + if( k_tools_mode ) return; if( skaterift.op == k_async_op_clientloading ) return; - player__post_update( &localplayer ); + player__post_update(); float dist; int sample_index; @@ -328,17 +381,23 @@ VG_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; + } + } } /* * RENDERING * ---------------------------------------------------------------------------*/ -VG_STATIC void vg_framebuffer_resize( int w, int h ){ +static void vg_framebuffer_resize( int w, int h ){ render_fb_resize(); } -VG_STATIC void present_view_with_post_processing(void){ +static void present_view_with_post_processing(void){ glBindFramebuffer( GL_FRAMEBUFFER, 0 ); glViewport( 0,0, vg.window_x, vg.window_y ); @@ -358,6 +417,24 @@ VG_STATIC void present_view_with_post_processing(void){ (vg.time_frame_delta*60.0) ); shader_blitblur_uInverseRatio( inverse ); + inverse[0] -= 0.0001f; + inverse[1] -= 0.0001f; + shader_blitblur_uClampUv( inverse ); + + static f64 effect_time = 133.0; + effect_time += vg.time_frame_delta; + shader_blitblur_uTime( effect_time ); + + f32 glitch_strength = 0.0f; + if( skaterift.activity == k_skaterift_replay ){ + glitch_strength = 0.005f; + if( skaterift.replay_control == k_replay_control_play ) + glitch_strength = 0.005f; + else + glitch_strength += 0.005f*skaterift.track_velocity; + } + shader_blitblur_uGlitchStrength( glitch_strength ); + v2f override; if( skaterift.activity == k_skaterift_menu ) v2_muls( (v2f){ 0.04f, 0.001f }, 1.0f-skaterift.time_rate, override ); @@ -378,7 +455,7 @@ VG_STATIC void present_view_with_post_processing(void){ render_fsquad(); } -VG_STATIC void render_player_transparent(void){ +static void render_player_transparent(void){ static camera small_cam; /* DOES NOT NEED TO BE STATIC BUT MINGW SAIS OTHERWISE */ @@ -393,110 +470,146 @@ VG_STATIC void render_player_transparent(void){ camera_finalize( &small_cam ); /* Draw player to window buffer and blend background ontop */ - glBindFramebuffer( GL_FRAMEBUFFER, 0 ); - glViewport( 0,0, vg.window_x, vg.window_y ); - player__render( &small_cam, &localplayer ); + player__render( &small_cam ); } -VG_STATIC void render_scene(void){ - render_fb_bind( gpipeline.fb_main, 1 ); - glClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); - glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT ); - +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; istatus != k_world_status_loaded ) + return; - render_water_texture( view_world, &skaterift.cam, 0 ); - render_fb_bind( gpipeline.fb_main, 1 ); - render_water_surface( view_world, &skaterift.cam ); -} + t = vg_smoothstepf( t ); -VG_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; /* ??? */ + glEnable( GL_STENCIL_TEST ); + glDisable( GL_DEPTH_TEST ); + glStencilOp( GL_KEEP, GL_KEEP, GL_REPLACE ); + glStencilFunc( GL_ALWAYS, 1, 0xFF ); + glStencilMask( 0xFF ); - int depth = 1; - if( localplayer.gate_waiting ) depth = 0; - render_world_gates( view_world, &skaterift.cam, depth ); + shader_blit_transition_use(); + shader_blit_transition_uInverseRatio( (v2f){1.0f,1.0f} ); + shader_blit_transition_uT( -(sqrtf(2)+0.5f) * t ); + + render_fsquad(); + render_world( holdout_world, &global_miniworld.cam, 1, 0, 1, 1 ); + } } -VG_STATIC void skaterift_composite_maincamera(void){ - camera_lerp( &localplayer.cam, &global_skateshop.cam, - vg_smoothstepf(global_skateshop.factive), &skaterift.cam ); +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 ){ - camera temp; - replay_get_camera( &skaterift.replay, &temp ); - camera_lerp( &skaterift.cam, &temp, 1.0f-skaterift.time_rate, - &skaterift.cam ); + skaterift_get_replay_camera( &skaterift.cam ); } skaterift.cam.nearz = 0.1f; skaterift.cam.farz = 2100.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( 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 { + } } - else{ - m3x3_mul( localplayer.basis, skaterift.cam.transform, - skaterift.cam.transform ); + + if( skaterift.activity == k_skaterift_respawning ){ + camera_copy( &respawn_chooser.cam, &skaterift.cam ); + skaterift.cam.nearz = 4.0f; + skaterift.cam.farz = 3100.0f; } - + + camera_update_transform( &skaterift.cam ); camera_update_view( &skaterift.cam ); camera_update_projection( &skaterift.cam ); camera_finalize( &skaterift.cam ); } -VG_STATIC void render_main_game(void){ - player__animate( &localplayer ); +static void render_main_game(void){ if( skaterift.activity == k_skaterift_replay ){ - player__animate_from_replay( &localplayer, &skaterift.replay ); + player__animate_from_replay( &skaterift.replay ); + } + else{ + player__animate(); + skaterift_record_frame( &skaterift.replay, 0 ); } - else - player_record_replay_frame( &localplayer, &skaterift.replay, 0 ); - player__pre_render( &localplayer ); + animate_remote_players(); + player__pre_render(); skaterift_composite_maincamera(); - render_scene(); + /* --------------------------------------------------------------------- */ + render_world_cubemaps( world_current_instance() ); + + /* variable res target */ + render_fb_bind( gpipeline.fb_main, 1 ); + glClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); + glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT ); + render_scene(); glEnable( GL_DEPTH_TEST ); - render_player_transparent(); - render_scene_gate_subview(); + /* full res target */ + glBindFramebuffer( GL_FRAMEBUFFER, 0 ); + glViewport( 0,0, vg.window_x, vg.window_y ); + + render_player_transparent(); /* needs to read the depth buffer before we fuck + it up with the oblique rendering inside the + portals */ + + /* continue with variable rate */ + if( !global_miniworld.transition ){ + render_fb_bind( gpipeline.fb_main, 1 ); + render_world_gates( world_current_instance(), &skaterift.cam ); + } + /* composite */ present_view_with_post_processing(); - /* capture the current resume frame at the very last point */ - if( button_down( k_srbind_reset ) ){ - if( skaterift.activity == k_skaterift_default ){ - skaterift.activity = k_skaterift_replay; - player_record_replay_frame( &localplayer, &skaterift.replay, 1 ); - } - } + skaterift_replay_post_render(); } -VG_STATIC void vg_render(void){ +static void vg_render(void){ + if( k_tools_mode ){ + glBindFramebuffer( GL_FRAMEBUFFER, 0 ); + glViewport( 0,0, vg.window_x, vg.window_y ); + glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); + glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT ); + return; + } + if( skaterift.op == k_async_op_clientloading ){ _vg_loader_render(); return; @@ -522,7 +635,7 @@ VG_STATIC void vg_render(void){ gui_draw(); } -VG_STATIC void vg_gui(void){ +static void vg_gui(void){ if( skaterift.op == k_async_op_clientloading ) return; menu_update(); @@ -531,12 +644,24 @@ VG_STATIC void vg_gui(void){ menu_render(); } - player__im_gui( &localplayer ); + player__im_gui(); world_instance *world = world_current_instance(); 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_lobby(); + } + else { + remote_players_chat_imgui(); /* TODO: conditional */ + remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 ); + } }