X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=34e42f39cd5ed8ee533490a37aa8971d6ab77419;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=25957d5b6e88162a99d3d2fb6430ebf35eb2e3de;hpb=4b8fc63f926737ca0593a4e471550f9f4995c538;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 25957d5..34e42f3 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 @@ -38,6 +39,7 @@ #include "vehicle.h" #include "pointcloud.h" #include "save.h" +#include "player_remote.h" /* unity build * ----------------- */ @@ -50,6 +52,10 @@ #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; @@ -60,9 +66,19 @@ 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; + } -VG_STATIC void vg_preload(void){ + if( (arg = vg_long_opt_arg( "server" )) ){ + vg_strncpy( arg, network_client.server_adress, 64, + k_strncpy_overflow_fatal ); + } +} + +static void vg_preload(void){ //skaterift_read_savedata(); vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); @@ -75,17 +91,18 @@ vg_info(" ' ' '--' [] '----- '----- ' ' '---' " 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){ +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 ){ +static void async_skaterift_player_start( void *payload, u32 size ){ localplayer.viewable_world = world_current_instance(); localplayer_cmd_respawn( 1, (const char *[]){ "start" } ); } @@ -95,62 +112,71 @@ 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) ); + + 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 ) ){ + 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( &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 ); - world_static.addon_client = reg; world_static.load_state = k_world_loader_load; - skaterift_client_world_changer_thread(NULL); + 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_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 ); - player__setpos( &localplayer, pos ); } + + v3f pos; + vg_msg_getkvv3f( &kvsav, "position", pos, (v3f){0.0f,0.0f,0.0f} ); + + 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 ); @@ -178,11 +204,17 @@ 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 ); + 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( &localplayer ); + player__bind(); /* --------------------- */ @@ -200,14 +232,13 @@ VG_STATIC void vg_load(void){ 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 */ @@ -215,19 +246,22 @@ VG_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.addon_hub = spawn; - world_instance_load_mdl( 0, "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(); @@ -250,13 +284,13 @@ VG_STATIC void vg_load(void){ /* and now */ skaterift_restore_state(); - vg_loader_step( NULL, skaterift_write_main_savedata ); + 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 ); @@ -267,7 +301,7 @@ static void skaterift_change_client_world_preupdate(void); * UPDATE LOOP * ---------------------------------------------------------------------------*/ -VG_STATIC void vg_pre_update(void){ +static void vg_pre_update(void){ srinput.enabled = 1; steam_update(); @@ -277,36 +311,41 @@ VG_STATIC void vg_pre_update(void){ 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(); + 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 ); + respawn_chooser_pre_update(); } -VG_STATIC void vg_fixed_update(void){ +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_post_update(void){ +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; @@ -330,17 +369,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 ); @@ -398,7 +443,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 */ @@ -413,10 +458,11 @@ 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 ); + render_remote_players_tags( localplayer.viewable_world, &skaterift.cam ); } -VG_STATIC void render_scene(void){ +static void render_scene(void){ /* Draw world */ glEnable( GL_DEPTH_TEST ); @@ -434,26 +480,39 @@ VG_STATIC void render_scene(void){ } } - 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 ); + if( skaterift.activity == k_skaterift_respawning ){ + glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } ); + glClearColor( 0.624f, 0.659f, 0.769f, 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 ); + render_world_routes( view_world, &skaterift.cam, 1 ); + } + 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 ); + } } -VG_STATIC void render_scene_gate_subview(void){ +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; int depth = 1; if( localplayer.gate_waiting ) depth = 0; render_world_gates( view_world, &skaterift.cam, depth ); } -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 ); @@ -462,15 +521,23 @@ VG_STATIC void skaterift_composite_maincamera(void){ skaterift.cam.nearz = 0.1f; skaterift.cam.farz = 2100.0f; + if( skaterift.activity == k_skaterift_respawning ){ + camera_copy( &respawn_chooser.cam, &skaterift.cam ); + skaterift.cam.nearz = 4.0f; + skaterift.cam.farz = 3100.0f; + } + camera_update_transform( &skaterift.cam ); - if( localplayer.gate_waiting ){ - m3x3_mul( localplayer.basis_gate, skaterift.cam.transform, - skaterift.cam.transform ); - } - else{ - m3x3_mul( localplayer.basis, skaterift.cam.transform, - skaterift.cam.transform ); + if( skaterift.activity != k_skaterift_respawning ){ + if( localplayer.gate_waiting ){ + m3x3_mul( localplayer.basis_gate, skaterift.cam.transform, + skaterift.cam.transform ); + } + else{ + m3x3_mul( localplayer.basis, skaterift.cam.transform, + skaterift.cam.transform ); + } } camera_update_view( &skaterift.cam ); @@ -478,20 +545,34 @@ VG_STATIC void skaterift_composite_maincamera(void){ 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(); /* --------------------------------------------------------------------- */ + world_instance *view_world = localplayer.viewable_world; + 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 */ render_fb_bind( gpipeline.fb_main, 1 ); glClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); @@ -530,7 +611,7 @@ VG_STATIC void render_main_game(void){ } } -VG_STATIC void vg_render(void){ +static void vg_render(void){ if( skaterift.op == k_async_op_clientloading ){ _vg_loader_render(); return; @@ -556,7 +637,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(); @@ -565,12 +646,13 @@ VG_STATIC void vg_gui(void){ menu_render(); } - player__im_gui( &localplayer ); + 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 ); }