remove devwindow

[vg.git] / vg.h

diff --git a/vg.h b/vg.h
index 919f6f3b878049b68f55afb749eddf904d7c37c1..2f6f340ac31d82078d02f53144f39f8e09437b8f 100644 (file)
--- a/vg.h
+++ b/vg.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021-2023 Harry Godden (hgn) - All Rights Reserved */
+/* Copyright (C) 2021-2024 Mt.Zero Software - All Rights Reserved */
 
 /*
  
@@ -42,7 +42,12 @@
 |IMP| |   vg_render(void)
 |   | |      |
 |   | |      v
-|IMP| |   vg_ui(void)
+|IMP| |   vg_gui(void)
+|   | |      |
+|   | |      v
+|IMP| |   vg_game_settings_init(void)
+|IMP| |   vg_game_settings_gui( ui_rect panel ) 
+|   | |      |     (optional: #define VG_GAME_SETTINGS)
 |   | |      |
 |   |  '----'
 '___'
@@ -758,10 +763,10 @@ static void _vg_init_window( const char *window_name )
    vg.window_x = video_mode.w;
    vg.window_y = video_mode.h;
 
-#ifdef VG_DEVWINDOW
-   vg.window_x = 1280;
-   vg.window_y = 720;
-#endif
+   if( vg.screen_mode == 2 ){
+      vg.window_x = 1280;
+      vg.window_y = 720;
+   }
 
 #ifndef _WIN32
        SDL_SetHint( "SDL_VIDEO_X11_XINERAMA", "1" );
@@ -769,36 +774,21 @@ static void _vg_init_window( const char *window_name )
        SDL_SetHint( "SDL_VIDEO_X11_XVIDMODE", "0" );
 #endif
 
-   vg_info( "CreateWindow( %d %d @%dhz )\n", vg.window_x, vg.window_y,
-                                             vg.display_refresh_rate );
+   u32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_INPUT_GRABBED |
+               SDL_WINDOW_RESIZABLE;
 
-   /* TODO: Allow selecting closest video mode from launch opts */
-   if((vg.window = SDL_CreateWindow( window_name,
+   if( vg.screen_mode == 1 )
+      flags |= SDL_WINDOW_FULLSCREEN;
+   else if( vg.screen_mode == 0 )
+      flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
 
-#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 );
-      vg.screen_mode = 2;
-   }
-#else
-                                     0, 0,
-                                     vg.window_x, vg.window_y,
-
-                                     SDL_WINDOW_FULLSCREEN_DESKTOP | 
-                                     SDL_WINDOW_OPENGL |
-                                     SDL_WINDOW_INPUT_GRABBED |
-                                     SDL_WINDOW_RESIZABLE
-                                     )))
-   {
-      if( SDL_SetWindowDisplayMode( vg.window, &video_mode ) ){
-         vg_error( "SDL_SetWindowDisplayMode failed: %s", SDL_GetError() );
-         SDL_Quit();
-         exit(0);
-      }
+   vg_info( "CreateWindow( %d %d %u )\n", vg.window_x, vg.window_y, flags );
+
+   if((vg.window = SDL_CreateWindow( window_name, 0, 0, 
+                                     vg.window_x, vg.window_y, flags ))){
+      if( vg.screen_mode == 2 )
+         SDL_SetWindowPosition( vg.window, video_mode.w-vg.window_x, 0 );
    }
-#endif
    else{
       vg_error( "SDL_CreateWindow failed: %s", SDL_GetError() );
       exit(0);
@@ -850,12 +840,7 @@ static void _vg_init_window( const char *window_name )
    }
 
    vg_info( "Display refresh rate: %d\n", dispmode.refresh_rate );
-   vg.fps_limit = vg.display_refresh_rate;
-
-#if defined(_WIN32) || defined(VG_DEVWINDOW)
-#else
-   //vg.vsync = 1;
-#endif
+   if( !vg.fps_limit) vg.fps_limit = vg.display_refresh_rate;
 }
 
 static void _vg_terminate(void)
@@ -884,8 +869,17 @@ static void vg_enter( int argc, char *argv[], const char *window_name ){
    vg_alloc_quota();
    _vg_console_init();
    
-   vg_console_reg_var( "fps_limit", &vg.fps_limit, k_var_dtype_i32, 0 );
-   vg_console_reg_var( "vsync", &vg.vsync, k_var_dtype_i32, VG_VAR_PERSISTENT );
+   vg_console_reg_var( "vg_fps_limit", &vg.fps_limit, 
+                        k_var_dtype_i32, VG_VAR_PERSISTENT );
+   vg_console_reg_var( "vg_vsync", &vg.vsync, 
+                        k_var_dtype_i32, VG_VAR_PERSISTENT );
+   vg_console_reg_var( "vg_quality", &vg.quality_profile, 
+                        k_var_dtype_i32, VG_VAR_PERSISTENT );
+   vg_console_reg_var( "vg_screen_mode", &vg.screen_mode,
+                        k_var_dtype_i32, VG_VAR_PERSISTENT );
+   vg_audio_register();
+   vg_console_load_autos();
+
    vg_console_reg_cmd( "vg_settings", cmd_vg_settings_toggle, NULL );
    _vg_init_window( window_name );