|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)
#include "vg_platform.h"
#include "vg_mem.h"
-
- #ifndef _WIN32
- #include <execinfo.h>
- #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<size; i++ )
- vg_info( "%s\n", strings[i] );
-
- vg_error( "---------------- gnu backtrace -------------\n" );
- }
-
- free( strings );
-
-#endif
-}
#ifdef VG_GAME
#include "dep/glad/glad.h"
#include "vg_m.h"
#include "vg_io.h"
#include "vg_log.h"
+#ifndef VG_NO_STEAM
#include "vg_steam.h"
+#endif
//#define VG_SYNC_DEBUG
#ifdef VG_SYNC_DEBUG
#endif
/* API */
-VG_STATIC void vg_enter( int argc, char *argv[], const char *window_name );
+static void vg_enter( int argc, char *argv[], const char *window_name );
/* Thread 1 */
-VG_STATIC void vg_preload(void);
-VG_STATIC void vg_load(void);
+static void vg_preload(void);
+static void vg_load(void);
/* Main thread */
-VG_STATIC void vg_launch_opt(void);
-VG_STATIC void vg_start(void);
+static void vg_launch_opt(void);
+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);
+static void vg_framebuffer_resize(int w, int h);
+static void vg_pre_update(void);
+static void vg_fixed_update(void);
+static void vg_post_update(void);
-VG_STATIC void vg_render(void);
-VG_STATIC void vg_gui(void);
+static void vg_render(void);
+static void vg_gui(void);
struct vg{
/* Engine sync */
/* Runtime */
double time,
+ time_real,
time_delta,
time_rate,
quality_profile;
float loader_ring;
+ GLuint tex_missing;
}
-VG_STATIC vg = { .time_rate = 1.0 };
+static vg = { .time_rate = 1.0 };
const char *vg_get_basepath(void){
return vg.base_path;
}
#include "vg_async.h"
-VG_STATIC enum engine_status _vg_engine_status(void)
+static enum engine_status _vg_engine_status(void)
{
SDL_AtomicLock( &vg.sl_status );
enum engine_status status = vg.engine_status;
return status;
}
-VG_STATIC enum vg_thread_purpose vg_thread_purpose(void)
+static enum vg_thread_purpose vg_thread_purpose(void)
{
SDL_AtomicLock( &vg.sl_status );
}
}
-VG_STATIC void _vg_opengl_sync_init(void)
+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 );
+ }
+}
+
+static void _vg_opengl_sync_init(void)
{
vg.sem_loader = SDL_CreateSemaphore(1);
}
-VG_STATIC void vg_checkgl( const char *src_info );
+static void vg_checkgl( const char *src_info );
#define VG_STRINGIT( X ) #X
#define VG_CHECK_GL_ERR() vg_checkgl( __FILE__ ":L" VG_STRINGIT(__LINE__) )
#include "vg_console.h"
#include "vg_profiler.h"
-#include "vg_audio.h"
+#ifndef VG_NO_AUDIO
+ #include "vg_audio.h"
+#endif
#include "vg_shader.h"
#include "vg_tex.h"
#include "vg_input.h"
#include "vg_opt.h"
/* Diagnostic */
-VG_STATIC struct vg_profile vg_prof_update = {.name="update()"},
+static struct vg_profile vg_prof_update = {.name="update()"},
vg_prof_render = {.name="render()"},
vg_prof_swap = {.name="swap"};
-VG_STATIC void vg_checkgl( const char *src_info )
+static void vg_checkgl( const char *src_info )
{
int fail = 0;
vg_fatal_error( "OpenGL Error" );
}
-VG_STATIC void async_vg_bake_shaders( void *payload, u32 size )
+static void async_vg_bake_shaders( void *payload, u32 size )
{
vg_shaders_compile();
}
-VG_STATIC void vg_bake_shaders(void)
+static void vg_bake_shaders(void)
{
vg_console_reg_cmd( "reload_shaders", vg_shaders_live_recompile, NULL );
vg_async_call( async_vg_bake_shaders, NULL, 0 );
SDL_AtomicUnlock( &vg.sl_status );
}
-VG_STATIC void _vg_load_full( void *data )
+static void _vg_load_full( void *data )
{
vg_preload();
/* internal */
+ vg_tex2d_replace_with_error( &vg.tex_missing );
vg_loader_step( vg_input_init, vg_input_free );
vg_loader_step( vg_lines_init, NULL );
+#ifndef VG_NO_AUDIO
vg_loader_step( vg_audio_init, vg_audio_free );
+#endif
vg_loader_step( vg_profiler_init, NULL );
vg_async_call( async_internal_complete, NULL, 0 );
/* client */
vg_load();
+
+ vg_success( "Client loaded in %fs\n", vg.time_real );
}
-VG_STATIC void _vg_process_events(void)
+static void _vg_process_events(void)
{
v2_zero( vg.mouse_wheel );
v2_zero( vg.mouse_delta );
SDL_Event event;
while( SDL_PollEvent( &event ) ){
if( event.type == SDL_KEYDOWN ){
- if( vg_console.enabled ){
+ 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 ){
+ event.key.keysym.scancode == SDL_SCANCODE_GRAVE ){
vg_console.enabled = 0;
ui_defocus_all();
}
}
}
else{
- if( event.key.keysym.sym == SDLK_BACKQUOTE ){
+ if( event.key.keysym.scancode == SDL_SCANCODE_GRAVE ){
vg_console.enabled = 1;
}
else {
vg.mouse_pos[1] += vg.mouse_delta[1];
}
-VG_STATIC void _vg_gameloop_update(void)
+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;
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 ){
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 );
}
-VG_STATIC void _vg_gameloop_render(void)
+static void _vg_gameloop_render(void)
{
vg_profile_begin( &vg_prof_render );
else vg_gui();
/* vg tools */
+#ifndef VG_NO_AUDIO
audio_debug_ui( vg.pv );
+#endif
/* profiling */
int frame_target = vg.display_refresh_rate;
vg.samples,
vg.fixed_iterations,
(vg.time_fixed_accumulator/VG_TIMESTEP_FIXED)*100.0f,
- vg.time, vg.time_delta, vg.time_rate,
+ vg.time_real, vg.time_delta, vg.time_rate,
vg.time_fixed_extrapolate, vg.time_frame_delta,
vg.time_spinning );
vg_profile_end( &vg_prof_render );
}
-VG_STATIC int vg_framefilter( double dt )
+static int vg_framefilter( double dt )
{
if( (vg.fps_limit <= 0) && (vg.vsync_feature != k_vsync_feature_error) ){
/* turn on vsync if not enabled */
return 0;
}
-VG_STATIC int _vg_crashscreen(void)
+static int _vg_crashscreen(void)
{
#if 0
if( vg_getkey( SDLK_ESCAPE ) )
glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_DST_ALPHA);
glBlendEquation(GL_FUNC_ADD);
- glClearColor( 0.15f + sinf(vg.time)*0.1f, 0.0f, 0.0f,1.0f );
+ glClearColor( 0.15f + sinf(vg.time_real)*0.1f, 0.0f, 0.0f,1.0f );
glClear( GL_COLOR_BUFFER_BIT );
glViewport( 0,0, vg.window_x, vg.window_y );
return 0;
}
-VG_STATIC void _vg_gameloop(void)
-{
+static void _vg_gameloop(void){
//vg.time_fixed_accumulator = 0.75f * (1.0f/60.0f);
vg.time_hp = SDL_GetPerformanceCounter();
double dt = (double)udt / (double)SDL_GetPerformanceFrequency();
vg.time_frame_delta += dt;
+ vg_run_async_checked();
if( vg_framefilter( dt ) )
continue;
enum engine_status status = _vg_engine_status();
+ vg.time_real += vg.time_frame_delta;
vg.time_delta = vg.time_frame_delta * vg.time_rate;
vg.time += vg.time_delta;
- vg_run_async_checked();
_vg_process_events();
if( vg.window_should_close )
}
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;
}
}
-VG_STATIC void _vg_process_launch_opts_internal( int argc, char *argv[] )
+static void _vg_process_launch_opts_internal( int argc, char *argv[] )
{
char *arg;
while( vg_argp( argc, argv ) ){
}
}
-VG_STATIC void _vg_init_window( const char *window_name )
+static void _vg_init_window( const char *window_name )
{
vg_info( "SDL_INIT\n" );
exit(0);
}
+#ifndef VG_NO_AUDIO
SDL_InitSubSystem( SDL_INIT_AUDIO );
+#endif
SDL_InitSubSystem( SDL_INIT_GAMECONTROLLER );
char *exe_basepath = SDL_GetBasePath();
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() );
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
#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,
#endif
}
-VG_STATIC void _vg_terminate(void)
+static void _vg_terminate(void)
{
/* Shutdown */
_vg_console_write_persistent();
exit(0);
}
-VG_STATIC void vg_enter( int argc, char *argv[], const char *window_name )
+static void vg_enter( int argc, char *argv[], const char *window_name )
{
vg_rand_seed( 461 );
_vg_process_launch_opts_internal( argc, argv );
_vg_terminate();
}
-VG_STATIC void vg_fatal_error( const char *fmt, ... )
+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();
#else /* VG_GAME */
#include "vg_log.h"
-VG_STATIC void vg_fatal_error( const char *fmt, ... )
+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);
}
u32 NvOptimusEnablement = 0x00000001;
int AmdPowerXpressRequestHighPerformance = 1;
+#include "vg_log.c"
+
#endif /* VG_HEADER_H */
projects / vg.git / blobdiff