autores

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@16 47cf9a05-e0a8-4ed5-9e9b-101a649bc004

diff --git a/Haptic Metronome/Haptic Metronome/Haptic Metronome.vcxproj b/Haptic Metronome/Haptic Metronome/Haptic Metronome.vcxproj
index 81f38c5e10df3536c1b91c15ab261d6e3e9cb4cd..0161ee4bd7e8bb099f35e7c05ac24c6723e2c64b 100644 (file)
--- a/Haptic Metronome/Haptic Metronome/Haptic Metronome.vcxproj
+++ b/Haptic Metronome/Haptic Metronome/Haptic Metronome.vcxproj
@@ -37,10 +37,10 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <IncludePath>..\..\include;$(IncludePath)</IncludePath>\r
+    <IncludePath>..\..\include;..\..\lib\include;$(IncludePath)</IncludePath>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <LibraryPath>$(LibraryPath)</LibraryPath>\r
+    <LibraryPath>..\..\lib\lib;$(LibraryPath)</LibraryPath>\r
     <SourcePath>../../src;../../include;$(SourcePath)</SourcePath>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r

diff --git a/src/PaintGame.cpp b/src/PaintGame.cpp
index bec53683e054bcb3af84640a9115a621ba6da055..b0763daf0ccbe7a86ca11b65a5dbfdf4dddb26e1 100644 (file)
--- a/src/PaintGame.cpp
+++ b/src/PaintGame.cpp
@@ -59,7 +59,7 @@ void init()
 
        //   int width, height;
        // we search for the available screen sizes
-       int searchflags = SDL_HWSURFACE;// | SDL_FULLSCREEN;
+       int searchflags = SDL_HWSURFACE | SDL_FULLSCREEN;
        SDL_Rect **modes = SDL_ListModes(NULL, searchflags);
        if (modes == NULL)
                throw "Impossible to get the screen resolution !";
@@ -76,7 +76,8 @@ void init()
                for (i=0 ; modes[i] ; i++)
                {
                        cout << "Resolution available: " << modes[i]->w << "x" << modes[i]->h << endl;
-                       if (modes[i]->w== 1600 && modes[i]->h == 900) //> resolution_x)//
+                       //if (modes[i]->w== 1600 && modes[i]->h == 900) //> resolution_x)//
+                       if (modes[i]->w * modes[i]->h > resolution_x * resolution_x)
                        {
                                resolution_x = modes[i]->w;
                                resolution_y = modes[i]->h;
@@ -142,10 +143,10 @@ void init()
   int flags = SDL_OPENGL | SDL_FULLSCREEN;
   SDL_Surface * screen;
 //  if (!(screen = SDL_SetVideoMode(resolution_x, resolution_y, 0, flags)))
-  if (!(screen = SDL_SetVideoMode(0, 0, 0, flags)))
+  if (!(screen = SDL_SetVideoMode(resolution_x, resolution_y, 0, flags)))
     throw "Impossible to change the video mode";
-  resolution_x = 1600;
-  resolution_y = 900;
+//  resolution_x = 1600;
+//  resolution_y = 900;
 
   GLdouble ratio = (GLdouble) screen->w / screen->h;