X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=d661fbf90501a2d1d7329df8bd418fc4b602bd02;hb=refs%2Fheads%2Fmaster;hp=c9f9371de9d9209042849144c5cf9df6facd19d6;hpb=670daa775dec0954adb27354c3e37c66fc6567dd;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index c9f9371..d661fbf 100644 --- a/skaterift.c +++ b/skaterift.c @@ -13,6 +13,10 @@ #define SR_ALLOW_REWIND_HUB +#ifdef _WIN32 + #include +#endif + /* * system headers * --------------------- */ @@ -46,6 +50,7 @@ #include "workshop.h" #include "audio.h" #include "player_render.h" +#include "control_overlay.h" struct skaterift_globals skaterift = { @@ -55,7 +60,9 @@ struct skaterift_globals skaterift = static int k_tools_mode = 0; -int main( int argc, char *argv[] ){ +int main( int argc, char *argv[] ) +{ + network_set_host( "skaterift.com", NULL ); vg_mem.use_libc_malloc = 0; vg_set_mem_quota( 160*1024*1024 ); vg_enter( argc, argv, "Voyager Game Engine" ); @@ -69,9 +76,9 @@ void vg_launch_opt(void) 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( (arg = vg_long_opt_arg( "server" )) ) + { + network_set_host( arg, NULL ); } if( vg_long_opt( "tools" ) ){ @@ -117,8 +124,14 @@ static void async_skaterift_player_start( void *payload, u32 size ){ world_switch_instance(0); } -static void async_call_ready( void *payload, u32 size ){ +static void async_call_ready( void *payload, u32 size ) +{ skaterift.op = k_async_op_none; + + if( network_client.auto_connect ) + network_client.user_intent = k_server_intent_online; + + menu_at_begin(); } static void skaterift_restore_state(void) @@ -130,7 +143,7 @@ static void skaterift_restore_state(void) vg_msg_init( &kvsav, sav.buf, sizeof(sav.buf) ); u32 ach; - vg_msg_getkvintg( &kvsav, "ach", k_vg_msg_u32, &ach ); + vg_msg_getkvintg( &kvsav, "ach", k_vg_msg_u32, &ach, NULL ); skaterift.achievements |= ach; u32 board_reg_id = time(NULL) % addon_count( k_addon_type_board, 0 ), @@ -178,6 +191,7 @@ static void skaterift_load_world_content(void){ ADDON_REG_MTZERO|ADDON_REG_PREMIUM ); skaterift_mount_world_unloadable( "maps/dev_tutorial", 0 ); skaterift_mount_world_unloadable( "maps/dev_flatworld", 0 ); + skaterift_mount_world_unloadable( "maps/mp_line1", ADDON_REG_PREMIUM ); world_static.load_state = k_world_loader_load; @@ -188,12 +202,8 @@ static void skaterift_load_world_content(void){ skaterift_world_load_thread( &args ); } -static void skaterift_load_player_content(void){ - u32 bytes = 1024*1024*10; - player_replay.local.data = vg_linear_alloc( vg_mem.rtmemory, bytes ); - player_replay.local.size = bytes; - replay_clear( &player_replay.local ); - +static void skaterift_load_player_content(void) +{ particle_alloc( &particles_grind, 300 ); particle_alloc( &particles_env, 200 ); @@ -213,11 +223,11 @@ void vg_load(void) vg_audio.always_keep_compressed = 1; vg_console_reg_cmd( "load_world", skaterift_load_world_command, NULL ); - vg_console_reg_cmd( "fc", freecam_cmd, NULL ); vg_console_reg_var( "immobile", &localplayer.immobile, k_var_dtype_i32, 0 ); vg_loader_step( render_init, NULL ); vg_loader_step( menu_init, NULL ); + vg_loader_step( control_overlay_init, NULL ); vg_loader_step( world_init, NULL ); vg_loader_step( vehicle_init, NULL ); vg_loader_step( gui_init, NULL ); @@ -231,6 +241,7 @@ void vg_load(void) vg_loader_step( workshop_init, NULL ); vg_loader_step( skateshop_init, NULL ); vg_loader_step( ent_tornado_init, NULL ); + vg_loader_step( skaterift_replay_init, NULL ); vg_loader_step( skaterift_load_player_content, NULL ); /* --------------------- */ @@ -311,7 +322,12 @@ void vg_pre_update(void) /* TODO: how can we compress this? */ ent_miniworld_preupdate(); world_entity_focus_preupdate(); - player__pre_update(); + + if( skaterift.activity != k_skaterift_menu ) + { + player__pre_update(); + } + skaterift_replay_pre_update(); remote_sfx_pre_update(); skateshop_world_preupdate( world_current_instance() ); @@ -548,19 +564,23 @@ static void render_scene(void){ render_world( holdout_world, &global_miniworld.cam, 1, 0, 1, 1 ); } -static void skaterift_composite_maincamera(void){ +static void skaterift_composite_maincamera(void) +{ vg_camera_lerp( &localplayer.cam, &world_static.focus_cam, vg_smoothstepf(world_static.focus_strength), &skaterift.cam ); - if( player_replay.freecam ){ - freecam_preupdate(); - v3_copy( player_replay.replay_freecam.pos, skaterift.cam.pos ); - v3_copy( player_replay.replay_freecam.angles, skaterift.cam.angles ); - skaterift.cam.fov = player_replay.replay_freecam.fov; - } - else { - if( skaterift.activity == k_skaterift_replay ){ - replay_get_camera( &player_replay.local, &skaterift.cam ); + if( skaterift.activity == k_skaterift_replay ) + { + if( player_replay.use_freecam ) + { + freecam_preupdate(); + v3_copy( player_replay.replay_freecam.pos, skaterift.cam.pos ); + v3_copy( player_replay.replay_freecam.angles, skaterift.cam.angles ); + skaterift.cam.fov = player_replay.replay_freecam.fov; + } + else + { + skaterift_get_replay_cam( &skaterift.cam ); } } @@ -641,6 +661,7 @@ static void render_main_game(void){ /* composite */ present_view_with_post_processing(); skaterift_replay_post_render(); + control_overlay_render(); } void vg_render(void) @@ -675,13 +696,16 @@ void vg_render(void) glDisable(GL_DEPTH_TEST); vg_lines_drawall(); glViewport( 0,0, vg.window_x, vg.window_y ); - gui_draw(); + + gui_render_icons(); } void vg_gui(void) { if( skaterift.op == k_async_op_clientloading ) return; + gui_draw(); + if( k_tools_mode ){ ui_rect null; ui_rect screen = { 0, 0, vg.window_x, vg.window_y }; @@ -782,3 +806,4 @@ void vg_gui(void) #include "world_water.c" #include "ent_npc.c" #include "model.c" +#include "control_overlay.c"