compiler options

[vg.git] / vg.h

diff --git a/vg.h b/vg.h
index 5cae23e045981fc934f9083a3e6018c4cd4655fc..a89efaf7569fc2f19d5ed55f999f7a6245079b21 100644 (file)
--- 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)
@@ -67,7 +67,9 @@
     #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
@@ -89,9 +91,9 @@ 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_gui(void);
@@ -141,6 +143,7 @@ struct vg{
 
    /* Runtime */
    double time,
+          time_real,
           time_delta,
           time_rate,
 
@@ -227,7 +230,9 @@ VG_STATIC void vg_checkgl( const char *src_info );
 
 #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"
@@ -289,7 +294,9 @@ VG_STATIC void _vg_load_full( void *data )
    /* internal */
    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 );
@@ -313,7 +320,7 @@ VG_STATIC void _vg_process_events(void)
          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();
             }
@@ -330,7 +337,7 @@ VG_STATIC void _vg_process_events(void)
             }
          }
          else{
-            if( event.key.keysym.sym == SDLK_BACKQUOTE ){
+            if( event.key.keysym.scancode == SDL_SCANCODE_GRAVE ){
                vg_console.enabled = 1;
             }
             else {
@@ -391,7 +398,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;
@@ -401,11 +408,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 ){
@@ -416,7 +421,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 );
 }
 
@@ -442,7 +447,9 @@ VG_STATIC void _vg_gameloop_render(void)
       else vg_gui();
 
       /* vg tools */
+#ifndef VG_NO_AUDIO
       audio_debug_ui( vg.pv );
+#endif
 
                /* profiling */
       int frame_target = vg.display_refresh_rate;
@@ -468,7 +475,7 @@ VG_STATIC void _vg_gameloop_render(void)
                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 );
 
@@ -559,7 +566,7 @@ VG_STATIC int _vg_crashscreen(void)
    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 );
 
@@ -594,6 +601,7 @@ VG_STATIC void _vg_gameloop(void){
 
       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;
 
@@ -664,7 +672,9 @@ VG_STATIC void _vg_init_window( const char *window_name )
       exit(0);
    }
 
+#ifndef VG_NO_AUDIO
    SDL_InitSubSystem( SDL_INIT_AUDIO );
+#endif
    SDL_InitSubSystem( SDL_INIT_GAMECONTROLLER );
 
    char *exe_basepath = SDL_GetBasePath();