option to force audio compression

[vg.git] / vg.h

diff --git a/vg.h b/vg.h
index a89efaf7569fc2f19d5ed55f999f7a6245079b21..9f7ebe89f48efaca5200b57ca65a1820570efe42 100644 (file)
--- a/vg.h
+++ b/vg.h
@@ -80,23 +80,23 @@
   #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_pre_update(void);
-VG_STATIC void vg_fixed_update(void);
-VG_STATIC void vg_post_update(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 */
@@ -173,8 +173,9 @@ struct vg{
    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;
 }
@@ -188,7 +189,7 @@ enum vg_thread_purpose
 
 #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;
@@ -197,7 +198,7 @@ VG_STATIC enum engine_status _vg_engine_status(void)
    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 );
 
@@ -211,7 +212,7 @@ VG_STATIC enum vg_thread_purpose vg_thread_purpose(void)
    }
 }
 
-VG_STATIC void vg_assert_thread( enum vg_thread_purpose required ){
+static void vg_assert_thread( enum vg_thread_purpose required ){
    enum vg_thread_purpose purpose = vg_thread_purpose();
 
    if( purpose != required ){
@@ -219,12 +220,12 @@ VG_STATIC void vg_assert_thread( enum vg_thread_purpose required ){
    }
 }
 
-VG_STATIC void _vg_opengl_sync_init(void)
+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__) )
 
@@ -242,11 +243,11 @@ VG_STATIC void vg_checkgl( const char *src_info );
 #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;
 
@@ -260,12 +261,12 @@ VG_STATIC void vg_checkgl( const char *src_info )
       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 );
@@ -287,11 +288,12 @@ void async_internal_complete( void *payload, u32 size )
    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
@@ -303,9 +305,11 @@ VG_STATIC void _vg_load_full( void *data )
 
    /* 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 );
@@ -393,7 +397,7 @@ VG_STATIC void _vg_process_events(void)
    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 );
 
@@ -425,7 +429,7 @@ VG_STATIC void _vg_gameloop_update(void)
    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 );
 
@@ -487,7 +491,7 @@ VG_STATIC void _vg_gameloop_render(void)
    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 */
@@ -553,7 +557,7 @@ VG_STATIC int vg_framefilter( double dt )
    return 0;
 }
 
-VG_STATIC int _vg_crashscreen(void)
+static int _vg_crashscreen(void)
 {
 #if 0
    if( vg_getkey( SDLK_ESCAPE ) )
@@ -575,7 +579,7 @@ VG_STATIC int _vg_crashscreen(void)
    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();
@@ -591,6 +595,7 @@ VG_STATIC void _vg_gameloop(void){
       double dt = (double)udt / (double)SDL_GetPerformanceFrequency();
 
       vg.time_frame_delta += dt;
+      vg_run_async_checked();
 
       if( vg_framefilter( dt ) )
          continue;
@@ -605,7 +610,6 @@ VG_STATIC void _vg_gameloop(void){
       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 )
@@ -635,7 +639,7 @@ VG_STATIC void _vg_gameloop(void){
    }
 }
 
-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 ) ){
@@ -663,7 +667,7 @@ VG_STATIC void _vg_process_launch_opts_internal( int argc, char *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" );
 
@@ -816,7 +820,7 @@ VG_STATIC void _vg_init_window( const char *window_name )
 #endif
 }
 
-VG_STATIC void _vg_terminate(void)
+static void _vg_terminate(void)
 {
    /* Shutdown */
    _vg_console_write_persistent();
@@ -834,7 +838,7 @@ VG_STATIC void _vg_terminate(void)
    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 );
@@ -863,7 +867,7 @@ VG_STATIC void vg_enter( int argc, char *argv[], const char *window_name )
    _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 );
@@ -888,7 +892,7 @@ VG_STATIC void vg_fatal_error( const char *fmt, ... )
 #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 );