auto detect aspect ratio of monitor, so that you don't have to know/use the cryptic...

SVN-Revision: 4976

diff --git a/src/gameconfig.cpp b/src/gameconfig.cpp
index 5e83724..eedc884 100644 (file)
--- a/src/gameconfig.cpp
+++ b/src/gameconfig.cpp
@@ -44,8 +44,7 @@ Config::Config()
 
   screenwidth = 800;
   screenheight = 600;
-  aspectwidth = 4;
-  aspectheight = 3;
+  aspect_ratio = -1;       // autodetect
 
   enable_script_debugger = false;
 }
@@ -72,8 +71,7 @@ Config::load()
     config_video_lisp->get("fullscreen", use_fullscreen);
     config_video_lisp->get("width", screenwidth);
     config_video_lisp->get("height", screenheight);
-    config_video_lisp->get("aspectwidth", aspectwidth);
-    config_video_lisp->get("aspectheight", aspectheight);
+    config_video_lisp->get("aspect_ratio", aspect_ratio);
   }
 
   const lisp::Lisp* config_audio_lisp = config_lisp->get_lisp("audio");
@@ -102,8 +100,7 @@ Config::save()
   writer.write_bool("fullscreen", use_fullscreen);
   writer.write_int("width", screenwidth);
   writer.write_int("height", screenheight);
-  writer.write_int("aspectwidth", aspectwidth);
-  writer.write_int("aspectheight", aspectheight);
+  writer.write_float("aspect_ratio", aspect_ratio);
   writer.end_list("video");
 
   writer.start_list("audio");

diff --git a/src/gameconfig.hpp b/src/gameconfig.hpp
index 86145e9..be406bd 100644 (file)
--- a/src/gameconfig.hpp
+++ b/src/gameconfig.hpp
@@ -36,8 +36,7 @@ public:
    */
   int screenwidth;
   int screenheight;
-  int aspectwidth;
-  int aspectheight;
+  float aspect_ratio;
 
   bool use_fullscreen;
   bool show_fps;

diff --git a/src/main.cpp b/src/main.cpp
index 3f43c6f..e616ffe 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -278,10 +278,16 @@ static bool parse_commandline(int argc, char** argv)
         print_usage(argv[0]);
         throw std::runtime_error("Need to specify a parameter for aspect switch");
       }
-      if(sscanf(argv[++i], "%d:%d", &config->aspectwidth, &config->aspectheight)
-         != 2) {
-        print_usage(argv[0]);
-        throw std::runtime_error("Invalid aspect spec, should be WIDTH:HEIGHT");
+      if(strcasecmp(argv[i], "auto") == 0) {
+        config->aspect_ratio = -1;
+      } else {
+        int aspect_width, aspect_height;
+        if(sscanf(argv[++i], "%d:%d", &aspect_width, &aspect_height) != 2) {
+          print_usage(argv[0]);
+          throw std::runtime_error("Invalid aspect spec, should be WIDTH:HEIGHT");
+        }
+        config->aspect_ratio = static_cast<double>(aspect_width) /
+                               static_cast<double>(aspect_height);
       }
     } else if(arg == "--show-fps") {
       config->show_fps = true;
@@ -350,9 +356,19 @@ static void init_rand()
 
 void init_video()
 {
+  static int desktop_width = 0;
+  static int desktop_height = 0;
+
   if(texture_manager != NULL)
     texture_manager->save_textures();
 
+  /* find which resolution the user normally uses */
+  if(desktop_width == 0) {
+    const SDL_VideoInfo *info = SDL_GetVideoInfo();
+    desktop_width  = info->current_w;
+    desktop_height = info->current_h;
+  }
+
   SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
   SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
   SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
@@ -388,14 +404,24 @@ void init_video()
   }
 #endif
 
-  // use aspect ratio to calculate logical resolution
-  if (config->aspectwidth > config->aspectheight) {
-       SCREEN_HEIGHT=600;
-       SCREEN_WIDTH=600*config->aspectwidth/config->aspectheight;
+  double aspect_ratio = config->aspect_ratio;
+
+  // try to guess aspect ratio of monitor if needed
+  if (aspect_ratio <= 0) {
+    if(desktop_width > 0) {
+      aspect_ratio = static_cast<double>(desktop_width) / static_cast<double>(desktop_height);
+    } else {
+      aspect_ratio = 4.0 / 3.0;
+    }
   }
-  else {
-       SCREEN_WIDTH=600;
-       SCREEN_HEIGHT=600*config->aspectheight/config->aspectwidth;
+
+  // use aspect ratio to calculate logical resolution
+  if (aspect_ratio > 1) {
+       SCREEN_WIDTH  = static_cast<int> (600 * aspect_ratio);
+       SCREEN_HEIGHT = 600;
+  } else {
+       SCREEN_WIDTH  = 600;
+       SCREEN_HEIGHT = static_cast<int> (600 * 1/aspect_ratio);
   }
 
   // setup opengl state and transform