OVR: Multisampling Anitaliasing (MSAA) with real mirror view.

[mercenary-reloaded.git] / src / mercenary / main.c

diff --git a/src/mercenary/main.c b/src/mercenary/main.c
index 526dd06..2b4a8a0 100644 (file)
--- a/src/mercenary/main.c
+++ b/src/mercenary/main.c
@@ -56,7 +56,7 @@ static int config_video_filter = 1;
 static int config_audio_filter = 1;
 static int config_render = 1; /* opengl render */
 static int config_skip_intro = 0;
-static int config_multisampling = 16;
+static int config_multisampling = 8;
 static double config_fov = FOV_NOVAGEN;
 static double config_monitor_distance = 31.5; /* inch */
 static double config_benson_size = 1.0;
@@ -94,7 +94,7 @@ static uint8_t *info_osd = NULL;
 static int help_view = 1;
 static int32_t osd_timer = 0;
 #ifdef HAVE_OVR
-#define SCREEN_WIDTH   672
+#define SCREEN_WIDTH   1344
 #define SCREEN_HEIGHT  800
 #else
 #define SCREEN_WIDTH   (320*3)
@@ -1009,19 +1009,21 @@ int main(int argc, char *argv[])
 #ifdef HAVE_OVR
        int vbl_sync = 0;
        int rift = 1;
+       int multisampling = 0;
        window_width = SCREEN_WIDTH;
        window_height = SCREEN_HEIGHT;
 #else
        int vbl_sync = 1;
        int rift = 0;
+       int multisampling = config_multisampling;
        window_width = (config_debug_opengl) ? SCREEN_WIDTH / 3 * 2 : SCREEN_WIDTH;
        window_height = (config_debug_opengl) ? SCREEN_HEIGHT / 3 * 4 : SCREEN_HEIGHT;
 #endif
-       rc = init_sdl(argv[0], window_width, window_height, SOUND_SAMPLERATE, sdl_sound_chunk, keyboard_sdl, audio_sdl, resize_window, config_multisampling, vbl_sync, rift);
+       rc = init_sdl(argv[0], window_width, window_height, SOUND_SAMPLERATE, sdl_sound_chunk, keyboard_sdl, audio_sdl, resize_window, multisampling, vbl_sync, rift);
        if (rc < 0)
                goto done;
 #ifdef HAVE_OVR
-       rc = init_ovr();
+       rc = init_ovr(config_multisampling);
        if (rc < 0)
                goto done;
 #endif