X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=34e42f39cd5ed8ee533490a37aa8971d6ab77419;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=d22846ff0fe65d57ff7b6626ec4c8b7b3477498c;hpb=342fcbf6fda017bdd38d56ce0fa7c9e59e589f3b;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index d22846f..34e42f3 100644 --- a/skaterift.c +++ b/skaterift.c @@ -14,14 +14,17 @@ #if 1 #define SR_NETWORKED -#define VG_DEVWINDOW +#define SR_USE_LOCALHOST + +#ifndef VG_RELEASE + #define VG_DEVWINDOW +#endif /* * system headers * --------------------- */ -#include "common.h" -#include "conf.h" +#include "skaterift.h" #include "steam.h" #include "render.h" #include "audio.h" @@ -35,6 +38,8 @@ #include "menu.h" #include "vehicle.h" #include "pointcloud.h" +#include "save.h" +#include "player_remote.h" /* unity build * ----------------- */ @@ -44,30 +49,37 @@ #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" static struct player_avatar localplayer_avatar; -static struct player_model localplayer_models[3]; -int main( int argc, char *argv[] ) -{ +int main( int argc, char *argv[] ){ vg_mem.use_libc_malloc = 0; vg_set_mem_quota( 160*1024*1024 ); vg_enter( argc, argv, "Voyager Game Engine" ); return 0; } -VG_STATIC void highscores_save_at_exit(void) -{ - highscores_serialize_all(); -} +static void vg_launch_opt(void){ + const char *arg; + if( vg_long_opt( "noauth" ) ){ + network_client.auth_mode = eServerModeNoAuthentication; + } -VG_STATIC void vg_launch_opt(void) -{ + 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) -{ - g_conf_init(); +static void vg_preload(void){ + //skaterift_read_savedata(); vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" ); @@ -77,43 +89,94 @@ vg_info(" | \\/ | | / | | \\ | / | \n" ); vg_info(" ' ' '--' [] '----- '----- ' ' '---' " "SOFTWARE\n" ); - highscores_init( 2000, 50 ); - if( !highscores_read() ) - highscores_create_db(); - - vg_loader_step( NULL, highscores_save_at_exit ); - steam_init(); vg_loader_step( NULL, steam_end ); + vg_loader_step( remote_players_init, NULL ); vg_loader_step( network_init, network_end ); } -VG_STATIC void load_playermodels(void) -{ - player_model_load( &localplayer_models[0], "models/ch_new.mdl" ); - player_model_load( &localplayer_models[1], "models/ch_outlaw.mdl" ); - player_model_load( &localplayer_models[2], "models/ch_jordan.mdl" ); - +static void load_playermodels(void){ /* FIXME: hack */ shader_model_character_view_register(); shader_model_board_view_register(); shader_model_entity_register(); } -void temp_update_playermodel(void){ - player__use_model( &localplayer, &localplayer_models[cl_playermdl_id] ); -} - -VG_STATIC void async_skaterift_complete( void *payload, u32 size ) -{ +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_call_ready( void *payload, u32 size ){ + skaterift.op = k_async_op_none; +} + +static void skaterift_restore_state(void){ + 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_cursor orig = kvsav.cur; + + if( vg_msg_seekframe( &kvsav, "player" ) ){ + addon_alias q; + + /* board */ + skaterift_read_addon_alias( &kvsav, "board", k_addon_type_board, &q ); + u32 reg_id = addon_match( &q ); + if( reg_id != 0xffffffff ) + board_reg_id = reg_id; + + /* playermodel */ + skaterift_read_addon_alias( &kvsav, "playermodel", + k_addon_type_player, &q ); + reg_id = addon_match( &q ); + if( reg_id != 0xffffffff ) + player_reg_id = reg_id; + } + + 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( 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} ); - skaterift_end_op(); + if( v3_length2(pos) > 1.0f ) + player__setpos( pos ); + } } -VG_STATIC void vg_load(void) -{ +static void vg_load(void){ vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL ); vg_loader_step( render_init, NULL ); @@ -126,6 +189,9 @@ VG_STATIC void vg_load(void) vg_loader_step( player_init, NULL ); vg_loader_step( player_ragdoll_init, NULL ); + + /* content stuff */ + vg_loader_step( addon_system_init, NULL ); vg_loader_step( workshop_init, NULL ); vg_loader_step( skateshop_init, NULL ); @@ -133,11 +199,22 @@ VG_STATIC void vg_load(void) vg_loader_step( load_playermodels, NULL ); /* player setup */ - player__create( &localplayer ); - player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" ); - player__use_avatar( &localplayer, &localplayer_avatar ); - player__use_model( &localplayer, &localplayer_models[cl_playermdl_id] ); - player__bind( &localplayer ); + u32 bytes = 1024*1024*10; + skaterift.replay.data = vg_linear_alloc( vg_mem.rtmemory, bytes ); + skaterift.replay.size = bytes; + replay_clear( &skaterift.replay ); + + player_avatar_load( &localplayer_avatar, "models/ch_none.mdl" ); + player__use_avatar( &localplayer_avatar ); + + /* FIXME FIXME FIXME FIXME FIXME */ + u32 mtx_size = sizeof(m4x3f)*localplayer_avatar.sk.bone_count; + localplayer.final_mtx = vg_linear_alloc( vg_mem.rtmemory, mtx_size ); + netplayers.final_mtx = vg_linear_alloc( vg_mem.rtmemory, + mtx_size*NETWORK_MAX_PLAYERS ); + + player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" ); + player__bind(); /* --------------------- */ @@ -145,62 +222,130 @@ VG_STATIC void vg_load(void) vg_loader_step( audio_init, audio_free ); /* 'systems' are completely loaded now */ - + + /* Completing addon registrations + * ------------------------------------- + */ + + /* 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; + } + /* load home/permanent world manually */ - strcpy( world_loader.name, "mp_spawn" ); - world_loader.generate_point_cloud = 1; - world_loader.world_index = 0; - world_loader.location = k_world_load_type_local; - world_load_mdl( "maps/mp_spawn/main.mdl" ); + world_static.load_state = k_world_loader_load; + struct world_load_args args = { + .purpose = k_world_purpose_hub, + .reg = spawn + }; + skaterift_world_load_thread( &args ); + + vg_async_call( async_skaterift_player_start, NULL, 0 ); + vg_async_stall(); + + + global_skateshop.selected_world_id=1; + global_skateshop.pointcloud_world_id=1; + skateshop_world_preview_loader_thread( mtzero ); /* HACK */ vg_console_load_autos(); menu_link(); - vg_async_call( async_skaterift_complete, NULL, 0 ); + addon_mount_content_folder( k_addon_type_player, + "playermodels", ".mdl" ); + addon_mount_content_folder( k_addon_type_board, "boards", ".mdl" ); + addon_mount_content_folder( k_addon_type_world, "maps", ".mdl" ); + addon_mount_workshop_items(); + vg_async_call( async_addon_reg_update, NULL, 0 ); + vg_async_stall(); + + /* and now */ + skaterift_restore_state(); + vg_loader_step( NULL, skaterift_autosave_synchronous ); + + //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_client_world_preupdate(void); + +/* + * UPDATE LOOP + * ---------------------------------------------------------------------------*/ + +static void vg_pre_update(void){ + srinput.enabled = 1; -static void skaterift_change_world_preupdate(void); -VG_STATIC void vg_update(void) -{ steam_update(); skaterift_preupdate_inputs(); - if( skaterift.async_op == k_async_op_clientloading ) return; - if( skaterift.async_op == k_async_op_world_preloading ){ - skaterift_change_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(); network_update(); + + /* time rate */ + f32 target = 1; + if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu| + k_skaterift_respawning) ) { + target = 0; + } + + 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(); + 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 ); - //gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" ); + respawn_chooser_pre_update(); } -VG_STATIC void vg_update_fixed(void) -{ - if( skaterift.async_op == k_async_op_clientloading ) return; +static void vg_fixed_update(void){ + 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_update_post(void) -{ - if( skaterift.async_op == k_async_op_clientloading ) return; +static void vg_post_update(void){ + if( skaterift.op == k_async_op_clientloading ) return; - player__post_update( &localplayer ); + player__post_update(); float dist; int sample_index; @@ -210,9 +355,9 @@ VG_STATIC void vg_update_post(void) vg_dsp.echo_distances[sample_index] = dist; v3f ears = { 1.0f,0.0f,0.0f }; - m3x3_mulv( main_camera.transform, ears, ears ); + m3x3_mulv( skaterift.cam.transform, ears, ears ); v3_copy( ears, vg_audio.external_listener_ears ); - v3_copy( main_camera.transform[3], vg_audio.external_listener_pos ); + v3_copy( skaterift.cam.transform[3], vg_audio.external_listener_pos ); if( localplayer.gate_waiting ){ m4x3_mulv( localplayer.gate_waiting->transport, @@ -223,17 +368,24 @@ VG_STATIC void vg_update_post(void) v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity ); audio_unlock(); - vg.time_rate = 1.0f-menu.factive; vehicle_update_post(); + + if( vg.time - skaterift.last_autosave > 20.0 ){ + if( skaterift_autosave(1) ){ + skaterift.last_autosave = vg.time; + } + } } -VG_STATIC void vg_framebuffer_resize( int w, int h ) -{ +/* + * RENDERING + * ---------------------------------------------------------------------------*/ + +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 ); @@ -245,17 +397,38 @@ VG_STATIC void present_view_with_post_processing(void) v2f inverse; render_fb_inverse_ratio( gpipeline.fb_main, inverse ); - if( cl_blur ){ + if( k_blur_effect ){ shader_blitblur_use(); shader_blitblur_uTexMain( 0 ); shader_blitblur_uTexMotion( 1 ); - shader_blitblur_uBlurStrength( cl_blur_strength / + shader_blitblur_uBlurStrength( k_blur_strength / (vg.time_frame_delta*60.0) ); shader_blitblur_uInverseRatio( inverse ); - v2f menu_blurring; - v2_muls( (v2f){ 0.04f, 0.001f }, menu.factive, menu_blurring ); - shader_blitblur_uOverrideDir( menu_blurring ); + 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 ); + else + v2_zero( override ); + shader_blitblur_uOverrideDir( override ); render_fb_bind_texture( gpipeline.fb_main, 0, 0 ); render_fb_bind_texture( gpipeline.fb_main, 1, 1 ); @@ -270,14 +443,13 @@ 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 */ - m4x3_copy( main_camera.transform, small_cam.transform ); + m4x3_copy( skaterift.cam.transform, small_cam.transform ); - small_cam.fov = main_camera.fov; + small_cam.fov = skaterift.cam.fov; small_cam.nearz = 0.05f; small_cam.farz = 60.0f; @@ -286,17 +458,11 @@ 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 ); + render_remote_players_tags( localplayer.viewable_world, &skaterift.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 ); @@ -308,70 +474,145 @@ VG_STATIC void render_scene(void) return; } - for( u32 i=0; irendering_gate; + if( gate ){ + if( gate->flags & k_ent_gate_nonlocal ){ + world_instance *dest = &world_static.instances[ gate->target ]; + render_world_cubemaps( dest ); + } + } + } + + /* 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(); + /* 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 */ render_scene_gate_subview(); + /* composite */ present_view_with_post_processing(); - /* =========== End Frame =========== */ + + /* --------------------------------------------------------------------- */ + + /* 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; + skaterift_record_frame( &skaterift.replay, 1 ); + if( skaterift.replay.head ){ + skaterift.replay.cursor = skaterift.replay.head->time; + skaterift.replay.cursor_frame = skaterift.replay.head; + } + skaterift.replay_control = k_replay_control_scrub; + } + } } -VG_STATIC void vg_render(void) -{ - if( skaterift.async_op == k_async_op_clientloading ){ +static void vg_render(void){ + if( skaterift.op == k_async_op_clientloading ){ _vg_loader_render(); return; } @@ -386,8 +627,7 @@ VG_STATIC void vg_render(void) glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT ); render_main_game(); - - m4x4_copy( main_camera.mtx.pv, vg.pv ); + m4x4_copy( skaterift.cam.mtx.pv, vg.pv ); /* Other shite */ glDisable(GL_BLEND); @@ -397,23 +637,22 @@ VG_STATIC void vg_render(void) gui_draw(); } -VG_STATIC void vg_gui(void) -{ - if( skaterift.async_op == k_async_op_clientloading ) return; +static void vg_gui(void){ + if( skaterift.op == k_async_op_clientloading ) return; menu_update(); - if( menu.active ){ + if( skaterift.activity == k_skaterift_menu ){ glClear( GL_DEPTH_BUFFER_BIT ); menu_render(); } -#if 0 - player__im_gui( &localplayer ); -#endif + 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 ); }