textbox start

[vg.git] / vg.h

diff --git a/vg.h b/vg.h
index 2eb8e7a4e7bd2a7c39110e60980a7a6cf1dfa291..0be8031aec1d230718ef78a2cb3e9add81797c5a 100644 (file)
--- a/vg.h
+++ b/vg.h
@@ -122,7 +122,7 @@ VG_STATIC void vg_update_fixed(void);
 VG_STATIC void vg_update_post(void);
 
 VG_STATIC void vg_render(void);
-VG_STATIC void vg_ui(void);
+VG_STATIC void vg_gui(void);
 
 struct vg
 {
@@ -253,6 +253,7 @@ VG_STATIC void vg_checkgl( const char *src_info );
 #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"
@@ -324,6 +325,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 ) ){
@@ -376,9 +380,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_process_inputs();
 }
 
 VG_STATIC void _vg_gameloop_update(void)
@@ -426,6 +427,10 @@ VG_STATIC void _vg_gameloop_render(void)
    /* ui */
    vg.engine_stage = k_engine_stage_ui;
    {
+      ui_prerender();
+      vg_gui();
+      ui_postrender();
+#if 0
       ui_begin( vg.window_x, vg.window_y );
 
       /* TODO */
@@ -472,11 +477,12 @@ VG_STATIC void _vg_gameloop_render(void)
 
       /* FIXME */
       audio_debug_ui( vg.pv );
-      vg_ui();
+      vg_gui();
       _vg_console_draw();
       
       ui_resolve();
       ui_draw( NULL );
+#endif
    }
 
    vg_profile_end( &vg_prof_render );
@@ -724,7 +730,7 @@ 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_WINDOW_BORDERLESS|SDL_WINDOW_OPENGL
       ))){}
 #else
                                      0, 0,
@@ -829,7 +835,10 @@ VG_STATIC void vg_enter( int argc, char *argv[], const char *window_name )
 
    vg_async_init();
    
+#ifndef VG_DEVWINDOW
    SDL_SetRelativeMouseMode(1);
+#endif
+
    vg.thread_id_main = SDL_GetThreadID(NULL);
    
    /* Opengl-required systems */