X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=714ed11cbdd44f05a73585a2e998aa8a0a406c40;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=81b80913e1b9c4f6fbcbf5e23a457161c2d9617f;hpb=eb28dee29482c7ffe8bc0203d302e3ee6dbfd943;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 81b8091..714ed11 100644 --- a/skaterift.c +++ b/skaterift.c @@ -37,7 +37,6 @@ #include "network.h" #include "menu.h" #include "vehicle.h" -#include "pointcloud.h" #include "save.h" #include "player_remote.h" @@ -55,8 +54,12 @@ #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; @@ -66,14 +69,22 @@ int main( int argc, char *argv[] ){ } 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 ); + } + + if( vg_long_opt( "tools" ) ){ + k_tools_mode = 1; + } } static void vg_preload(void){ - //skaterift_read_savedata(); - vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" ); vg_info(" | \\ / | +-- / +----- +---' | / | \n" ); @@ -82,6 +93,11 @@ 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 ); @@ -95,8 +111,7 @@ static void load_playermodels(void){ } static void async_skaterift_player_start( void *payload, u32 size ){ - localplayer.viewable_world = world_current_instance(); - localplayer_cmd_respawn( 1, (const char *[]){ "start" } ); + world_switch_instance(0); } static void async_call_ready( void *payload, u32 size ){ @@ -108,27 +123,25 @@ static void skaterift_restore_state(void){ strcpy( sav.path, str_skaterift_main_save ); savedata_file_read( &sav ); - vg_msg kvsav = {0}; - kvsav.buf = sav.buf; - kvsav.len = sav.len; - kvsav.max = sizeof(sav.buf); + 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 player = kvsav; - 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 ) 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 ) @@ -140,43 +153,27 @@ static void skaterift_restore_state(void){ localplayer.playermodel_view_slot = addon_cache_create_viewer( k_addon_type_player, player_reg_id ); - vg_msg world = kvsav; - if( vg_msg_seekframe( &world, "world", 0 ) ){ - addon_alias q; - - /* 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_set_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 ); + kvsav.cur = orig; +} - if( v3_length2(pos) > 1.0f ) - player__setpos( pos ); - } +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){ - vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL ); + 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 ); @@ -199,17 +196,14 @@ static void vg_load(void){ 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*32 ); + 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(); + player_board_load( &localplayer.fallback_board, "models/board_none.mdl" ); + /* --------------------- */ vg_bake_shaders(); @@ -221,52 +215,24 @@ 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(); @@ -280,9 +246,11 @@ static void vg_load(void){ /* and now */ skaterift_restore_state(); + 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 ); } @@ -298,30 +266,36 @@ static void skaterift_change_client_world_preupdate(void); * ---------------------------------------------------------------------------*/ static void vg_pre_update(void){ - srinput.enabled = 1; + 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| - k_skaterift_respawning) ) { + 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 ); + /* 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 ); @@ -329,6 +303,7 @@ static void vg_pre_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() ); @@ -337,6 +312,7 @@ static void vg_fixed_update(void){ } static void vg_post_update(void){ + if( k_tools_mode ) return; if( skaterift.op == k_async_op_clientloading ) return; player__post_update(); @@ -455,53 +431,20 @@ static void render_player_transparent(void){ player__render( &small_cam ); } -static void animate_remote_players(void){ - for( u32 i=0; iactive ) continue; - - animate_remote_player( i ); -#if 0 - if( player->subsystem > k_player_subsystem_max ) continue; - - struct player_subsystem_interface *sys = - player_subsystems[player->subsystem]; - - struct player_avatar *av = localplayer.playeravatar; - - player_pose pose; - sys->pose( &player->animdata, &pose ); - apply_full_skeleton_pose( &av->sk, &pose, - &netplayers.final_mtx[ av->sk.bone_count*i ] ); -#endif +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]; } -} -static void render_remote_players( world_instance *world, camera *cam ){ - for( u32 i=0; iactive ) continue; - - struct player_avatar *av = localplayer.playeravatar; - - struct player_model *model = &localplayer.fallback_model; - render_playermodel( cam, world, 0, model, &av->sk, - &netplayers.final_mtx[ av->sk.bone_count*i ] ); - } + return view_world; } 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; 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 } ); - view_world = &world_static.instances[respawn_chooser.world_id]; - render_world_override( view_world ); + + 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; + } + + world_instance *view_world = get_view_world(); + render_world( view_world, &skaterift.cam, 0, 0, 1, 1 ); + +#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; + + if( global_miniworld.transition == 1 ){ + holdout_world = &world_static.instances[ k_world_purpose_hub ]; + t = global_miniworld.t; } else{ - render_world( view_world, &skaterift.cam, 0 ); - render_water_texture( view_world, &skaterift.cam, 0 ); - render_fb_bind( gpipeline.fb_main, 1 ); - render_water_surface( view_world, &skaterift.cam ); - render_remote_players( view_world, &skaterift.cam ); + holdout_world = &world_static.instances[ k_world_purpose_client ]; + t = 1.0f-global_miniworld.t; } -} -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( skaterift.activity == k_skaterift_respawning ) return; + 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 ); - int depth = 1; - if( localplayer.gate_waiting ) depth = 0; - render_world_gates( view_world, &skaterift.cam, depth ); + render_fsquad(); + render_world( holdout_world, &global_miniworld.cam, 1, 0, 1, 1 ); } static void skaterift_composite_maincamera(void){ @@ -551,22 +544,24 @@ static void skaterift_composite_maincamera(void){ if( skaterift.activity == k_skaterift_respawning ){ camera_copy( &respawn_chooser.cam, &skaterift.cam ); skaterift.cam.nearz = 4.0f; - skaterift.cam.farz = 3100.0f; + skaterift.cam.farz = 3100.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( skaterift.activity != k_skaterift_respawning ){ - 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{ - m3x3_mul( localplayer.basis, skaterift.cam.transform, - skaterift.cam.transform ); + else { } } - + + camera_update_transform( &skaterift.cam ); camera_update_view( &skaterift.cam ); camera_update_projection( &skaterift.cam ); camera_finalize( &skaterift.cam ); @@ -586,18 +581,13 @@ static void render_main_game(void){ skaterift_composite_maincamera(); /* --------------------------------------------------------------------- */ + if( skaterift.activity != k_skaterift_respawning ){ + world_instance *world = world_current_instance(); + render_world_cubemaps( world ); - world_instance *view_world = localplayer.viewable_world; - if( view_world != NULL ){ - render_world_cubemaps( view_world ); - - ent_gate *gate = view_world->rendering_gate; - if( gate ){ - if( gate->flags & k_ent_gate_nonlocal ){ - world_instance *dest = &world_static.instances[ gate->target ]; - render_world_cubemaps( dest ); - } - } + 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 */ @@ -617,28 +607,27 @@ 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(); - /* --------------------------------------------------------------------- */ - - /* 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; - } - } + skaterift_replay_post_render(); } 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; @@ -676,10 +665,20 @@ 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 ){ + 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 ); + } }