X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=8ed749ceb324087ed31b773be3fd4d6e49636715;hb=63fe317d7db724162561da52aa382c82ac3c29be;hp=f089f79be657241387e807c4e5e1f2f884081615;hpb=730f202673d6ceb2a5199cf244d5c0bddc064fcf;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index f089f79..8ed749c 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,9 @@ #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; @@ -66,14 +66,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 +90,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 +108,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 +120,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) ); 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,12 +150,14 @@ 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 ) ){ + 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 ); @@ -157,26 +169,32 @@ static void skaterift_restore_state(void){ }; skaterift_world_load_thread( &args ); - world_set_active_instance( 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 ); + vg_msg_getkvv3f( &kvsav, "position", pos, (v3f){0.0f,0.0f,0.0f} ); if( v3_length2(pos) > 1.0f ) player__setpos( pos ); } +#endif } 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,13 +217,7 @@ 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 ); + player_load_animation_reference( "models/ch_none.mdl" ); player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" ); player__bind(); @@ -221,19 +233,23 @@ static void vg_load(void){ * ------------------------------------- */ + /* 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 */ @@ -241,32 +257,27 @@ 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; } /* 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(); @@ -298,10 +309,11 @@ 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(); @@ -320,9 +332,11 @@ static void vg_pre_update(void){ 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? */ 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 ); @@ -330,6 +344,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() ); @@ -338,6 +353,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(); @@ -477,11 +493,15 @@ static void render_scene(void){ if( skaterift.activity == k_skaterift_respawning ){ glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } ); glClearColor( 0.624f, 0.659f, 0.769f, 0.0f ); + glClearColor( 0.824f, 0.0f, 0.1f, 0.0f ); glClear( GL_COLOR_BUFFER_BIT ); glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 } ); +#if 0 view_world = &world_static.instances[respawn_chooser.world_id]; render_world_override( view_world ); + render_world_routes( view_world, &skaterift.cam, 1 ); +#endif } else{ render_world( view_world, &skaterift.cam, 0 ); @@ -489,7 +509,9 @@ static void render_scene(void){ render_fb_bind( gpipeline.fb_main, 1 ); render_water_surface( view_world, &skaterift.cam ); render_remote_players( view_world, &skaterift.cam ); + ent_miniworld_render( view_world ); } + } static void render_scene_gate_subview(void){ @@ -554,16 +576,8 @@ static void render_main_game(void){ /* --------------------------------------------------------------------- */ world_instance *view_world = localplayer.viewable_world; - if( view_world != NULL ){ + if( (view_world != NULL) && (skaterift.activity != k_skaterift_respawning) ){ 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 ); - } - } } /* variable res target */ @@ -588,23 +602,18 @@ static void render_main_game(void){ /* 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; @@ -646,6 +655,17 @@ static void vg_gui(void){ 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 ); + } }