X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=f790aefc2cd9373e828f0536c39a1f1b2029d9f8;hb=7eba38b8178c82040618a518634d8ff4813e2ff2;hp=74e6f75f605236337d891d07a54c2b6ea82b8bc6;hpb=6929408e937dca64da707a2d61f8cdf6ab857e93;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 74e6f75..f790aef 100644 --- a/skaterift.c +++ b/skaterift.c @@ -13,8 +13,11 @@ #if 1 -#define SR_NETWORKED -#define VG_DEVWINDOW +//#define SR_NETWORKED + +#ifndef VG_RELEASE + #define VG_DEVWINDOW +#endif /* * system headers @@ -50,20 +53,16 @@ static struct player_avatar localplayer_avatar; -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 vg_launch_opt(void) -{ -} +VG_STATIC void vg_launch_opt(void){} -VG_STATIC void vg_preload(void) -{ +VG_STATIC void vg_preload(void){ skaterift_read_savedata(); vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); @@ -79,8 +78,7 @@ vg_info(" ' ' '--' [] '----- '----- ' ' '---' " vg_loader_step( network_init, network_end ); } -VG_STATIC void load_playermodels(void) -{ +VG_STATIC void load_playermodels(void){ /* FIXME: hack */ shader_model_character_view_register(); shader_model_board_view_register(); @@ -144,14 +142,14 @@ static void skaterift_restore_state(void){ localplayer.viewable_world = world_current_instance(); vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 ); - vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, - localplayer.rb.co ); + v3f pos; + vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos ); + player__setpos( &localplayer, pos ); } } } -VG_STATIC void vg_load(void) -{ +VG_STATIC void vg_load(void){ vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL ); vg_loader_step( render_init, NULL ); @@ -174,6 +172,11 @@ VG_STATIC void vg_load(void) 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__create( &localplayer ); player_avatar_load( &localplayer_avatar, "models/ch_none.mdl" ); player__use_avatar( &localplayer, &localplayer_avatar ); @@ -235,13 +238,13 @@ VG_STATIC void vg_load(void) global_skateshop.pointcloud_world_id=1; skateshop_world_preview_loader_thread( mtzero ); /* HACK */ - vg_async_call( async_addon_reg_update, NULL, 0 ); vg_console_load_autos(); menu_link(); 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(); @@ -254,37 +257,46 @@ VG_STATIC void vg_load(void) vg_async_call( async_call_ready, NULL, 0 ); } -VG_STATIC void draw_origin_axis(void) -{ +VG_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); -VG_STATIC void vg_update(void) -{ + +/* + * UPDATE LOOP + * ---------------------------------------------------------------------------*/ + +VG_STATIC void vg_pre_update(void){ + srinput.enabled = 1; + steam_update(); skaterift_preupdate_inputs(); if( skaterift.op == k_async_op_clientloading ) return; - - if( world_loader.state == k_world_loader_preload ){ + if( world_loader.state == k_world_loader_preload ) skaterift_change_world_preupdate(); - } draw_origin_axis(); network_update(); + + /* time rate */ + f32 target = 1; + if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu) ) + 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(); + skaterift_replay_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" ); } -VG_STATIC void vg_update_fixed(void) -{ +VG_STATIC void vg_fixed_update(void){ if( skaterift.op == k_async_op_clientloading ) return; world_routes_fixedupdate( world_current_instance() ); @@ -292,8 +304,7 @@ VG_STATIC void vg_update_fixed(void) vehicle_update_fixed(); } -VG_STATIC void vg_update_post(void) -{ +VG_STATIC void vg_post_update(void){ if( skaterift.op == k_async_op_clientloading ) return; player__post_update( &localplayer ); @@ -306,9 +317,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, @@ -319,17 +330,18 @@ 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(); } -VG_STATIC void vg_framebuffer_resize( int w, int h ) -{ +/* + * RENDERING + * ---------------------------------------------------------------------------*/ + +VG_STATIC void vg_framebuffer_resize( int w, int h ){ render_fb_resize(); } -VG_STATIC void present_view_with_post_processing(void) -{ +VG_STATIC void present_view_with_post_processing(void){ glBindFramebuffer( GL_FRAMEBUFFER, 0 ); glViewport( 0,0, vg.window_x, vg.window_y ); @@ -349,9 +361,30 @@ VG_STATIC void present_view_with_post_processing(void) (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 ); @@ -366,14 +399,13 @@ VG_STATIC void present_view_with_post_processing(void) render_fsquad(); } -VG_STATIC void render_player_transparent(void) -{ +VG_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; @@ -382,17 +414,10 @@ 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 ); } -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 ); - +VG_STATIC void render_scene(void){ /* Draw world */ glEnable( GL_DEPTH_TEST ); @@ -410,64 +435,104 @@ VG_STATIC void render_scene(void) } } - render_world( view_world, &main_camera, 0 ); + render_world( view_world, &skaterift.cam, 0 ); - render_water_texture( view_world, &main_camera, 0 ); + render_water_texture( view_world, &skaterift.cam, 0 ); render_fb_bind( gpipeline.fb_main, 1 ); - render_water_surface( view_world, &main_camera ); + render_water_surface( view_world, &skaterift.cam ); } -VG_STATIC void render_scene_gate_subview(void) -{ +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; /* ??? */ int depth = 1; if( localplayer.gate_waiting ) depth = 0; - render_world_gates( view_world, &main_camera, depth ); + render_world_gates( view_world, &skaterift.cam, depth ); } -VG_STATIC void render_main_game(void) -{ - player__pre_render( &localplayer ); - main_camera.fov = localplayer.cam.fov; - v3_copy( localplayer.cam.pos, main_camera.pos ); - v3_copy( localplayer.cam.angles, main_camera.angles ); +VG_STATIC void skaterift_composite_maincamera(void){ + camera_lerp( &localplayer.cam, &global_skateshop.cam, + vg_smoothstepf(global_skateshop.factive), &skaterift.cam ); + + if( skaterift.activity == k_skaterift_replay ){ + skaterift_get_replay_camera( &skaterift.cam ); + } - main_camera.nearz = 0.1f; - main_camera.farz = 2100.0f; + skaterift.cam.nearz = 0.1f; + skaterift.cam.farz = 2100.0f; - camera_update_transform( &main_camera ); + camera_update_transform( &skaterift.cam ); if( localplayer.gate_waiting ){ - m3x3_mul( localplayer.basis_gate, main_camera.transform, - main_camera.transform ); + m3x3_mul( localplayer.basis_gate, skaterift.cam.transform, + skaterift.cam.transform ); } else{ - m3x3_mul( localplayer.basis, main_camera.transform, - main_camera.transform ); + m3x3_mul( localplayer.basis, skaterift.cam.transform, + skaterift.cam.transform ); } - camera_update_view( &main_camera ); - camera_update_projection( &main_camera ); - camera_finalize( &main_camera ); + camera_update_view( &skaterift.cam ); + camera_update_projection( &skaterift.cam ); + camera_finalize( &skaterift.cam ); +} + +VG_STATIC void render_main_game(void){ + player__animate( &localplayer ); + if( skaterift.activity == k_skaterift_replay ){ + player__animate_from_replay( &localplayer, &skaterift.replay ); + } + else + skaterift_record_frame( &skaterift.replay, 0 ); + player__pre_render( &localplayer ); - /* ========== Begin Frame ========== */ + skaterift_composite_maincamera(); - render_scene(); + /* --------------------------------------------------------------------- */ + + /* 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 */ + + //world_render_challenges( localplayer.viewable_world ); + + /* 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) -{ +VG_STATIC void vg_render(void){ if( skaterift.op == k_async_op_clientloading ){ _vg_loader_render(); return; @@ -483,8 +548,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); @@ -494,21 +558,19 @@ VG_STATIC void vg_render(void) gui_draw(); } -VG_STATIC void vg_gui(void) -{ +VG_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 world_instance *world = world_current_instance(); + skaterift_replay_imgui(); workshop_form_gui(); render_view_framebuffer_ui(); }