diagonal

[vg.git] / vg.h

diff --git a/vg.h b/vg.h
index 9ad04b1f659ca600fc9529fcd3399ef9f9dfea0b..ecb75505d6ec9985cde486a6a0516a99d61b6303 100644 (file)
--- a/vg.h
+++ b/vg.h
@@ -200,6 +200,8 @@ struct vg
       k_quality_profile_low = 1,
    }
    quality_profile;
+
+   float loader_ring;
 }
 VG_STATIC vg = { .time_rate = 1.0 };
 
@@ -282,9 +284,7 @@ VG_STATIC void async_vg_bake_shaders( void *payload, u32 size )
 VG_STATIC void vg_bake_shaders(void)
 {
    vg_console_reg_cmd( "reload_shaders", vg_shaders_live_recompile, NULL );
-
-   vg_async_item *call = vg_async_alloc(0);
-   vg_async_dispatch( call, async_vg_bake_shaders );
+   vg_async_call( async_vg_bake_shaders, NULL, 0 );
 }
 
 void async_internal_complete( void *payload, u32 size )
@@ -313,8 +313,7 @@ VG_STATIC void _vg_load_full(void)
    vg_loader_step( vg_audio_init, vg_audio_free );
    vg_loader_step( vg_profiler_init, NULL );
 
-   vg_async_item *test_async = vg_async_alloc( 0 );
-   vg_async_dispatch( test_async, async_internal_complete );
+   vg_async_call( async_internal_complete, NULL, 0 );
 
    /* client */
    vg_load();
@@ -325,6 +324,9 @@ VG_STATIC void _vg_process_events(void)
    v2_zero( vg.mouse_wheel );
    v2_zero( vg.mouse_delta );
 
+   /* Update input */
+   vg_process_inputs();
+
    /* SDL event loop */
    SDL_Event event;
    while( SDL_PollEvent( &event ) ){
@@ -335,12 +337,14 @@ VG_STATIC void _vg_process_events(void)
          vg.mouse_wheel[0] += event.wheel.preciseX;
          vg.mouse_wheel[1] += event.wheel.preciseY;
       }
+      else if( event.type == SDL_CONTROLLERDEVICEADDED ||
+               event.type == SDL_CONTROLLERDEVICEREMOVED )
+      {
+         vg_input_device_event( &event );
+      }
       else if( event.type == SDL_CONTROLLERAXISMOTION ||
                event.type == SDL_CONTROLLERBUTTONDOWN ||
-               event.type == SDL_CONTROLLERBUTTONUP ||
-               event.type == SDL_CONTROLLERDEVICEADDED ||
-               event.type == SDL_CONTROLLERDEVICEREMOVED
-               )
+               event.type == SDL_CONTROLLERBUTTONUP )
       {
          vg_input_controller_event( &event );
       }
@@ -375,9 +379,6 @@ VG_STATIC void _vg_process_events(void)
 
    vg.mouse_pos[0] += vg.mouse_delta[0];
    vg.mouse_pos[1] += vg.mouse_delta[1];
-
-   /* Update input */
-   vg_update_inputs();
 }
 
 VG_STATIC void _vg_gameloop_update(void)
@@ -549,11 +550,10 @@ VG_STATIC int vg_framefilter( double dt )
 
 VG_STATIC int _vg_crashscreen(void)
 {
-   if( vg.window_should_close )
-      return 1;
-
+#if 0
    if( vg_getkey( SDLK_ESCAPE ) )
       return 1;
+#endif
 
    glBindFramebuffer( GL_FRAMEBUFFER, 0 );
    glEnable(GL_BLEND);
@@ -597,20 +597,20 @@ VG_STATIC void _vg_gameloop(void)
 
       enum engine_status status = _vg_engine_status();
 
+      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 )
+         break;
+         
       if( status == k_engine_status_crashed ){
          if( _vg_crashscreen() )
             break;
       }
       else{
-         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 )
-            break;
-         
          if( status == k_engine_status_running ){
             _vg_gameloop_update();
             _vg_gameloop_render();
@@ -620,6 +620,11 @@ 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.time_frame_delta = 0.0;
       vg.time_spinning = 0;
    }