X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=f790aefc2cd9373e828f0536c39a1f1b2029d9f8;hb=7eba38b8178c82040618a518634d8ff4813e2ff2;hp=e8b1f4dd5e3dea85dee98e0abfe75372d50f0041;hpb=b3ca3b7a45eec11c46eb19772e10021177665adb;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index e8b1f4d..f790aef 100644 --- a/skaterift.c +++ b/skaterift.c @@ -11,55 +11,59 @@ * ============================================================================= */ -#define SR_NETWORKED -#define VG_DEVWINDOW -#include "common.h" -#include "conf.h" +#if 1 + +//#define SR_NETWORKED + +#ifndef VG_RELEASE + #define VG_DEVWINDOW +#endif + +/* + * system headers + * --------------------- */ + +#include "skaterift.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" +#include "save.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 + * ----------------- */ -int main( int argc, char *argv[] ) -{ +#include "world.c" +#include "player.c" +#include "vehicle.c" +#include "entity.c" +#include "workshop.c" +#include "addon.c" +#include "highscores.c" +#include "save.c" + +static struct player_avatar localplayer_avatar; + +int main( int argc, char *argv[] ){ vg_mem.use_libc_malloc = 0; vg_set_mem_quota( 160*1024*1024 ); vg_enter( argc, argv, "Voyager Game Engine" ); return 0; } -VG_STATIC void highscores_save_at_exit(void) -{ - highscores_serialize_all(); -} +VG_STATIC void vg_launch_opt(void){} -VG_STATIC void vg_launch_opt(void) -{ -} - -VG_STATIC void vg_preload(void) -{ - g_conf_init(); +VG_STATIC void vg_preload(void){ + skaterift_read_savedata(); vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" ); @@ -69,78 +73,114 @@ vg_info(" | \\/ | | / | | \\ | / | \n" ); vg_info(" ' ' '--' [] '----- '----- ' ' '---' " "SOFTWARE\n" ); - highscores_init( 2000, 50 ); - if( !highscores_read() ) - highscores_create_db(); - - vg_loader_step( NULL, highscores_save_at_exit ); - 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) -{ - 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 - +VG_STATIC void load_playermodels(void){ /* FIXME: hack */ shader_model_character_view_register(); shader_model_board_view_register(); shader_model_entity_register(); } -void temp_update_playermodel(void){ - player__use_model( &localplayer, &localplayer_models[cl_playermdl_id] ); +VG_STATIC void async_skaterift_player_start( void *payload, u32 size ){ + localplayer.viewable_world = world_current_instance(); + localplayer_cmd_respawn( 1, (const char *[]){ "start" } ); } -VG_STATIC void async_skaterift_complete( void *payload, u32 size ) -{ - skaterift_status = 1; +static void async_call_ready( void *payload, u32 size ){ + skaterift.op = k_async_op_none; +} - localplayer.viewable_world = get_active_world(); - localplayer_cmd_respawn( 1, (const char *[]){ "start" } ); +static void skaterift_restore_state(void){ + vg_msg sav = {0}; + sav.buf = savedata.buf; + sav.len = savedata.len; + sav.max = sizeof(savedata.buf); + + vg_msg player = sav; + if( vg_msg_seekframe( &player, "player", 0 ) ){ + addon_alias q; + + /* board */ + skaterift_read_addon_alias( &player, "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 ); + } + + /* playermodel */ + skaterift_read_addon_alias( &player, "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 ); + } + + vg_msg world = sav; + 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_loader.generate_point_cloud = 0; + world_loader.reg = reg; + world_loader.state = k_world_loader_load; + skaterift_world_changer_thread(NULL); + + world_static.active_world = 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 ); + player__setpos( &localplayer, pos ); + } + } } -VG_STATIC void vg_load(void) -{ +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 ); /* ----------------- */ vg_loader_step( load_playermodels, NULL ); /* player setup */ + u32 bytes = 1024*1024*10; + skaterift.replay.data = vg_linear_alloc( vg_mem.rtmemory, bytes ); + skaterift.replay.size = bytes; + replay_clear( &skaterift.replay ); + player__create( &localplayer ); - player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" ); + player_avatar_load( &localplayer_avatar, "models/ch_none.mdl" ); player__use_avatar( &localplayer, &localplayer_avatar ); - player__use_model( &localplayer, &localplayer_models[cl_playermdl_id] ); - //localplayer.board = &localplayer_boards[0]; + player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" ); player__bind( &localplayer ); /* --------------------- */ @@ -149,138 +189,159 @@ VG_STATIC void vg_load(void) vg_loader_step( audio_init, audio_free ); /* 'systems' are completely loaded now */ + + /* 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" ); + + vg_async_call( async_skaterift_player_start, NULL, 0 ); + vg_async_stall(); + + /* Completing addon registrations + * ------------------------------------- + */ + + /* 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; + } - /* load home world */ - -#if 1 - world_load( 0, "maps/mp_spawn.mdl" ); -#else - world_load( 0, "maps/mp_mtzero.mdl" ); -#endif + /* 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; + } -#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 + global_skateshop.selected_world_id=1; + global_skateshop.pointcloud_world_id=1; + skateshop_world_preview_loader_thread( mtzero ); /* HACK */ vg_console_load_autos(); - - vg_async_call( async_skaterift_complete, NULL, 0 ); + menu_link(); + + addon_mount_content_folder( k_addon_type_player, + "playermodels", ".mdl" ); + addon_mount_content_folder( k_addon_type_board, "boards", ".mdl" ); + addon_mount_content_folder( k_addon_type_world, "maps", ".mdl" ); + addon_mount_workshop_items(); + vg_async_call( async_addon_reg_update, NULL, 0 ); + vg_async_stall(); + + /* and now */ + skaterift_restore_state(); + vg_loader_step( NULL, skaterift_write_savedata ); + + board_processview_thread(NULL); + vg_async_call( async_call_ready, NULL, 0 ); } -VG_STATIC void draw_origin_axis(void) -{ +VG_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 ); } +static void skaterift_change_world_preupdate(void); -VG_STATIC void vg_update(void) -{ - steam_update(); - - skaterift_preupdate_inputs(); - - if( skaterift_status == 1 ){ - draw_origin_axis(); - network_update(); - - player__pre_update( &localplayer ); - global_skateshop_preupdate(); +/* + * UPDATE LOOP + * ---------------------------------------------------------------------------*/ - 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" ); - } -} +VG_STATIC void vg_pre_update(void){ + srinput.enabled = 1; -VG_STATIC void vg_update_fixed(void) -{ - if( skaterift_status == 1 ){ - world_routes_fixedupdate( get_active_world() ); - - player__update( &localplayer ); - vehicle_update_fixed(); + steam_update(); + skaterift_preupdate_inputs(); + if( skaterift.op == k_async_op_clientloading ) return; + if( world_loader.state == k_world_loader_preload ) + skaterift_change_world_preupdate(); -#ifdef DEV_AARON - world_instance *world = get_active_world(); - rb_solver_reset(); - rb_ct *buf = rb_global_buffer(); + draw_origin_axis(); + network_update(); - 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 ); + /* time rate */ + f32 target = 1; + if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu) ) + target = 0; - 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 + 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(); + skaterift_replay_pre_update(); - } + world_update( world_current_instance(), localplayer.rb.co ); + audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co ); } -VG_STATIC void vg_update_post(void) -{ - if( skaterift_status == 1 ){ - player__post_update( &localplayer ); +VG_STATIC void vg_fixed_update(void){ + if( skaterift.op == k_async_op_clientloading ) return; - float dist; - int sample_index; - world_audio_sample_distances( localplayer.rb.co, &sample_index, &dist ); + world_routes_fixedupdate( world_current_instance() ); + player__update( &localplayer ); + vehicle_update_fixed(); +} - audio_lock(); - vg_dsp.echo_distances[sample_index] = dist; +VG_STATIC void vg_post_update(void){ + if( skaterift.op == k_async_op_clientloading ) return; - 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 ); + player__post_update( &localplayer ); - 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( skaterift.cam.transform, ears, ears ); + v3_copy( ears, vg_audio.external_listener_ears ); + v3_copy( skaterift.cam.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 - } + vehicle_update_post(); } -VG_STATIC void vg_framebuffer_resize( int w, int h ) -{ +/* + * RENDERING + * ---------------------------------------------------------------------------*/ + +VG_STATIC void vg_framebuffer_resize( int w, int h ){ render_fb_resize(); } -VG_STATIC void present_view_with_post_processing(void) -{ +VG_STATIC void present_view_with_post_processing(void){ glBindFramebuffer( GL_FRAMEBUFFER, 0 ); glViewport( 0,0, vg.window_x, vg.window_y ); @@ -292,17 +353,38 @@ VG_STATIC void present_view_with_post_processing(void) v2f inverse; render_fb_inverse_ratio( gpipeline.fb_main, inverse ); - if( cl_blur ){ + if( k_blur_effect ){ shader_blitblur_use(); shader_blitblur_uTexMain( 0 ); shader_blitblur_uTexMotion( 1 ); - shader_blitblur_uBlurStrength( cl_blur_strength / + shader_blitblur_uBlurStrength( k_blur_strength / (vg.time_frame_delta*60.0) ); shader_blitblur_uInverseRatio( inverse ); - v2f menu_blurring; - v2_muls( (v2f){ 0.04f, 0.001f }, menu_opacity, menu_blurring ); - shader_blitblur_uOverrideDir( menu_blurring ); + inverse[0] -= 0.0001f; + inverse[1] -= 0.0001f; + shader_blitblur_uClampUv( inverse ); + + static f64 effect_time = 133.0; + effect_time += vg.time_frame_delta; + shader_blitblur_uTime( effect_time ); + + f32 glitch_strength = 0.0f; + if( skaterift.activity == k_skaterift_replay ){ + glitch_strength = 0.005f; + if( skaterift.replay_control == k_replay_control_play ) + glitch_strength = 0.005f; + else + glitch_strength += 0.005f*skaterift.track_velocity; + } + shader_blitblur_uGlitchStrength( glitch_strength ); + + v2f override; + if( skaterift.activity == k_skaterift_menu ) + v2_muls( (v2f){ 0.04f, 0.001f }, 1.0f-skaterift.time_rate, override ); + else + v2_zero( override ); + shader_blitblur_uOverrideDir( override ); render_fb_bind_texture( gpipeline.fb_main, 0, 0 ); render_fb_bind_texture( gpipeline.fb_main, 1, 1 ); @@ -317,14 +399,13 @@ VG_STATIC void present_view_with_post_processing(void) render_fsquad(); } -VG_STATIC void render_player_transparent(void) -{ +VG_STATIC void render_player_transparent(void){ static camera small_cam; /* DOES NOT NEED TO BE STATIC BUT MINGW SAIS OTHERWISE */ - m4x3_copy( main_camera.transform, small_cam.transform ); + m4x3_copy( skaterift.cam.transform, small_cam.transform ); - small_cam.fov = main_camera.fov; + small_cam.fov = skaterift.cam.fov; small_cam.nearz = 0.05f; small_cam.farz = 60.0f; @@ -333,17 +414,10 @@ VG_STATIC void render_player_transparent(void) camera_finalize( &small_cam ); /* Draw player to window buffer and blend background ontop */ - glBindFramebuffer( GL_FRAMEBUFFER, 0 ); - glViewport( 0,0, vg.window_x, vg.window_y ); player__render( &small_cam, &localplayer ); } -VG_STATIC void render_scene(void) -{ - render_fb_bind( gpipeline.fb_main, 1 ); - glClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); - glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT ); - +VG_STATIC void render_scene(void){ /* Draw world */ glEnable( GL_DEPTH_TEST ); @@ -355,99 +429,111 @@ VG_STATIC void render_scene(void) return; } - world_prerender( view_world ); - render_world( view_world, &main_camera, 0 ); + for( u32 i=0; itime; + skaterift.replay.cursor_frame = skaterift.replay.head; + } + skaterift.replay_control = k_replay_control_scrub; + } + } } -VG_STATIC void vg_render(void) -{ - if( skaterift_status == 0 ){ +VG_STATIC void vg_render(void){ + if( skaterift.op == k_async_op_clientloading ){ _vg_loader_render(); return; } @@ -456,13 +542,13 @@ VG_STATIC void vg_render(void) glViewport( 0,0, vg.window_x, vg.window_y ); glDisable( GL_DEPTH_TEST ); + glDisable( GL_BLEND ); glClearColor( 1.0f, 0.0f, 0.0f, 0.0f ); glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT ); render_main_game(); - - m4x4_copy( main_camera.mtx.pv, vg.pv ); + m4x4_copy( skaterift.cam.mtx.pv, vg.pv ); /* Other shite */ glDisable(GL_BLEND); @@ -472,17 +558,26 @@ VG_STATIC void vg_render(void) gui_draw(); } -VG_STATIC void vg_ui(void) -{ - if( skaterift_status == 0 ){ - return; +VG_STATIC void vg_gui(void){ + if( skaterift.op == k_async_op_clientloading ) return; + + menu_update(); + if( skaterift.activity == k_skaterift_menu ){ + glClear( GL_DEPTH_BUFFER_BIT ); + menu_render(); } -#if 0 player__im_gui( &localplayer ); -#endif - world_instance *world = get_active_world(); - menu_crap_ui(); - + world_instance *world = world_current_instance(); + + skaterift_replay_imgui(); + workshop_form_gui(); render_view_framebuffer_ui(); } + + +#else + +#include "skaterift_imgui_dev.c" + +#endif