X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=skaterift.c;h=0b3310ab44781d01dc6ab747cb5c3ae3e8a0aef9;hb=75703291fbf045008a3b1ebb20fc46a2617b6b3b;hp=21a7981793ba6ccd6149de3a5aaaccb483ecdf0d;hpb=a1741ec4aed057cbafff2d6bc9e5cf8a15ae322b;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 21a7981..0b3310a 100644 --- a/skaterift.c +++ b/skaterift.c @@ -9,22 +9,8 @@ * ' ' '--' [] '----- '----- ' ' '---' SOFTWARE * * ============================================================================= - * - * register: shader register & init scheduling - * init: initialization - * update: logic - * render: graphics - * free: resource free - * */ -#define VG_3D -#define VG_STATIC static -//#define VG_STATIC - -//#define VG_MINIMAL_TEST -#ifndef VG_MINIMAL_TEST - #define SR_NETWORKED #include "common.h" @@ -43,16 +29,22 @@ int main( int argc, char *argv[] ) vg_mem.use_libc_malloc = 0; vg_set_mem_quota( 128*1024*1024 ); vg_enter( argc, argv, "Voyager Game Engine" ); + + return 0; } -VG_STATIC void highscores_save_at_exit(void*_) +VG_STATIC void highscores_save_at_exit(void) { highscores_serialize_all(); } -VG_STATIC void vg_preload(void) +VG_STATIC void vg_launch_opt(void) { +} + +VG_STATIC void vg_preload(void) +{ vg_convar_push( (struct vg_convar){ .name = "cl_ui", .data = &cl_ui, @@ -61,6 +53,14 @@ VG_STATIC void vg_preload(void) .persistent = 1 }); + vg_convar_push( (struct vg_convar){ + .name = "cl_fov", + .data = &g_fov_option, + .data_type = k_convar_dtype_f32, + .opt_f32 = { .clamp = 0 }, + .persistent = 1 + }); + vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); vg_info(" 2021-2022 |\\ /| | / | | | | /| \n" ); vg_info(" | \\ / | +-- / +----- +---' | / | \n" ); @@ -73,28 +73,27 @@ vg_info(" ' ' '--' [] '----- '----- ' ' '---' " if( !highscores_read() ) highscores_create_db(); - vg_loader_highwater( NULL, highscores_save_at_exit, NULL ); - - //vg_sleep_ms(200); + vg_loader_step( NULL, highscores_save_at_exit ); steam_init(); - vg_loader_highwater( NULL, steam_end, NULL ); - vg_loader_highwater( network_init, network_end, NULL ); + vg_loader_step( NULL, steam_end ); + vg_loader_step( network_init, network_end ); } VG_STATIC void vg_load(void) { - vg_loader_highwater( render_init, NULL, NULL ); - vg_loader_highwater( menu_init, NULL, NULL ); - vg_loader_highwater( world_init, NULL, NULL ); - vg_loader_highwater( player_init, NULL, NULL ); + vg_loader_step( render_init, NULL ); + vg_loader_step( menu_init, NULL ); + vg_loader_step( world_init, NULL ); + vg_loader_step( player_init, NULL ); vg_bake_shaders(); - vg_loader_highwater( audio_init, audio_free, NULL ); + vg_loader_step( audio_init, audio_free ); world_audio_init(); /* 'systems' are completely loaded now */ - strcpy( world.world_name, "models/mp_dev.mdl" ); + strcpy( world.world_name, "maps/mp_mtzero.mdl" ); + strcpy( world.world_name, "maps/mp_gridmap.mdl" ); world_load(); vg_console_load_autos(); } @@ -111,11 +110,11 @@ VG_STATIC void draw_origin_axis(void) vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 0.0f, 1.0f }, 0xff0000ff ); } -VG_STATIC void vg_update( int loaded ) +VG_STATIC void vg_update(void) { steam_update(); - if( loaded ) + if( vg.is_loaded ) { draw_origin_axis(); network_update(); @@ -125,17 +124,17 @@ VG_STATIC void vg_update( int loaded ) } } -VG_STATIC void vg_update_fixed( int loaded ) +VG_STATIC void vg_update_fixed(void) { - if( loaded ) + if( vg.is_loaded ) { player_update_fixed(); } } -VG_STATIC void vg_update_post( int loaded ) +VG_STATIC void vg_update_post(void) { - if( loaded ) + if( vg.is_loaded ) { player_update_post(); menu_update(); @@ -153,11 +152,12 @@ VG_STATIC void render_main_game(void) m4x4f world_4x4; m4x3_expand( camera_mtx_inverse, world_4x4 ); - static float fov = 97.0f; + static float fov = 60.0f; + + float fov_target = vg_lerpf( 90.0f, 110.0f, g_fov_option ); - float fov_target = 108.0f; if( player.phys.on_board ) - fov_target = 118.0f; + fov_target = vg_lerpf( 97.0f, 135.0f, g_fov_option ); if( cl_menu ) fov_target = menu_fov_target; @@ -241,6 +241,7 @@ VG_STATIC void render_main_game(void) VG_STATIC void vg_render(void) { glBindFramebuffer( GL_FRAMEBUFFER, 0 ); + glViewport( 0,0, vg.window_x, vg.window_y ); glDisable( GL_DEPTH_TEST ); @@ -249,7 +250,6 @@ VG_STATIC void vg_render(void) render_main_game(); - /* Other shite */ glDisable(GL_BLEND); glDisable( GL_DEPTH_TEST ); @@ -259,6 +259,8 @@ VG_STATIC void vg_render(void) VG_STATIC void vg_ui(void) { + menu_crap_ui(); + #if 0 if( lightedit ) { @@ -341,11 +343,11 @@ VG_STATIC void run_debug_info(void) player.phys.rb.co[0], player.phys.rb.co[1], player.phys.rb.co[2] ); ui_text( (ui_px [2]){ 0, 40 }, buf, 1, k_text_align_left ); - if( vg.gamepad_ready ) + if( vg_input.controller_handle ) { - for( int i=0; i<6; i++ ) + for( int i=0; i