X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg.h;h=132f338275933833d2a0545e6c1dfd3cb5376b9f;hb=c14db510e727e91cd0041f73663ef5b7ca32e05f;hp=ecb75505d6ec9985cde486a6a0516a99d61b6303;hpb=c70327d950761c26f2a7c55eb622be7c042bb550;p=vg.git diff --git a/vg.h b/vg.h index ecb7550..132f338 100644 --- a/vg.h +++ b/vg.h @@ -26,17 +26,17 @@ |IMP| | |.------------- vg_start(void) ---------------' | | | | | | | v -|IMP| | vg_update(void) +|IMP| | vg_pre_update(void) | | | | | | | .-----+. -| | | | | +| | | | | called 0x to 8x | | | | v -|IMP| | '- vg_update_fixed(void) +|IMP| | '- vg_fixed_update(void) | | | | | | | .-' | | | | | | | v -|IMP| | vg_update_post(void) +|IMP| | vg_post_update(void) | | | | | | | v |IMP| | vg_render(void) @@ -52,41 +52,14 @@ #ifndef VG_HEADER_H #define VG_HEADER_H + const char *vg_get_basepath(void); + #include "vg_platform.h" #include "vg_mem.h" - - #ifndef _WIN32 - #include - #endif - -VG_STATIC void vg_print_backtrace(void) -{ -#ifndef _WIN32 - - void *array[20]; - char **strings; - int size, i; - - size = backtrace( array, 20 ); - strings = backtrace_symbols( array, size ); - - if( strings != NULL ){ - vg_error( "---------------- gnu backtrace -------------\n" ); - - for( int i=0; i //#define VG_SYNC_DEBUG #ifdef VG_SYNC_DEBUG @@ -117,29 +89,28 @@ VG_STATIC void vg_launch_opt(void); VG_STATIC void vg_start(void); VG_STATIC void vg_framebuffer_resize(int w, int h); -VG_STATIC void vg_update(void); -VG_STATIC void vg_update_fixed(void); -VG_STATIC void vg_update_post(void); +VG_STATIC void vg_pre_update(void); +VG_STATIC void vg_fixed_update(void); +VG_STATIC void vg_post_update(void); VG_STATIC void vg_render(void); -VG_STATIC void vg_ui(void); +VG_STATIC void vg_gui(void); -struct vg -{ +struct vg{ /* Engine sync */ SDL_Window *window; SDL_GLContext gl_context; + const char *base_path; SDL_sem *sem_loader; /* allows only one loader at a time */ - jmp_buf env_loader_exit; SDL_threadID thread_id_main, thread_id_loader; + void *thread_data; SDL_SpinLock sl_status; - enum engine_status - { + enum engine_status{ k_engine_status_none, k_engine_status_load_internal, k_engine_status_running, @@ -156,8 +127,7 @@ struct vg int display_refresh_rate, fps_limit; /* 0: use vsync, >0: cap fps to this, no vsync */ - enum vsync_feature - { + enum vsync_feature{ k_vsync_feature_disabled=0, k_vsync_feature_enabled=1, k_vsync_feature_enabled_adaptive=2, @@ -182,8 +152,7 @@ struct vg int fixed_iterations; - enum engine_stage - { + enum engine_stage{ k_engine_stage_none, k_engine_stage_update, k_engine_stage_update_fixed, @@ -194,8 +163,7 @@ struct vg /* graphics */ m4x4f pv; - enum quality_profile - { + enum quality_profile{ k_quality_profile_high = 0, k_quality_profile_low = 1, } @@ -204,6 +172,9 @@ struct vg float loader_ring; } VG_STATIC vg = { .time_rate = 1.0 }; +const char *vg_get_basepath(void){ + return vg.base_path; +} enum vg_thread_purpose { @@ -237,6 +208,14 @@ VG_STATIC enum vg_thread_purpose vg_thread_purpose(void) } } +VG_STATIC void vg_assert_thread( enum vg_thread_purpose required ){ + enum vg_thread_purpose purpose = vg_thread_purpose(); + + if( purpose != required ){ + vg_fatal_error( "thread_purpose must be %u not %u\n", required, purpose ); + } +} + VG_STATIC void _vg_opengl_sync_init(void) { vg.sem_loader = SDL_CreateSemaphore(1); @@ -252,7 +231,7 @@ VG_STATIC void vg_checkgl( const char *src_info ); #include "vg_shader.h" #include "vg_tex.h" #include "vg_input.h" -#include "vg_ui.h" +#include "vg_imgui.h" #include "vg_lines.h" #include "vg_loader.h" #include "vg_opt.h" @@ -303,7 +282,7 @@ void async_internal_complete( void *payload, u32 size ) SDL_AtomicUnlock( &vg.sl_status ); } -VG_STATIC void _vg_load_full(void) +VG_STATIC void _vg_load_full( void *data ) { vg_preload(); @@ -331,7 +310,33 @@ VG_STATIC void _vg_process_events(void) SDL_Event event; while( SDL_PollEvent( &event ) ){ if( event.type == SDL_KEYDOWN ){ - console_proc_key( event.key.keysym ); + if( vg_console.enabled && + (vg_ui.focused_control_type != k_ui_control_modal) ){ + if( event.key.keysym.sym == SDLK_ESCAPE || + event.key.keysym.sym == SDLK_BACKQUOTE ){ + vg_console.enabled = 0; + ui_defocus_all(); + } + else if( (event.key.keysym.mod & KMOD_CTRL) && + event.key.keysym.sym == SDLK_n ){ + _console_suggest_next(); + } + else if( (event.key.keysym.mod & KMOD_CTRL ) && + event.key.keysym.sym == SDLK_p ){ + _console_suggest_prev(); + } + else{ + _ui_proc_key( event.key.keysym ); + } + } + else{ + if( event.key.keysym.sym == SDLK_BACKQUOTE ){ + vg_console.enabled = 1; + } + else { + _ui_proc_key( event.key.keysym ); + } + } } else if( event.type == SDL_MOUSEWHEEL ){ vg.mouse_wheel[0] += event.wheel.preciseX; @@ -373,7 +378,7 @@ VG_STATIC void _vg_process_events(void) } } else if( event.type == SDL_TEXTINPUT ){ - console_proc_utf8( event.text.text ); + ui_proc_utf8( event.text.text ); } } @@ -386,7 +391,7 @@ VG_STATIC void _vg_gameloop_update(void) vg_profile_begin( &vg_prof_update ); vg.engine_stage = k_engine_stage_update; - vg_update(); + vg_pre_update(); /* Fixed update loop */ vg.engine_stage = k_engine_stage_update_fixed; @@ -396,11 +401,9 @@ VG_STATIC void _vg_gameloop_update(void) vg.time_fixed_accumulator += vg.time_delta; while( vg.time_fixed_accumulator >= VG_TIMESTEP_FIXED ){ - vg_update_fixed(); + vg_fixed_update(); vg_lines.allow_input = 0; - vg.time_fixed_accumulator -= VG_TIMESTEP_FIXED; - //vg.accumulator = VG_MAX( 0.0, vg.accumulator ); vg.fixed_iterations ++; if( vg.fixed_iterations == 8 ){ @@ -411,7 +414,7 @@ VG_STATIC void _vg_gameloop_update(void) vg.time_fixed_extrapolate = vg.time_fixed_accumulator / VG_TIMESTEP_FIXED; vg.engine_stage = k_engine_stage_update; - vg_update_post(); + vg_post_update(); vg_profile_end( &vg_prof_update ); } @@ -426,24 +429,28 @@ VG_STATIC void _vg_gameloop_render(void) /* ui */ vg.engine_stage = k_engine_stage_ui; { - ui_begin( vg.window_x, vg.window_y ); + ui_prerender(); + if( vg_console.enabled ){ + vg_ui.ignore_input_frames = 10; + vg_gui(); + vg_ui.ignore_input_frames = 0; + vg_ui.wants_mouse = 1; + _vg_console_draw(); + } + else vg_gui(); - /* TODO */ - ui_set_mouse( vg.mouse_pos[0], vg.mouse_pos[1], 0 ); + /* vg tools */ + audio_debug_ui( vg.pv ); + /* profiling */ int frame_target = vg.display_refresh_rate; - - if( vg.fps_limit > 0 ){ - frame_target = vg.fps_limit; - } - + if( vg.fps_limit > 0 ) frame_target = vg.fps_limit; vg_profile_drawn( (struct vg_profile *[]){ &vg_prof_update,&vg_prof_render,&vg_prof_swap}, 3, (1.0f/(float)frame_target)*1000.0f, (ui_rect){ 4, 4, 250, 0 }, 0 ); - if( vg_profiler ){ char perf[256]; @@ -453,11 +460,7 @@ VG_STATIC void _vg_gameloop_render(void) "samples: %d\n" "iterations: %d (acc: %.3fms%%)\n" "time: real(%.2f) delta(%.2f) rate(%.2f)\n" -#ifdef _WIN32 - " extrap(%.2f) frame(%.2f) spin( %llu )\n", -#else - " extrap(%.2f) frame(%.2f) spin( %lu )\n", -#endif + " extrap(%.2f) frame(%.2f) spin( "PRINTF_U64" )\n", vg.window_x, vg.window_y, frame_target, (1.0f/(float)frame_target)*1000.0f, vg.samples, @@ -467,16 +470,9 @@ VG_STATIC void _vg_gameloop_render(void) vg.time_fixed_extrapolate, vg.time_frame_delta, vg.time_spinning ); - ui_text( (ui_rect){258, 4+24+12+12,0,0},perf, 1,0); + ui_text( (ui_rect){258, 4+24+12+12,900,900},perf,1,0,k_ui_align_left); } - - /* FIXME */ - audio_debug_ui( vg.pv ); - vg_ui(); - _vg_console_draw(); - - ui_resolve(); - ui_draw( NULL ); + ui_postrender(); } vg_profile_end( &vg_prof_render ); @@ -570,8 +566,7 @@ VG_STATIC int _vg_crashscreen(void) return 0; } -VG_STATIC void _vg_gameloop(void) -{ +VG_STATIC void _vg_gameloop(void){ //vg.time_fixed_accumulator = 0.75f * (1.0f/60.0f); vg.time_hp = SDL_GetPerformanceCounter(); @@ -621,8 +616,8 @@ VG_STATIC void _vg_gameloop(void) } if( vg.loader_ring > 0.01f ){ - vg.loader_ring -= vg.time_frame_delta * 0.5f; _vg_loader_render_ring( vg.loader_ring ); + vg.loader_ring -= vg.time_frame_delta * 0.5f; } vg.time_frame_delta = 0.0; @@ -670,6 +665,15 @@ VG_STATIC void _vg_init_window( const char *window_name ) SDL_InitSubSystem( SDL_INIT_AUDIO ); SDL_InitSubSystem( SDL_INIT_GAMECONTROLLER ); + char *exe_basepath = SDL_GetBasePath(); + u32 len = vg_align8( strlen(exe_basepath)+1 ); + char *dest = vg_linear_alloc( vg_mem.rtmemory, len ); + strcpy( dest, exe_basepath ); + SDL_free( exe_basepath ); + vg.base_path = dest; + + vg_info( "Basepath: %s\n", vg.base_path ); + SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 ); SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, 3 ); SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, 3 ); @@ -693,11 +697,6 @@ VG_STATIC void _vg_init_window( const char *window_name ) display_index = 0, mode_index = 0; -#ifdef VG_DEVWINDOW - vg.window_x = 1600; - vg.window_y = 1000; -#else - SDL_DisplayMode video_mode; if( SDL_GetDesktopDisplayMode( display_index, &video_mode ) ){ vg_error( "SDL_GetDesktopDisplayMode failed: %s\n", SDL_GetError() ); @@ -708,6 +707,10 @@ VG_STATIC void _vg_init_window( const char *window_name ) vg.display_refresh_rate = video_mode.refresh_rate; vg.window_x = video_mode.w; vg.window_y = video_mode.h; + +#ifdef VG_DEVWINDOW + vg.window_x = 1200; + vg.window_y = 880; #endif #ifndef _WIN32 @@ -725,7 +728,9 @@ VG_STATIC void _vg_init_window( const char *window_name ) #ifdef VG_DEVWINDOW 0, 0, vg.window_x, vg.window_y, SDL_WINDOW_BORDERLESS|SDL_WINDOW_OPENGL|SDL_WINDOW_INPUT_GRABBED - ))){} + ))){ + SDL_SetWindowPosition( vg.window, video_mode.w-vg.window_x, 0 ); + } #else 0, 0, vg.window_x, vg.window_y, @@ -751,6 +756,9 @@ VG_STATIC void _vg_init_window( const char *window_name ) vg_info( "CreateContext\n" ); + /* ????? */ + if( SDL_IsTextInputActive() ) SDL_StopTextInput(); + /* * OpenGL loading */ @@ -789,11 +797,9 @@ VG_STATIC void _vg_init_window( const char *window_name ) vg_info( "Display refresh rate: %d\n", dispmode.refresh_rate ); -#ifdef _WIN32 +#if defined(_WIN32) || defined(VG_DEVWINDOW) vg.fps_limit = vg.display_refresh_rate; #else - /* request vsync by default on linux to avoid screen tearing. - * this does have its own issues with compositing on X11. */ vg.fps_limit = 0; #endif } @@ -818,6 +824,7 @@ VG_STATIC void _vg_terminate(void) VG_STATIC void vg_enter( int argc, char *argv[], const char *window_name ) { + vg_rand_seed( 461 ); _vg_process_launch_opts_internal( argc, argv ); /* Systems init */ @@ -828,8 +835,8 @@ VG_STATIC void vg_enter( int argc, char *argv[], const char *window_name ) _vg_init_window( window_name ); vg_async_init(); - SDL_SetRelativeMouseMode(1); + vg.thread_id_main = SDL_GetThreadID(NULL); /* Opengl-required systems */ @@ -839,7 +846,7 @@ VG_STATIC void vg_enter( int argc, char *argv[], const char *window_name ) vg.engine_status = k_engine_status_load_internal; _vg_opengl_sync_init(); - vg_loader_start( _vg_load_full ); + vg_loader_start( _vg_load_full, NULL ); _vg_gameloop(); _vg_terminate(); } @@ -848,7 +855,7 @@ VG_STATIC void vg_fatal_error( const char *fmt, ... ) { va_list args; va_start( args, fmt ); - _vg_log_write( stderr, KRED " fatal" KWHT "| " KRED, fmt, args ); + _vg_logx_va( stderr, NULL, "fatal", KRED, fmt, args ); va_end( args ); vg_print_backtrace(); @@ -873,7 +880,7 @@ VG_STATIC void vg_fatal_error( const char *fmt, ... ) { va_list args; va_start( args, fmt ); - _vg_log_write( stderr, KRED " fatal" KWHT "| " KRED, fmt, args ); + _vg_logx_va( stderr, NULL, "fatal", KRED, fmt, args ); va_end( args ); exit(0); } @@ -886,4 +893,6 @@ VG_STATIC void vg_fatal_error( const char *fmt, ... ) u32 NvOptimusEnablement = 0x00000001; int AmdPowerXpressRequestHighPerformance = 1; +#include "vg_log.c" + #endif /* VG_HEADER_H */