#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "../libsdl/sdl.h"
+#ifdef HAVE_OVR
+#include "../libovr/ovr.h"
+#endif
#include "../libsdl/opengl.h"
#include "../libsdl/print.h"
#include "../libcpu/m68k.h"
#define FOV_MAX 170.0
static int config_ctrl_c = 0;
-static int config_amiga_speed = 1;
-#warning fixme: make use of 10 for intro, then be as fast as given
+static int config_amiga_speed = 0; /* fast speed */
static double config_fps = 16.0;
+#if !defined(_WIN32)
static const char *config_gamesave_dir = ".mercenary";
+#endif
static int config_video_filter = 1;
static int config_audio_filter = 1;
-static int config_render = 0;
+static int config_render = 1; /* opengl render */
static int config_skip_intro = 0;
static int config_multisampling = 16;
static double config_fov = FOV_NOVAGEN;
+static double config_monitor_distance = 31.5; /* inch */
static double config_benson_size = 1.0;
static int config_debug_transparent = 0;
static int config_debug_opengl = 0;
static uint8_t *info_osd = NULL;
static int help_view = 1;
static int32_t osd_timer = 0;
-#define SCREEN_WIDTH 320
-#define SCREEN_HEIGHT 200
+#ifdef HAVE_OVR
+#define SCREEN_WIDTH 800
+#define SCREEN_HEIGHT 800
+#else
+#define SCREEN_WIDTH (320*3)
+#define SCREEN_HEIGHT (200*3)
+#endif
#define IMAGE_WIDTH 320
#define IMAGE_HEIGHT 200
#define BENSON_AT_LINE 136
{
double frame_step, frame_time = 0.0, frame_render = 1;
int had_first_irq = 0;
- int render_improved_rc;
static uint32_t current_time, last_time = 0, diff;
int i, rc;
int space, length;
double render_delay = 0.0;
uint32_t palette_address;
uint16_t palette[16];
+ int eye;
- last_time = SDL_GetTicks();
+ last_time = ticks_sdl();
/* render result on window */
while (!quit) {
-#warning oder ganz anders: bevor landung machen wir amiga-rate als interpolation
/* if we are in interstellar fligt, we use 50 Hz */
/* if we are approaching to Eris Space Port, we use 10 Hz */
/* else we use whatever frame rate the user wants */
if (render_capture_is_interstellar())
frame_step = vbl_duration * 50.0;
+ else if (!intro_skipped)
+ frame_step = vbl_duration * 10.0;
else
frame_step = vbl_duration * config_fps;
if (frame_step > 1.0)
if (rc)
break;
- /* clear screen */
- opengl_clear();
-
/* initialize rendering */
debug_opengl = config_debug_opengl;
benson_size = config_benson_size;
/* be sure to clean all capture history, so we don't get glichtes when turning on improved rendering again */
render_capture_reset();
}
- if (render_improved)
- opengl_viewport_improved(debug_opengl, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, config_fov, benson_size);
/* STEP 1: let the CPU render/process the game, also improve rendering via OpenGL, if enabled */
/* amgia speed: don't render if we still delay */
/* non amiga speed: render if we need a new frame */
if (config_amiga_speed)
render_delay += (double)cycle_count / CPU_SPEED;
}
- /* render improved graphics, interpolate, if required */
- if (render_improved)
- render_improved_rc = render_all_items((config_amiga_speed) ? 1.0 : frame_time);
- else
- render_improved_rc = -1;
+
+ /* STEP 2: transfer legacy image (or just benson) in memory to OpenGL texture */
+#ifdef HAVE_OVR
+ begin_render_ovr();
+ for (eye = 0; eye < 2; eye++) {
+ /* viewport and frustum is set here */
+ begin_render_ovr_eye(eye);
+#else
+ eye = 0;
+ {
+#endif
+ /* clear screen */
+#ifdef HAVE_OVR
+ opengl_clear(1);
+#else
+ opengl_clear(0);
+#endif
+ /* render benson + osd ontop of improved opengl rendering, if enabled */
+ if (render_improved) {
+#ifndef HAVE_OVR
+ /* viewport and frustum is set here */
+ opengl_viewport((debug_opengl) ? 2 : 0, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, config_fov, benson_size);
+#endif
+ /* render improved graphics, interpolate, if required,
+ * if no item list is available, for legacy rendering
+ */
+#ifdef HAVE_OVR
+ rc = render_all_items((config_amiga_speed) ? 1.0 : frame_time, 1);
+#else
+ rc = render_all_items((config_amiga_speed) ? 1.0 : frame_time, 0);
+#endif
+ if (rc)
+ goto goto_legacy;
+ opengl_blit_image(image, config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, 1, config_fov, config_monitor_distance, benson_size);
+ if (help_view)
+ opengl_blit_osd(0, help_osd, config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, config_fov, config_monitor_distance, benson_size, 1.0, 1.0, 0.0, 0.0);
+ if (osd_timer) {
+ opengl_blit_osd(1, info_osd, config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, config_fov, config_monitor_distance, benson_size, 0.5, 0.04, 0.5, -0.95);
+ if (osd_timer - (int32_t)ticks_sdl() < 0)
+ osd_timer = 0;
+ }
+ }
+ /* setup viewport for legacy image and render image, if enabled */
+ /* also render legacy, if render_improved failed due to not (yet) available items */
+ if (render_legacy) {
+ goto_legacy:
+ /* render game view without benson
+ * because benson is not updated before VBL IRQ, we don't want old image from double buffer
+ */
+ if (had_first_irq)
+ emul_video(image, memory, palette, IMAGE_WIDTH, IMAGE_HEIGHT, IMAGE_DIWSTART, chipreg, 0, BENSON_AT_LINE, double_pixel_size);
+#ifndef HAVE_OVR
+ /* viewport and frustum is set here */
+ opengl_viewport((debug_opengl) ? 1 : 0, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, config_fov, 1.0);
+#endif
+ opengl_blit_image(image, config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, 0, config_fov, config_monitor_distance, 1.0);
+ if (help_view)
+ opengl_blit_osd(0, help_osd, config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, config_fov, config_monitor_distance, 1.0, 1.0, 1.0, 0.0, 0.0);
+ if (osd_timer) {
+ opengl_blit_osd(1, info_osd, config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, config_fov, config_monitor_distance, 1.0, 0.5, 0.04, 0.5, -0.95);
+ if (osd_timer - (int32_t)ticks_sdl() < 0)
+ osd_timer = 0;
+ }
+ }
+#ifdef HAVE_OVR
+ end_render_ovr_eye(eye);
+ }
+ /* at this point we are ready with our image, so we display */
+ end_render_ovr();
+ render_mirror_ovr(SCREEN_WIDTH, SCREEN_HEIGHT);
+#else
+ }
+#endif
+ swap_sdl();
+
/* advance frame time, if we are not in help view */
if (!(had_first_irq && help_view)) {
-//printf("frame rate: %.6f, frame-step=%.5f frame-time=%.5f\n", 1.0 / vbl_duration, frame_step,frame_time);
frame_time += frame_step;
if (frame_time >= 1.0) {
frame_time -= 1.0;
}
}
- /* STEP 2: transfer legacy image (or just benson) in memory to OpenGL texture */
- if (had_first_irq) {
- /* render game view without benson
- * because benson is not updated before VBL IRQ, we don't want old image from double buffer
- */
- if (render_legacy || render_improved_rc)
- emul_video(image, memory, palette, IMAGE_WIDTH, IMAGE_HEIGHT, IMAGE_DIWSTART, chipreg, 0, BENSON_AT_LINE, double_pixel_size);
- }
- /* render benson + osd ontop of improved opengl rendering, if enabled */
- if (render_improved && render_improved_rc == 0) {
- opengl_blit_benson(image, config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, config_fov, benson_size, (double_pixel_size) ? 2 : 1);
- if (help_view)
- opengl_blit_osd(0, help_osd, config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, config_fov, benson_size, 1.0, 1.0, 0.0, 0.0);
- if (osd_timer) {
- opengl_blit_osd(1, info_osd, config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, config_fov, benson_size, 0.5, 0.04, 0.5, -0.95);
- if (osd_timer - (int32_t)SDL_GetTicks() < 0)
- osd_timer = 0;
- }
- }
- /* setup viewport for legacy image and render image, if enabled */
- /* also render legacy, if render_improved failed due to not (yet) available items */
- if (render_legacy || (render_improved && render_improved_rc)) {
- opengl_viewport_legacy(debug_opengl);
- opengl_blit_legacy(image, config_video_filter);
- if (help_view)
- opengl_blit_osd(0, help_osd, config_video_filter, 0, 0.0, 0, 1.0, 1.0, 0.0, 0.0);
- if (osd_timer) {
- opengl_blit_osd(1, info_osd, config_video_filter, 0, 0.0, 0, 0.5, 0.04, 0.5, -0.95);
- if (osd_timer - (int32_t)SDL_GetTicks() < 0)
- osd_timer = 0;
- }
- }
-
- /* at this point we are ready with our image, so we display */
- swap_sdl();
/* measure frame rate */
framerate_measure();
/* only do this, if we are not in help view */
/* NOTE: We need initial IRQ, so we have out copper list initialized */
if (!(had_first_irq && help_view)) {
- current_time = SDL_GetTicks();
+ current_time = ticks_sdl();
diff = current_time - last_time;
/* in case of timer glitch, execute IRQ only by maximum number of SOUND_CHUNKS */
if (diff > 1000 * SOUND_CHUNKS / IRQ_RATE) {
fp = fopen(filename, "r");
if (!fp) {
fail:
- print_error("failed to load game from '%s'\n", filename);
+ print_info("failed to load game from '%s'\n", filename);
goto copy;
}
got = fread(game_save, sizeof(game_save[0]), 2, fp);
}
strncpy(line + 25, value, strlen(value));
text_render(info_osd, OSD_WIDTH, OSD_HEIGHT, line, 0x00, 4, 0, 0, 1);
- osd_timer = SDL_GetTicks() + 2500;
+ osd_timer = ticks_sdl() + 2500;
}
static int shift = 0, ctrl = 0;
-static void keyboard_sdl(int down, SDL_Keycode sym)
+static void keyboard_sdl(int down, enum keycode keycode)
{
- switch (sym) {
- case SDLK_LCTRL:
- case SDLK_RCTRL:
+ switch (keycode) {
+ case KEYCODE_LCTRL:
+ case KEYCODE_RCTRL:
ctrl = down;
break;
+ default: break;
}
if (ctrl && down) {
- switch (sym) {
- case SDLK_h:
+ switch (keycode) {
+ case KEYCODE_h:
help_view ^= 1;
break;
- case SDLK_v:
+ case KEYCODE_v:
config_video_filter ^= 1;
osd_info("video filter", (config_video_filter) ? "on" : "off");
break;
- case SDLK_a:
+ case KEYCODE_a:
config_audio_filter ^= 1;
osd_info("audio filter", (config_audio_filter) ? "on" : "off");
break;
- case SDLK_s:
+ case KEYCODE_s:
config_amiga_speed ^= 1;
osd_info("render speed", (config_amiga_speed) ? "original" : "fast");
break;
- case SDLK_r:
+ case KEYCODE_r:
config_render ^= 1;
osd_info("render mode", (config_render) ? "OpenGL" : "original");
break;
- case SDLK_b:
- if (!config_render) {
+ case KEYCODE_b:
+ if (!config_render && !config_debug_opengl) {
osd_info("", "not applicable");
break;
}
}
osd_info("Benson size", (config_benson_size == 0.5) ? "half" : "normal");
break;
- case SDLK_i:
+ case KEYCODE_i:
if (!intro_skipped)
skip_intro();
else
osd_info("", "not applicable");
break;
- case SDLK_c:
+ case KEYCODE_c:
if (config_ctrl_c)
quit = 1;
break;
- case SDLK_KP_PLUS:
+ case KEYCODE_n:
+#ifdef HAVE_OVR
+ normalize_observer_ovr();
+ osd_info("", "change height");
+#else
+ osd_info("", "not applicable");
+#endif
+ break;
+ case KEYCODE_KP_PLUS:
if (config_fov / 1.2 >= FOV_MIN)
config_fov /= 1.2;
disp_fov:
osd_info("FOV", text);
}
break;
- case SDLK_KP_MINUS:
+ case KEYCODE_KP_MINUS:
if (config_fov * 1.2 <= FOV_MAX)
config_fov *= 1.2;
goto disp_fov;
+ default: break;
}
/* do not pass keys to game while holding CTRL */
return;
}
- if (sym == SDLK_PAUSE && down)
+ if (keycode == KEYCODE_PAUSE && down)
help_view ^= 1;
/* in help view we don't need to forward keypresses */
if (help_view)
return;
- switch (sym) {
- case SDLK_LSHIFT:
+ switch (keycode) {
+ case KEYCODE_LSHIFT:
set_key("LSH", down);
shift = down;
break;
- case SDLK_RSHIFT:
+ case KEYCODE_RSHIFT:
set_key("RSH", down);
shift = down;
break;
- case SDLK_LEFT:
+ case KEYCODE_LEFT:
if (shift && down) {
set_key("LF", down);
set_joystick(-1, -1, -1, -1, -1);
set_key("LF", 0);
set_joystick(down, -1, -1, -1, -1);
break;
- case SDLK_RIGHT:
+ case KEYCODE_RIGHT:
if (shift && down) {
set_key("RT", down);
set_joystick(-1, -1, -1, -1, -1);
set_key("RT", 0);
set_joystick(-1, down, -1, -1, -1);
break;
- case SDLK_UP:
+ case KEYCODE_UP:
if (shift && down) {
set_key("UP", down);
set_joystick(-1, -1, -1, -1, -1);
set_key("UP", 0);
set_joystick(-1, -1, down, -1, -1);
break;
- case SDLK_DOWN:
+ case KEYCODE_DOWN:
if (shift && down) {
set_key("DN", down);
set_joystick(-1, -1, -1, -1, -1);
set_key("DN", 0);
set_joystick(-1, -1, -1, down, -1);
break;
- case SDLK_END:
+ case KEYCODE_END:
set_joystick(-1, -1, -1, -1, down);
break;
- case SDLK_a: set_key("A", down); break;
- case SDLK_b: set_key("B", down); break;
- case SDLK_c: set_key("C", down); break;
- case SDLK_d: set_key("D", down); break;
- case SDLK_e: set_key("E", down); break;
- case SDLK_f: set_key("F", down); break;
- case SDLK_g: set_key("G", down); break;
- case SDLK_h: set_key("H", down); break;
- case SDLK_i: set_key("I", down); break;
- case SDLK_j: set_key("J", down); break;
- case SDLK_k: set_key("K", down); break;
- case SDLK_l: set_key("L", down); break;
- case SDLK_m: set_key("M", down); break;
- case SDLK_n: set_key("N", down); break;
- case SDLK_o: set_key("O", down); break;
- case SDLK_p: set_key("P", down); break;
- case SDLK_q: set_key("Q", down); break;
- case SDLK_r: set_key("R", down); break;
- case SDLK_s: set_key("S", down); break;
- case SDLK_t: set_key("T", down); break;
- case SDLK_u: set_key("U", down); break;
- case SDLK_v: set_key("V", down); break;
- case SDLK_w: set_key("W", down); break;
- case SDLK_x: set_key("X", down); break;
- case SDLK_y: set_key("Y", down); break;
- case SDLK_z: set_key("Z", down); break;
-
- case SDLK_0: set_key("0", down); break;
- case SDLK_1: set_key("1", down); break;
- case SDLK_2: set_key("2", down); break;
- case SDLK_3: set_key("3", down); break;
- case SDLK_4: set_key("4", down); break;
- case SDLK_5: set_key("5", down); break;
- case SDLK_6: set_key("6", down); break;
- case SDLK_7: set_key("7", down); break;
- case SDLK_8: set_key("8", down); break;
- case SDLK_9: set_key("9", down); break;
-
- case SDLK_KP_0: set_key("NP0", down); break;
- case SDLK_KP_1: set_key("NP1", down); break;
- case SDLK_KP_2: set_key("NP2", down); break;
- case SDLK_KP_3: set_key("NP3", down); break;
- case SDLK_KP_4: set_key("NP4", down); break;
- case SDLK_KP_5: set_key("NP5", down); break;
- case SDLK_KP_6: set_key("NP6", down); break;
- case SDLK_KP_7: set_key("NP7", down); break;
- case SDLK_KP_8: set_key("NP8", down); break;
- case SDLK_KP_9: set_key("NP9", down); break;
- case SDLK_KP_DIVIDE: set_key("NPDIV", down); break;
- case SDLK_KP_MULTIPLY: set_key("NPMUL", down); break;
- case SDLK_KP_MINUS: set_key("NPSUB", down); break;
- case SDLK_KP_PLUS: set_key("NPADD", down); break;
- case SDLK_KP_PERIOD: set_key("NPDEL", down); break;
+ case KEYCODE_a: set_key("A", down); break;
+ case KEYCODE_b: set_key("B", down); break;
+ case KEYCODE_c: set_key("C", down); break;
+ case KEYCODE_d: set_key("D", down); break;
+ case KEYCODE_e: set_key("E", down); break;
+ case KEYCODE_f: set_key("F", down); break;
+ case KEYCODE_g: set_key("G", down); break;
+ case KEYCODE_h: set_key("H", down); break;
+ case KEYCODE_i: set_key("I", down); break;
+ case KEYCODE_j: set_key("J", down); break;
+ case KEYCODE_k: set_key("K", down); break;
+ case KEYCODE_l: set_key("L", down); break;
+ case KEYCODE_m: set_key("M", down); break;
+ case KEYCODE_n: set_key("N", down); break;
+ case KEYCODE_o: set_key("O", down); break;
+ case KEYCODE_p: set_key("P", down); break;
+ case KEYCODE_q: set_key("Q", down); break;
+ case KEYCODE_r: set_key("R", down); break;
+ case KEYCODE_s: set_key("S", down); break;
+ case KEYCODE_t: set_key("T", down); break;
+ case KEYCODE_u: set_key("U", down); break;
+ case KEYCODE_v: set_key("V", down); break;
+ case KEYCODE_w: set_key("W", down); break;
+ case KEYCODE_x: set_key("X", down); break;
+ case KEYCODE_y: set_key("Y", down); break;
+ case KEYCODE_z: set_key("Z", down); break;
+
+ case KEYCODE_0: set_key("0", down); break;
+ case KEYCODE_1: set_key("1", down); break;
+ case KEYCODE_2: set_key("2", down); break;
+ case KEYCODE_3: set_key("3", down); break;
+ case KEYCODE_4: set_key("4", down); break;
+ case KEYCODE_5: set_key("5", down); break;
+ case KEYCODE_6: set_key("6", down); break;
+ case KEYCODE_7: set_key("7", down); break;
+ case KEYCODE_8: set_key("8", down); break;
+ case KEYCODE_9: set_key("9", down); break;
+
+ case KEYCODE_KP_0: set_key("NP0", down); break;
+ case KEYCODE_KP_1: set_key("NP1", down); break;
+ case KEYCODE_KP_2: set_key("NP2", down); break;
+ case KEYCODE_KP_3: set_key("NP3", down); break;
+ case KEYCODE_KP_4: set_key("NP4", down); break;
+ case KEYCODE_KP_5: set_key("NP5", down); break;
+ case KEYCODE_KP_6: set_key("NP6", down); break;
+ case KEYCODE_KP_7: set_key("NP7", down); break;
+ case KEYCODE_KP_8: set_key("NP8", down); break;
+ case KEYCODE_KP_9: set_key("NP9", down); break;
+ case KEYCODE_KP_DIVIDE: set_key("NPDIV", down); break;
+ case KEYCODE_KP_MULTIPLY: set_key("NPMUL", down); break;
+ case KEYCODE_KP_MINUS: set_key("NPSUB", down); break;
+ case KEYCODE_KP_PLUS: set_key("NPADD", down); break;
+ case KEYCODE_KP_PERIOD: set_key("NPDEL", down); break;
// NPLPAREN and NPRPAREN are not emulated
- case SDLK_F1: set_key("F1", down); break;
- case SDLK_F2: set_key("F2", down); break;
- case SDLK_F3: set_key("F3", down); break;
- case SDLK_F4: set_key("F4", down); break;
- case SDLK_F5: set_key("F5", down); break;
- case SDLK_F6: set_key("F6", down); break;
- case SDLK_F7: set_key("F7", down); break;
- case SDLK_F8: set_key("F8", down); break;
- case SDLK_F9: set_key("F9", down); break;
- case SDLK_F10: set_key("F10", down); break;
-
- case SDLK_SPACE: set_key("SPC", down); break;
- case SDLK_BACKSPACE: set_key("BS", down); break;
- case SDLK_TAB: set_key("TAB", down); break;
- case SDLK_KP_ENTER: set_key("ENT", down); break;
- case SDLK_RETURN: set_key("RET", down); break;
- case SDLK_ESCAPE: set_key("ESC", down); break;
- case SDLK_DELETE: set_key("DEL", down); break;
- case SDLK_INSERT: set_key("HELP", down); break;
-
+ case KEYCODE_F1: set_key("F1", down); break;
+ case KEYCODE_F2: set_key("F2", down); break;
+ case KEYCODE_F3: set_key("F3", down); break;
+ case KEYCODE_F4: set_key("F4", down); break;
+ case KEYCODE_F5: set_key("F5", down); break;
+ case KEYCODE_F6: set_key("F6", down); break;
+ case KEYCODE_F7: set_key("F7", down); break;
+ case KEYCODE_F8: set_key("F8", down); break;
+ case KEYCODE_F9: set_key("F9", down); break;
+ case KEYCODE_F10: set_key("F10", down); break;
+
+ case KEYCODE_SPACE: set_key("SPC", down); break;
+ case KEYCODE_BACKSPACE: set_key("BS", down); break;
+ case KEYCODE_TAB: set_key("TAB", down); break;
+ case KEYCODE_KP_ENTER: set_key("ENT", down); break;
+ case KEYCODE_RETURN: set_key("RET", down); break;
+ case KEYCODE_ESCAPE: set_key("ESC", down); break;
+ case KEYCODE_DELETE: set_key("DEL", down); break;
+ case KEYCODE_INSERT: set_key("HELP", down); break;
+
+ default: break;
}
}
mercenary_patch();
/* init SDL and OpenGL */
- rc = init_sdl(argv[0], (config_debug_opengl) ? SCREEN_WIDTH * 2 : SCREEN_WIDTH * 3, (config_debug_opengl) ? SCREEN_HEIGHT * 4 : SCREEN_HEIGHT * 3, SOUND_SAMPLERATE, sdl_sound_chunk, keyboard_sdl, audio_sdl, config_multisampling);
+#ifdef HAVE_OVR
+ int vbl_sync = 0;
+#else
+ int vbl_sync = 1;
+#endif
+ rc = init_sdl(argv[0], (config_debug_opengl) ? SCREEN_WIDTH / 3 * 2 : SCREEN_WIDTH, (config_debug_opengl) ? SCREEN_HEIGHT / 3 * 4 : SCREEN_HEIGHT, SOUND_SAMPLERATE, sdl_sound_chunk, keyboard_sdl, audio_sdl, config_multisampling, vbl_sync);
+ if (rc < 0)
+ goto done;
+#ifdef HAVE_OVR
+ rc = init_ovr();
if (rc < 0)
goto done;
- rc = init_opengl((double_pixel_size) ? IMAGE_WIDTH * 2 : IMAGE_WIDTH, (double_pixel_size) ? IMAGE_HEIGHT * 2 : IMAGE_HEIGHT);
+#endif
+ rc = init_opengl_image((double_pixel_size) ? IMAGE_WIDTH * 2 : IMAGE_WIDTH, (double_pixel_size) ? IMAGE_HEIGHT * 2 : IMAGE_HEIGHT);
if (rc < 0)
goto done;
- resize_opengl((config_debug_opengl) ? SCREEN_WIDTH * 2 : SCREEN_WIDTH * 3, (config_debug_opengl) ? SCREEN_HEIGHT * 4 : SCREEN_HEIGHT * 3);
+ resize_opengl((config_debug_opengl) ? SCREEN_WIDTH / 3 * 2 : SCREEN_WIDTH, (config_debug_opengl) ? SCREEN_HEIGHT / 3 * 4 : SCREEN_HEIGHT);
/* init osd */
- rc = init_osd(0, IMAGE_WIDTH * 2, IMAGE_HEIGHT * 2);
+ rc = init_opengl_osd(0, IMAGE_WIDTH * 2, IMAGE_HEIGHT * 2);
if (rc < 0)
goto done;
- rc = init_osd(1, OSD_WIDTH, OSD_HEIGHT);
+ rc = init_opengl_osd(1, OSD_WIDTH, OSD_HEIGHT);
if (rc < 0)
goto done;
help_osd = text_alloc(IMAGE_WIDTH * 2, IMAGE_HEIGHT * 2, HELP_ALPHA);
" Press `CTRL' + `A' to toggle audio filter on / off.\n"
" Press `CTRL' + `+' or `-' to change field-of-view (OpenGL).\n"
" Press `CTRL' + `I' to skip intro (approaching to Eris).\n"
+#ifdef HAVE_OVR
+ " Press `CTRL' + `N' to normalize player position.\n"
+#endif
"\n"
"Answer to a Question:\n"
" Press `O' (not Zero) for OK and other key for NO.\n"
done:
exit_opengl();
+#ifdef HAVE_OVR
+ exit_ovr();
+#endif
exit_sdl();
if (chipreg)
projects / mercenary-reloaded.git / blobdiff