X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=714ed11cbdd44f05a73585a2e998aa8a0a406c40;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=c9afd0b4ef6e2f5fe84a6b41670b79f650418cc9;hpb=2329044d44a5aff035b01926f7901d9e89ad284e;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index c9afd0b..714ed11 100644 --- a/skaterift.c +++ b/skaterift.c @@ -14,6 +14,7 @@ #if 1 #define SR_NETWORKED +#define SR_USE_LOCALHOST #ifndef VG_RELEASE #define VG_DEVWINDOW @@ -36,8 +37,8 @@ #include "network.h" #include "menu.h" #include "vehicle.h" -#include "pointcloud.h" #include "save.h" +#include "player_remote.h" /* unity build * ----------------- */ @@ -50,8 +51,15 @@ #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" +#include "world_routes_ui.c" +#include "particle.c" +#include "player_effects.c" -static struct player_avatar localplayer_avatar; +static int k_tools_mode = 0; int main( int argc, char *argv[] ){ vg_mem.use_libc_malloc = 0; @@ -60,11 +68,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" ); @@ -73,21 +93,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 ){ @@ -95,70 +119,61 @@ static void async_call_ready( void *payload, u32 size ){ } static void skaterift_restore_state(void){ - struct savedata sav; - skaterift_read_main_savedata( &sav ); - vg_msg kvsav = {0}; - kvsav.buf = sav.buf; - kvsav.len = sav.len; - kvsav.max = sizeof(sav.buf); - - vg_msg player = kvsav; - if( vg_msg_seekframe( &player, "player", 0 ) ){ + 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) ); + skaterift.achievements |= vg_msg_getkvu32( &kvsav, "ach", 0 ); + + 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( &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 = kvsav; - if( vg_msg_seekframe( &world, "world", 0 ) ){ - addon_alias q; + 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 ); - /* world */ - skaterift_read_addon_alias( &world, "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_static.active_instance = vg_msg_seekkvu32( &world, "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 ); - } - } + kvsav.cur = orig; } -VG_STATIC void vg_load(void){ - vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL ); +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 | ext); + return reg; +} + +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 ); @@ -181,11 +196,13 @@ VG_STATIC void vg_load(void){ 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 ); + particle_alloc( &particles_grind, 300 ); + + player_load_animation_reference( "models/ch_none.mdl" ); player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" ); - player__bind( &localplayer ); + player__bind(); + + player_board_load( &localplayer.fallback_board, "models/board_none.mdl" ); /* --------------------- */ @@ -198,52 +215,24 @@ VG_STATIC void vg_load(void){ * ------------------------------------- */ - /* 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_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; - } - - /* mtzero island */ - addon_reg *mtzero = addon_mount_local_addon( "maps/mp_mtzero", - k_addon_type_world, - ".mdl" ); - { - vg_msg msg = {0}; - msg.buf = mtzero->metadata; - msg.max = 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; - } + /* hub world */ + addon_reg *hub = skaterift_mount_world_unloadable( "maps/dev_hub", 0 ); + skaterift_mount_world_unloadable( "maps/mp_spawn", ADDON_REG_CITY ); + skaterift_mount_world_unloadable( "maps/mp_mtzero", ADDON_REG_MTZERO ); + skaterift_mount_world_unloadable( "maps/dev_tutorial", 0 ); /* load home/permanent world manually */ world_static.load_state = k_world_loader_load; + struct world_load_args args = { .purpose = k_world_purpose_hub, - .reg = spawn + .reg = hub }; 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(); @@ -257,13 +246,15 @@ VG_STATIC void vg_load(void){ /* and now */ skaterift_restore_state(); - vg_loader_step( NULL, skaterift_write_main_savedata ); + update_ach_models(); + + 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 ); @@ -274,46 +265,57 @@ 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_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 * (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(); + 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(); } -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; @@ -337,17 +339,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 ); @@ -405,7 +413,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 */ @@ -420,20 +428,22 @@ VG_STATIC void render_player_transparent(void){ camera_finalize( &small_cam ); /* Draw player to window buffer and blend background ontop */ - player__render( &small_cam, &localplayer ); + player__render( &small_cam ); } -VG_STATIC void render_scene(void){ - /* Draw world */ - glEnable( GL_DEPTH_TEST ); +static world_instance *get_view_world(void){ + world_instance *view_world = world_current_instance(); + if( localplayer.gate_waiting && + (localplayer.gate_waiting->flags & k_ent_gate_nonlocal) ){ + view_world = &world_static.instances[world_static.active_instance ^ 0x1]; + } - world_instance *view_world = localplayer.viewable_world; + return view_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; - } +static void render_scene(void){ + /* Draw world */ + glEnable( GL_DEPTH_TEST ); for( u32 i=0; iub_lighting.g_daysky_colour, + world->ub_lighting.g_day_phase - + world->ub_lighting.g_sunset_phase*0.1f, bg ); + + v3_muladds( bg, world->ub_lighting.g_sunset_colour, + (1.0f-0.5f)*world->ub_lighting.g_sunset_phase, bg ); + + v3_muladds( bg, world->ub_lighting.g_nightsky_colour, + (1.0f-world->ub_lighting.g_day_phase), bg ); + + glClearColor( bg[0], bg[1], bg[2], 0.0f ); + glClear( GL_COLOR_BUFFER_BIT ); + glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0, + GL_COLOR_ATTACHMENT1 } ); + + m4x3f identity; + m4x3_identity( identity ); + render_world_override( world, world, identity, &skaterift.cam, + respawn_chooser.spawn, + (v4f){world->tar_min, world->tar_max, 1.0f, 0.0f}); + render_world_routes( world, world, identity, &skaterift.cam, 0, 1 ); + return; + } - render_water_texture( view_world, &skaterift.cam, 0 ); - render_fb_bind( gpipeline.fb_main, 1 ); - render_water_surface( view_world, &skaterift.cam ); -} + world_instance *view_world = get_view_world(); + render_world( view_world, &skaterift.cam, 0, 0, 1, 1 ); -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; /* ??? */ +#if 0 + particle_spawn( &particles_grind, localplayer.rb.co, + (v3f){vg_randf64()*2.0f,vg_randf64()*3.0f,vg_randf64()*2.0f}, + vg_randf64(), 0xff0000ff ); +#endif + 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 ); + + /* + * render transition + */ + if( global_miniworld.transition == 0 ) + return; + + world_instance *holdout_world = NULL; + f32 t = 0.0f; - int depth = 1; - if( localplayer.gate_waiting ) depth = 0; - render_world_gates( view_world, &skaterift.cam, depth ); + if( global_miniworld.transition == 1 ){ + holdout_world = &world_static.instances[ k_world_purpose_hub ]; + t = global_miniworld.t; + } + else{ + holdout_world = &world_static.instances[ k_world_purpose_client ]; + t = 1.0f-global_miniworld.t; + } + + if( holdout_world->status != k_world_status_loaded ) + return; + + t = vg_smoothstepf( t ); + + glEnable( GL_STENCIL_TEST ); + glDisable( GL_DEPTH_TEST ); + glStencilOp( GL_KEEP, GL_KEEP, GL_REPLACE ); + glStencilFunc( GL_ALWAYS, 1, 0xFF ); + glStencilMask( 0xFF ); + + 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 ){ skaterift_get_replay_camera( &skaterift.cam ); @@ -469,35 +541,54 @@ VG_STATIC void skaterift_composite_maincamera(void){ skaterift.cam.nearz = 0.1f; skaterift.cam.farz = 2100.0f; - camera_update_transform( &skaterift.cam ); - - if( localplayer.gate_waiting ){ - m3x3_mul( localplayer.basis_gate, 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; } - else{ - m3x3_mul( localplayer.basis, skaterift.cam.transform, - skaterift.cam.transform ); + + if( global_miniworld.transition ){ + f32 dt = vg.time_frame_delta / 2.0f, + s = vg_signf( global_miniworld.transition ); + 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_STATIC void render_main_game(void){ +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( &localplayer ); + player__animate(); skaterift_record_frame( &skaterift.replay, 0 ); } - player__pre_render( &localplayer ); + animate_remote_players(); + player__pre_render(); skaterift_composite_maincamera(); /* --------------------------------------------------------------------- */ + if( skaterift.activity != k_skaterift_respawning ){ + world_instance *world = world_current_instance(); + render_world_cubemaps( world ); + + ent_gate *nlg = world->rendering_gate; + if( nlg && nlg->flags & k_ent_gate_nonlocal ) + render_world_cubemaps( &world_static.instances[nlg->target] ); + } /* variable res target */ render_fb_bind( gpipeline.fb_main, 1 ); @@ -516,28 +607,27 @@ VG_STATIC void render_main_game(void){ portals */ /* continue with variable rate */ - render_scene_gate_subview(); + if( !global_miniworld.transition && + (skaterift.activity != k_skaterift_respawning) ){ + 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(); +} - /* 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; - } +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; } -} -VG_STATIC void vg_render(void){ if( skaterift.op == k_async_op_clientloading ){ _vg_loader_render(); return; @@ -563,7 +653,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(); @@ -572,12 +662,23 @@ VG_STATIC void vg_gui(void){ menu_render(); } - player__im_gui( &localplayer ); + 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 ){ + 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 ); + } }