X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=fe1c5bc23ce06aecd64540ecff2870a7bb3f398e;hb=2b7784846e2f2ee57ba336a2aa040adb2d0ca461;hp=e8b1f4dd5e3dea85dee98e0abfe75372d50f0041;hpb=b3ca3b7a45eec11c46eb19772e10021177665adb;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index e8b1f4d..fe1c5bc 100644 --- a/skaterift.c +++ b/skaterift.c @@ -11,34 +11,44 @@ * ============================================================================= */ +#if 1 + #define SR_NETWORKED #define VG_DEVWINDOW + +/* + * system headers + * --------------------- */ + #include "common.h" #include "conf.h" #include "steam.h" #include "render.h" #include "audio.h" + #include "world.h" + #include "font.h" #include "player.h" -#include "entity.c" - -VG_STATIC struct player_avatar localplayer_avatar; -VG_STATIC struct player_model localplayer_models[3]; -VG_STATIC int skaterift_status = 0; - #include "network.h" #include "menu.h" #include "vehicle.h" +#include "pointcloud.h" -#define DEV_AARON -#ifdef DEV_AARON -static rb_object aaron={ - .type=k_rb_shape_box, - .rb.bbx = {{ -2.0f, -1.0f, -1.0f }, { 2.0f, 1.0f, 1.0f }} -}; -#endif +/* unity build + * ----------------- */ + +#include "world.c" +#include "player.c" +#include "vehicle.c" +#include "entity.c" +#include "workshop.c" +#include "addon.c" +#include "highscores.c" + +static struct player_avatar localplayer_avatar; +static struct player_model localplayer_models[3]; int main( int argc, char *argv[] ) { @@ -48,10 +58,12 @@ int main( int argc, char *argv[] ) return 0; } +#if 0 VG_STATIC void highscores_save_at_exit(void) { highscores_serialize_all(); } +#endif VG_STATIC void vg_launch_opt(void) { @@ -69,23 +81,17 @@ vg_info(" | \\/ | | / | | \\ | / | \n" ); vg_info(" ' ' '--' [] '----- '----- ' ' '---' " "SOFTWARE\n" ); + /* 31.05.23 (hgn): this is only a server feature now */ +#if 0 highscores_init( 2000, 50 ); if( !highscores_read() ) highscores_create_db(); - vg_loader_step( NULL, highscores_save_at_exit ); +#endif steam_init(); vg_loader_step( NULL, steam_end ); vg_loader_step( network_init, network_end ); - -#ifdef DEV_AARON - q_identity( aaron.rb.q ); - v3_zero( aaron.rb.w ); - v3_zero( aaron.rb.co ); - v3_zero( aaron.rb.v ); - rb_init_object( &aaron ); -#endif } VG_STATIC void load_playermodels(void) @@ -93,12 +99,6 @@ VG_STATIC void load_playermodels(void) player_model_load( &localplayer_models[0], "models/ch_new.mdl" ); player_model_load( &localplayer_models[1], "models/ch_outlaw.mdl" ); player_model_load( &localplayer_models[2], "models/ch_jordan.mdl" ); - - /* load default board */ -#if 0 - player_board_load( &localplayer_boards[0], - "models/boards/skaterift_fish.mdl" ); -#endif /* FIXME: hack */ shader_model_character_view_register(); @@ -112,24 +112,30 @@ void temp_update_playermodel(void){ VG_STATIC void async_skaterift_complete( void *payload, u32 size ) { - skaterift_status = 1; - - localplayer.viewable_world = get_active_world(); + localplayer.viewable_world = world_current_instance(); localplayer_cmd_respawn( 1, (const char *[]){ "start" } ); + + skaterift_end_op(); } VG_STATIC void vg_load(void) { + vg_console_reg_cmd( "changeworld", skaterift_change_world_command, 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 ); - - font3d_load( &world_global.font, "models/rs_font.mdl", vg_mem.rtmemory ); + vg_loader_step( gui_init, NULL ); vg_loader_step( player_init, NULL ); vg_loader_step( player_ragdoll_init, NULL ); + + /* content stuff */ + vg_loader_step( addon_system_init, NULL ); + vg_loader_step( workshop_init, NULL ); vg_loader_step( skateshop_init, NULL ); /* ----------------- */ @@ -140,7 +146,6 @@ VG_STATIC void vg_load(void) player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" ); player__use_avatar( &localplayer, &localplayer_avatar ); player__use_model( &localplayer, &localplayer_models[cl_playermdl_id] ); - //localplayer.board = &localplayer_boards[0]; player__bind( &localplayer ); /* --------------------- */ @@ -149,24 +154,50 @@ VG_STATIC void vg_load(void) vg_loader_step( audio_init, audio_free ); /* 'systems' are completely loaded now */ - - /* load home world */ - -#if 1 - world_load( 0, "maps/mp_spawn.mdl" ); -#else - world_load( 0, "maps/mp_mtzero.mdl" ); -#endif - -#if 0 - world_load( &world_global.worlds[1], "maps/mp_gridmap.mdl" ); - world_link_nonlocal_gates( 0, 1 ); - world_load( &world_global.worlds[2], "maps/mp_mtzero.mdl" ); - world_link_nonlocal_gates( 0, 2 ); -#endif - + + /* load home/permanent world manually */ + world_loader.reg = NULL; + strcpy( world_loader.override_name, "mp_spawn" ); + world_loader.generate_point_cloud = 1; + world_loader.world_index = 0; + world_load_mdl( "maps/mp_spawn/main.mdl" ); + + /* Completing addon registrations + * ------------------------------------- + */ + vg_msg msg; + + /* understate diy. */ + addon_reg *spawn = addon_mount_local_addon( "maps/mp_spawn", + k_workshop_file_type_world, + ".mdl" ); + 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; + + /* mtzero island */ + addon_reg *mtzero = addon_mount_local_addon( "maps/mp_mtzero", + k_workshop_file_type_world, + ".mdl" ); + vg_msg_init( &msg, mtzero->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; + global_skateshop.selected_world_id=1; + global_skateshop.pointcloud_world_id=1; + skateshop_preview_loader_thread( mtzero ); /* HACK */ + + vg_async_call( async_addon_reg_update, NULL, 0 ); vg_console_load_autos(); + menu_link(); + temp_update_playermodel(); + //vg_mem_log( vg_mem.rtmemory, 0, "Root" ); vg_async_call( async_skaterift_complete, NULL, 0 ); } @@ -177,101 +208,65 @@ VG_STATIC void draw_origin_axis(void) vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 0.0f, 1.0f }, 0xff0000ff ); } +static void skaterift_change_world_preupdate(void); VG_STATIC void vg_update(void) { steam_update(); - skaterift_preupdate_inputs(); + if( skaterift.async_op == k_async_op_clientloading ) return; + if( skaterift.async_op == k_async_op_world_preloading ){ + skaterift_change_world_preupdate(); + } - if( skaterift_status == 1 ){ - draw_origin_axis(); - network_update(); - - player__pre_update( &localplayer ); - global_skateshop_preupdate(); + draw_origin_axis(); + network_update(); + + player__pre_update( &localplayer ); + global_skateshop_preupdate(); - world_update( get_active_world(), localplayer.rb.co ); - audio_ambient_sprites_update( get_active_world(), localplayer.rb.co ); - //gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" ); - } + world_update( world_current_instance(), localplayer.rb.co ); + audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co ); + //gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" ); } VG_STATIC void vg_update_fixed(void) { - if( skaterift_status == 1 ){ - world_routes_fixedupdate( get_active_world() ); - - player__update( &localplayer ); - vehicle_update_fixed(); - -#ifdef DEV_AARON - world_instance *world = get_active_world(); - rb_solver_reset(); - rb_ct *buf = rb_global_buffer(); - - int l = rb_box__scene( aaron.rb.to_world, aaron.rb.bbx, - NULL, &world->rb_geo.inf.scene, buf ); - for( int j=0; jrb_geo.rb; - } - rb_contact_count += l; - rb_presolve_contacts( rb_contact_buffer, rb_contact_count ); - - for( int j=0; j<8; j++ ){ - rb_solve_contacts( rb_contact_buffer, rb_contact_count ); - } - - rb_iter( &aaron.rb ); - rb_update_transform( &aaron.rb ); -#endif + if( skaterift.async_op == k_async_op_clientloading ) return; - } + world_routes_fixedupdate( world_current_instance() ); + player__update( &localplayer ); + vehicle_update_fixed(); } VG_STATIC void vg_update_post(void) { - if( skaterift_status == 1 ){ - player__post_update( &localplayer ); - - float dist; - int sample_index; - world_audio_sample_distances( localplayer.rb.co, &sample_index, &dist ); + if( skaterift.async_op == k_async_op_clientloading ) return; - audio_lock(); - vg_dsp.echo_distances[sample_index] = dist; + player__post_update( &localplayer ); - v3f ears = { 1.0f,0.0f,0.0f }; - m3x3_mulv( main_camera.transform, ears, ears ); - v3_copy( ears, vg_audio.external_listener_ears ); - v3_copy( main_camera.transform[3], vg_audio.external_listener_pos ); - - if( localplayer.gate_waiting ){ - m4x3_mulv( localplayer.gate_waiting->transport, - vg_audio.external_listener_pos, - vg_audio.external_listener_pos ); - } + float dist; + int sample_index; + world_audio_sample_distances( localplayer.rb.co, &sample_index, &dist ); - v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity ); - audio_unlock(); + audio_lock(); + vg_dsp.echo_distances[sample_index] = dist; - menu_update(); - vehicle_update_post(); + v3f ears = { 1.0f,0.0f,0.0f }; + m3x3_mulv( main_camera.transform, ears, ears ); + v3_copy( ears, vg_audio.external_listener_ears ); + v3_copy( main_camera.transform[3], vg_audio.external_listener_pos ); -#ifdef DEV_AARON - SDL_Scancode sc = SDL_GetScancodeFromKey( SDLK_q ); - if( vg_input.sdl_keys[sc] ){ - m4x3_mulv( main_camera.transform, (v3f){0.0f,0.0f,-3.0f}, - aaron.rb.co ); + if( localplayer.gate_waiting ){ + m4x3_mulv( localplayer.gate_waiting->transport, + vg_audio.external_listener_pos, + vg_audio.external_listener_pos ); + } - v3_zero( aaron.rb.v ); - v3_zero( aaron.rb.w ); - rb_update_transform( &aaron.rb ); - } + v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity ); + audio_unlock(); - rb_object_debug( &aaron, VG__PINK ); -#endif - } + vg.time_rate = 1.0f-menu.factive; + vehicle_update_post(); } VG_STATIC void vg_framebuffer_resize( int w, int h ) @@ -301,7 +296,7 @@ VG_STATIC void present_view_with_post_processing(void) shader_blitblur_uInverseRatio( inverse ); v2f menu_blurring; - v2_muls( (v2f){ 0.04f, 0.001f }, menu_opacity, menu_blurring ); + v2_muls( (v2f){ 0.04f, 0.001f }, menu.factive, menu_blurring ); shader_blitblur_uOverrideDir( menu_blurring ); render_fb_bind_texture( gpipeline.fb_main, 0, 0 ); @@ -355,7 +350,12 @@ VG_STATIC void render_scene(void) return; } - world_prerender( view_world ); + for( u32 i=0; i