BAD one

[vg.git] / vg.h

diff --git a/vg.h b/vg.h
index 62651c0277e9a249d6364d5fbdf760db61c6383b..0e9e3e55fe1022fa1123a6dc8dd8f2d56b504c4f 100644 (file)
--- a/vg.h
+++ b/vg.h
@@ -52,41 +52,14 @@
 #ifndef VG_HEADER_H
   #define VG_HEADER_H
 
+  const char *vg_get_basepath(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 "submodules/SDL/include/SDL.h"
+    #include "dep/sdl/include/SDL.h"
     #include "vg_stdint.h"
     
     void vg_register_exit( void( *funcptr )(void), const char *name );
@@ -95,7 +68,6 @@ VG_STATIC void vg_print_backtrace(void)
     #include "vg_io.h"
     #include "vg_log.h"
     #include "vg_steam.h"
-    #include <setjmp.h>
 
   //#define VG_SYNC_DEBUG
   #ifdef VG_SYNC_DEBUG
@@ -200,6 +172,9 @@ struct vg{
    float loader_ring;
 }
 VG_STATIC vg = { .time_rate = 1.0 };
+const char *vg_get_basepath(void){
+   return vg.base_path;
+}
 
 enum vg_thread_purpose
 {
@@ -233,6 +208,14 @@ VG_STATIC enum vg_thread_purpose vg_thread_purpose(void)
    }
 }
 
+VG_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 );
+   }
+}
+
 VG_STATIC void _vg_opengl_sync_init(void)
 {
    vg.sem_loader = SDL_CreateSemaphore(1);
@@ -248,7 +231,6 @@ VG_STATIC void vg_checkgl( const char *src_info );
 #include "vg_shader.h"
 #include "vg_tex.h"
 #include "vg_input.h"
-#include "vg_ui.h"
 #include "vg_imgui.h"
 #include "vg_lines.h"
 #include "vg_loader.h"
@@ -328,7 +310,8 @@ VG_STATIC void _vg_process_events(void)
    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 ){
                vg_console.enabled = 0;
@@ -458,26 +441,18 @@ VG_STATIC void _vg_gameloop_render(void)
       }
       else vg_gui();
 
-      ui_postrender();
-#if 0
-      ui_begin( vg.window_x, vg.window_y );
-
-      /* TODO */
-      ui_set_mouse( vg.mouse_pos[0], vg.mouse_pos[1], 0 );
+      /* vg tools */
+      audio_debug_ui( vg.pv );
 
+               /* profiling */
       int frame_target = vg.display_refresh_rate;
-
-      if( vg.fps_limit > 0 ){
-         frame_target = vg.fps_limit;
-      }
-      
+      if( vg.fps_limit > 0 ) frame_target = vg.fps_limit;
       vg_profile_drawn( 
             (struct vg_profile *[]){
                &vg_prof_update,&vg_prof_render,&vg_prof_swap}, 3,
             (1.0f/(float)frame_target)*1000.0f, 
             (ui_rect){ 4, 4, 250, 0 }, 0
       );
-
       if( vg_profiler ){
          char perf[256];
          
@@ -487,11 +462,7 @@ VG_STATIC void _vg_gameloop_render(void)
                "samples: %d\n"
                "iterations: %d (acc: %.3fms%%)\n"
                "time: real(%.2f) delta(%.2f) rate(%.2f)\n"
-#ifdef _WIN32
-               "      extrap(%.2f) frame(%.2f) spin( %llu )\n",
-#else
-               "      extrap(%.2f) frame(%.2f) spin( %lu )\n",
-#endif
+               "      extrap(%.2f) frame(%.2f) spin( "PRINTF_U64" )\n",
                vg.window_x, vg.window_y, 
                frame_target, (1.0f/(float)frame_target)*1000.0f,
                vg.samples, 
@@ -501,16 +472,9 @@ VG_STATIC void _vg_gameloop_render(void)
                vg.time_fixed_extrapolate, vg.time_frame_delta,
                vg.time_spinning );
 
-         ui_text( (ui_rect){258, 4+24+12+12,0,0},perf, 1,0);
+         ui_text( (ui_rect){258, 4+24+12+12,900,900},perf,1,0,k_ui_align_left);
       }
-
-      /* FIXME */
-      audio_debug_ui( vg.pv );
-      vg_gui();
-      
-      ui_resolve();
-      ui_draw( NULL );
-#endif
+      ui_postrender();
    }
 
    vg_profile_end( &vg_prof_render );
@@ -736,11 +700,6 @@ VG_STATIC void _vg_init_window( const char *window_name )
        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() );
@@ -751,6 +710,10 @@ VG_STATIC void _vg_init_window( const char *window_name )
    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
@@ -768,7 +731,9 @@ 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_SetWindowPosition( vg.window, video_mode.w-vg.window_x, 0 );
+   }
 #else
                                      0, 0,
                                      vg.window_x, vg.window_y,
@@ -893,7 +858,7 @@ VG_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();
@@ -918,7 +883,7 @@ VG_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);
 }
@@ -931,4 +896,6 @@ VG_STATIC void vg_fatal_error( const char *fmt, ... )
 u32 NvOptimusEnablement = 0x00000001;
 int AmdPowerXpressRequestHighPerformance = 1;
 
+#include "vg_log.c"
+
 #endif /* VG_HEADER_H */