#define STICK_WALK_THRESHOLD 0.3 /* move the stick until the player moves */
#define STICK_ROTATE_THRESHOLD 0.3 /* move the stick until the player rotates */
-#define STICK_THRUST_THRESHOLD 0.3 /* move the stick until the craft moves */
+#define STICK_THRUST_THRESHOLD 0.1 /* move the stick until the craft moves */
static int config_ctrl_c = 0;
static int config_amiga_speed = 0; /* fast speed */
static int config_render = 1; /* opengl render */
static int config_skip_intro = 0;
static int config_multisampling = 8;
+#ifdef HAVE_OVR
+static double config_benson_size = 0.5;
+static double config_fov = FOV_JOLLY;
+#else
+static double config_benson_size = 1.0;
static double config_fov = FOV_NOVAGEN;
-static double config_monitor_distance = 31.5; /* inch */
+#endif
+static double config_monitor_distance = 41.5; /* inch */
#ifdef HAVE_OVR
-static double config_keyboard_distance = 28.5; /* inch */
-static double config_keyboard_height = 10.0; /* inch */
+static double config_keyboard_distance = 40.5; /* inch */
+static double config_keyboard_height = -26.0; /* inch */
#endif
-static double config_benson_size = 1.0;
static int config_debug_transparent = 0;
static int config_debug_opengl = 0;
/* render improvements */
static int config_improve_extend_roads = 1; /* set to 1 to extend roads */
static int config_improve_smooth_planets = 1; /* set to 1 to rotate planets smoothly */
+static int config_improve_stars_rotation = 1; /* set to 1 to improve star rendering */
+static int config_improve_fix_sky_rotation = 0; /* set to 1 to fix sky rotation */
+static int config_improve_round_planets = 0; /* set to 1 to make planets exactly round */
#define CPU_SPEED 7093790.0;
while (argc > i) {
if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) {
+ /* | | */
print_info("Usage: %s\n", argv[0]);
print_info(" -s --render-speed original | fast\n");
print_info(" Set speed of rendering to original Amiga or fast speed.\n");
print_info(" Set field-of-view. Default is %.0f.\n", FOV_NOVAGEN);
print_info(" -i --skip-intro\n");
print_info(" Skip intro sequence approaching to Eris space port.\n");
+ print_info("Improvement options:\n");
+ print_info(" --extend-roads 1 | 0\n");
+ print_info(" Roads in the distance end in a single point. This was ok for low\n");
+ print_info(" resolution, but for OpenGL we want equal width all the way.\n");
+ print_info(" This requires OpenGL rendering. (default = %d)\n", config_improve_extend_roads);
+ print_info(" --smooth-planets 1 | 0\n");
+ print_info(" Planet's rotation uses integer value, so they judder in the original\n");
+ print_info(" game rendering. This option requires OpenGL rendering. (default = %d)\n", config_improve_smooth_planets);
+ print_info(" --stars-rotation 1 | 0\n");
+ print_info(" Stars are rendered originally by using a fast routine. Use this option\n");
+ print_info(" to make them render on a sphere. They also rotate with the sky then.\n");
+ print_info(" This requires OpenGL rendering and is default with VR. (default = %d)\n", config_improve_stars_rotation);
+ print_info(" --fix-sky-rotation 1 | 0\n");
+ print_info(" Sky rotates in the wrong direction, if flying over planet. This is\n");
+ print_info(" fixed by rotating all sky object by 180 degrees. The original (wrong)\n");
+ print_info(" rotation is default, because it preserves the game's spirit!\n");
+ print_info(" This option requires OpenGL rendering. (default = %d)\n", config_improve_fix_sky_rotation);
+ print_info(" --round-planets 1 | 0\n");
+ print_info(" The original game renders planets and explosion debris horizontally\n");
+ print_info(" stretched. This compensates the vertical stretch of NTSC vs PAL video.\n");
+ print_info(" The original (stretched) sphere makes the game authentic.\n");
+ print_info(" This option requires OpenGL rendering. (default = %d)\n", config_improve_round_planets);
print_info("Debug options:\n");
print_info(" -o --debug-opengl\n");
print_info(" Use split screen to display both Amiga and OpenGL rendering.\n");
if (!strcmp(argv[i], "-i") || !strcmp(argv[i], "--skip-intro")) {
config_skip_intro = 1;
} else
+ if (!strcmp(argv[i], "--extend-roads")) {
+ i++;
+ if (argc == i)
+ goto missing_parameter;
+ config_improve_extend_roads = atoi(argv[i]);
+ } else
+ if (!strcmp(argv[i], "--smooth-planets")) {
+ i++;
+ if (argc == i)
+ goto missing_parameter;
+ config_improve_smooth_planets = atoi(argv[i]);
+ } else
+ if (!strcmp(argv[i], "--stars-rotation")) {
+ i++;
+ if (argc == i)
+ goto missing_parameter;
+ config_improve_stars_rotation = atoi(argv[i]);
+ } else
+ if (!strcmp(argv[i], "--fix-sky-rotation")) {
+ i++;
+ if (argc == i)
+ goto missing_parameter;
+ config_improve_fix_sky_rotation = atoi(argv[i]);
+ } else
+ if (!strcmp(argv[i], "--round-planets")) {
+ i++;
+ if (argc == i)
+ goto missing_parameter;
+ config_improve_round_planets = atoi(argv[i]);
+ } else
if (!strcmp(argv[i], "-o") || !strcmp(argv[i], "--debug-opengl")) {
config_debug_opengl = 1;
} else
}
#ifdef HAVE_OVR
-static int __attribute__((unused)) button_a_last = 0, button_b_last = 0, button_x_last = 0, button_y_last = 0, button_menu_last = 0, button_trigger_last = 0, button_left_thumb_last = 0, button_right_thumb_last = 0;
+static int __attribute__((unused)) button_a_last = 0, button_b_last = 0, button_x_last = 0, button_y_last = 0, button_menu_last = 0, button_left_trigger_last = 0, button_right_trigger_last = 0, button_left_thumb_last = 0, button_right_thumb_last = 0;
static double __attribute__((unused)) stick_left_x_last = 0.0, stick_left_y_last = 0.0, stick_right_x_last = 0.0, stick_right_y_last = 0.0;
-static int thrust_last = KEYCODE_SPACE;
+static int thrust_last = 0;
+static int joystick_set_x_last = 0, joystick_set_y_last = 0;
static int keyboard_on = 0;
static enum keycode vr_key_pressed = 0, vr_key = 0;
static void handle_vr_poses(void)
{
- int button_a = 0, button_b = 0, button_x = 0, button_y = 0, button_menu = 0, button_trigger = 0, button_left_thumb = 0, button_right_thumb = 0;
+ int button_a = 0, button_b = 0, button_x = 0, button_y = 0, button_menu = 0, button_left_trigger = 0, button_right_trigger = 0, button_left_thumb = 0, button_right_thumb = 0;
double hand_right_x = 0.0, hand_right_y = 0.0, hand_right_z = 0.0;
double hand_right_yaw = 0.0, hand_right_pitch = 0.0, hand_right_roll = 0.0;
double head_yaw = 0.0, head_pitch = 0.0, head_roll = 0.0;
double stick_left_x = 0.0, stick_left_y = 0.0, stick_right_x = 0.0, stick_right_y = 0.0;
- int thrust = KEYCODE_SPACE;
+ int thrust = thrust_last;
+ int joystick_set_x = 0, joystick_set_y = 0;
+ static uint32_t current_time, last_time = 0, diff;
+ static double increment, inc_count = 0.0;
- get_poses_ovr(&button_a, &button_b, &button_x, &button_y, &button_menu, &button_trigger, &button_left_thumb, &button_right_thumb, &hand_right_x, &hand_right_y, &hand_right_z, &hand_right_yaw, &hand_right_pitch, &hand_right_roll, &stick_left_x, &stick_left_y, &stick_right_x, &stick_right_y, &head_yaw, &head_pitch, &head_roll);
+ /* handle input */
+ get_poses_ovr(&button_a, &button_b, &button_x, &button_y, &button_menu, &button_left_trigger, &button_right_trigger, &button_left_thumb, &button_right_thumb, &hand_right_x, &hand_right_y, &hand_right_z, &hand_right_yaw, &hand_right_pitch, &hand_right_roll, &stick_left_x, &stick_left_y, &stick_right_x, &stick_right_y, &head_yaw, &head_pitch, &head_roll);
if (button_menu && !button_menu_last) {
/* menu toggle */
if (help_view == help_views)
else
help_view++;
}
- if (help_view) {
- if (button_trigger && !button_trigger_last) {
- /* rigger pressed */
- normalize_observer_ovr();
- osd_info("", "change height");
- }
- } else {
- /* handle input */
- if (button_a && !button_a_last) {
- /* keyboard A toggle */
- if (keyboard_on == 1)
- keyboard_on = 0;
- else
- keyboard_on = 1;
- }
- if (button_b && !button_b_last) {
- /* keyboard B toggle */
- if (keyboard_on == 2)
- keyboard_on = 0;
- else
- keyboard_on = 2;
- }
+ if (button_left_thumb) {
+ /* reset observer */
+ reset_observer_ovr();
+ osd_info("", "reset observer");
+ }
+ if (!help_view) {
if (button_x && !button_x_last) {
/* 'board' pressed */
set_amiga_key(KEYCODE_b, 1);
set_amiga_key(KEYCODE_b, 0);
+ /* important: get rid of old state */
+ thrust = 0;
}
if (button_y && !button_y_last) {
/* 'leave' pressed */
set_amiga_key(KEYCODE_l, 1);
set_amiga_key(KEYCODE_l, 0);
}
- if (button_left_thumb && !button_left_thumb_last) {
- /* 'escape' pressed */
- set_amiga_key(KEYCODE_ESCAPE, 1);
- set_amiga_key(KEYCODE_ESCAPE, 0);
- }
- if (!button_left_thumb && button_left_thumb_last) {
- /* 'escape' released */
- set_amiga_key(KEYCODE_SPACE, 1);
- set_amiga_key(KEYCODE_SPACE, 0);
- }
- if (button_trigger && !button_trigger_last) {
+ if (button_right_trigger && !button_right_trigger_last) {
/* trigger pressed */
- if (!keyboard_on) {
+ if (keyboard_on) {
+ if (vr_key) {
+ vr_key_pressed = vr_key;
+ set_amiga_key(vr_key_pressed, 1);
+ }
+ } else
+ if (mercenary_get_info_walking()) {
+ /* change orientation */
+ double roll, pitch, yaw;
+ mercenary_get_orientation(&roll, &pitch, &yaw);
+ mercenary_set_orientation(yaw + hand_right_yaw);
+ } else {
+ /* fire button */
set_joystick(-1, -1, -1, -1, 1);
- } else if (vr_key) {
- vr_key_pressed = vr_key;
- set_amiga_key(vr_key_pressed, 1);
}
}
- if (!button_trigger && button_trigger_last) {
+ if (!button_right_trigger && button_right_trigger_last) {
/* trigger released */
set_joystick(-1, -1, -1, -1, 0);
if (vr_key_pressed) {
}
}
/* joystick */
- if (stick_right_x > STICK_ROTATE_THRESHOLD)
- set_joystick(0, 1, -1, -1, -1);
- else
- if (stick_right_x < -STICK_ROTATE_THRESHOLD)
- set_joystick(1, 0, -1, -1, -1);
- else
- if (stick_right_x_last > STICK_ROTATE_THRESHOLD || stick_right_x_last < -STICK_ROTATE_THRESHOLD)
+ /* reset moving state, so the game is not influenced before we want to */
+ mercenary_vr_move(0, NULL, NULL, 256, 256);
+ joystick_set_x = 0;
+ joystick_set_y = 0;
+ if (!mercenary_get_info_walking()) {
+ /* turn right and left when not walking */
+ if (stick_right_x > STICK_ROTATE_THRESHOLD) {
+ set_joystick(0, 1, -1, -1, -1);
+ joystick_set_x = 1;
+ } else
+ if (stick_right_x < -STICK_ROTATE_THRESHOLD) {
+ set_joystick(1, 0, -1, -1, -1);
+ joystick_set_x = 1;
+ }
+ /* pitch craft */
+ if (stick_right_y > STICK_WALK_THRESHOLD) {
+ set_joystick(-1, -1, 1, 0, -1);
+ joystick_set_y = 1;
+ } else
+ if (stick_right_y < -STICK_WALK_THRESHOLD) {
+ set_joystick(-1, -1, 0, 1, -1);
+ joystick_set_y = 1;
+ }
+ if (joystick_set_x || joystick_set_y) {
+ mercenary_vr_move(0, NULL, NULL,
+ 256,
+ (int)(256.0 * fabs(stick_right_y) - STICK_WALK_THRESHOLD / (1.0 - STICK_WALK_THRESHOLD) + 0.5));
+ }
+ } else {
+ double roll, pitch, yaw;
+ double dist, dir, east, north;
+ int32_t move_east[4], move_north[4];
+
+ /* check if we push the stick */
+ dist = sqrt(stick_right_x * stick_right_x + stick_right_y * stick_right_y);
+ if (dist > STICK_WALK_THRESHOLD) {
+ /* get stick amplitude (dist) and direction (dir) */
+ if (dist > 1.0)
+ dist = 1.0;
+ dist = (dist - STICK_WALK_THRESHOLD) / (1.0 - STICK_WALK_THRESHOLD) * 40.0;
+ dir = atan2(stick_right_x, stick_right_y);
+ /* use hand direction to get actual stick direction */
+ dir = fmod(dir - hand_right_yaw, M_PI * 2.0);
+ if (dir < -M_PI)
+ dir += M_PI * 2.0;
+ if (dir > M_PI)
+ dir -= M_PI * 2.0;
+ /* flip directin, if we walk backwards */
+ if (dir > M_PI / 2.0 || dir < -M_PI / 2.0) {
+ /* go backwards */
+ set_joystick(-1, -1, 0, 1, -1);
+ joystick_set_y = 1;
+ } else {
+ /* go forward */
+ set_joystick(-1, -1, 1, 0, -1);
+ joystick_set_y = 1;
+ }
+ joystick_set_y = 1;
+ mercenary_get_orientation(&roll, &pitch, &yaw);
+ east = sin(yaw - dir + M_PI) * dist;
+ north = -cos(yaw - dir + M_PI) * dist;
+ /* calculatate the integer positions of 4 steps */
+ move_east[0] = (int32_t)((east * 0.25) + 0.5);
+ move_north[0] = (int32_t)((north * 0.25) + 0.5);
+ move_east[1] = (int32_t)((east * 0.5) + 0.5);
+ move_north[1] = (int32_t)((north * 0.5) + 0.5);
+ move_east[2] = (int32_t)((east * 0.75) + 0.5);
+ move_north[2] = (int32_t)((north * 0.75) + 0.5);
+ move_east[3] = (int32_t)(east + 0.5);
+ move_north[3] = (int32_t)(north + 0.5);
+ /* calculate the delta between each of the 4 step */
+ move_east[3] -= move_east[2];
+ move_north[3] -= move_north[2];
+ move_east[2] -= move_east[1];
+ move_north[2] -= move_north[1];
+ move_east[1] -= move_east[0];
+ move_north[1] -= move_north[0];
+ /* the game takes 4 steps to move the player */
+ mercenary_vr_move(1, move_east, move_north, 256, 256);
+ }
+ }
+ if (joystick_set_x_last && !joystick_set_x)
set_joystick(0, 0, -1, -1, -1);
- if (stick_right_y > STICK_WALK_THRESHOLD)
- set_joystick(-1, -1, 1, 0, -1);
- else
- if (stick_right_y < -STICK_WALK_THRESHOLD)
- set_joystick(-1, -1, 0, 1, -1);
- else
- if (stick_right_y_last > STICK_WALK_THRESHOLD || stick_right_y_last < -STICK_WALK_THRESHOLD)
+ if (joystick_set_y_last && !joystick_set_y)
set_joystick(-1, -1, 0, 0, -1);
/* thrust */
+ /* button to toggle between stop and escape */
+ if (button_left_trigger && !button_left_trigger_last) {
+ /* 'escape' pressed */
+ if (thrust_last == 0)
+ thrust = -99;
+ else
+ thrust = 0;
+ }
+ /* get stick to increment or decrement thrust */
if (stick_left_y > STICK_THRUST_THRESHOLD)
- thrust = (stick_left_y - STICK_THRUST_THRESHOLD) / (1.0 - STICK_THRUST_THRESHOLD) * 10.5;
+ increment = (stick_left_y - STICK_THRUST_THRESHOLD) / (1.0 - STICK_THRUST_THRESHOLD);
else
if (stick_left_y < -STICK_THRUST_THRESHOLD)
- thrust = (stick_left_y - -STICK_THRUST_THRESHOLD) / (1.0 - -STICK_THRUST_THRESHOLD) * 10.5;
- else
- thrust = 0;
- if (thrust >= 10)
- thrust = KEYCODE_0;
- else
- if (thrust > 0)
- thrust = KEYCODE_1 + thrust - 1;
+ increment = (stick_left_y + STICK_THRUST_THRESHOLD) / (1.0 - STICK_THRUST_THRESHOLD);
else
- if (thrust < 0)
- thrust = KEYCODE_F1 - thrust - 1;
- else
- if (thrust <= -10)
- thrust = KEYCODE_F10;
- else
- thrust = KEYCODE_SPACE;
+ increment = 0;
+ current_time = ticks_sdl();
+ if (increment) {
+ diff = current_time - last_time;
+ inc_count += increment * diff;
+ if (inc_count > 150.0 && thrust >= -10 && thrust < 10) {
+ thrust++;
+ inc_count = 0.0;
+ }
+ if (inc_count < -150.0 && thrust <= 10 && thrust > -10) {
+ thrust--;
+ inc_count = 0.0;
+ }
+ } else {
+ inc_count = 0;
+ }
+ last_time = current_time;
+ /* send thrust change as keycodes */
if (thrust_last != thrust) {
- set_amiga_key(thrust, 1);
- set_amiga_key(thrust, 0);
+ if (thrust >= 10) {
+ set_amiga_key(KEYCODE_0, 1);
+ set_amiga_key(KEYCODE_0, 0);
+ } else
+ if (thrust <= -10 && thrust > -99) {
+ set_amiga_key(KEYCODE_F10, 1);
+ set_amiga_key(KEYCODE_F10, 0);
+ } else
+ if (thrust <= -99) {
+ set_amiga_key(KEYCODE_ESCAPE, 1);
+ set_amiga_key(KEYCODE_ESCAPE, 0);
+ } else
+ if (thrust > 0) {
+ set_amiga_key(KEYCODE_1 + thrust - 1, 1);
+ set_amiga_key(KEYCODE_1 + thrust - 1, 0);
+ } else
+ if (thrust < 0) {
+ set_amiga_key(KEYCODE_F1 - thrust - 1, 1);
+ set_amiga_key(KEYCODE_F1 - thrust - 1, 0);
+ } else {
+ set_amiga_key(KEYCODE_SPACE, 1);
+ set_amiga_key(KEYCODE_SPACE, 0);
+ }
}
}
button_a_last = button_a;
button_x_last = button_x;
button_y_last = button_y;
button_menu_last = button_menu;
- button_trigger_last = button_trigger;
+ button_left_trigger_last = button_left_trigger;
+ button_right_trigger_last = button_right_trigger;
button_left_thumb_last = button_left_thumb;
button_right_thumb_last = button_right_thumb;
stick_left_x_last = stick_left_x;
stick_right_x_last = stick_right_x;
stick_right_y_last = stick_right_y;
thrust_last = thrust;
+ joystick_set_x_last = joystick_set_x;
+ joystick_set_y_last = joystick_set_y;
/* we must handle keyboard after toggeling keyboard_on,
* so that keyboard_on will not change until keyboard is rendered */
vr_key = 0;
- if (keyboard_on)
- handle_vr_keyboard(keyboard_on - 1, hand_right_x, hand_right_y, hand_right_z, hand_right_yaw, hand_right_pitch, &vr_key);
-
- if (stick_right_y > STICK_WALK_THRESHOLD || stick_right_y < -STICK_WALK_THRESHOLD) {
- double roll, pitch, yaw;
- double dist, east, north;
- int32_t move_east[4], move_north[4];
-
- mercenary_get_orientation(&roll, &pitch, &yaw);
- /* we use a maximum move of 40 for all 4 steps (this is 10 for each step - equal to 'running') */
- if (stick_right_y > 0.0)
- dist = (stick_right_y - STICK_WALK_THRESHOLD) / (1.0 - STICK_WALK_THRESHOLD) * 40.0;
- else
- dist = (stick_right_y + STICK_WALK_THRESHOLD) / (1.0 - STICK_WALK_THRESHOLD) * 40.0;
- east = sin(hand_right_yaw + yaw + M_PI) * dist;
- north = -cos(hand_right_yaw + yaw + M_PI) * dist;
- /* calculatate the integer positions of 4 steps */
- move_east[0] = (int32_t)((east * 0.25) + 0.5);
- move_north[0] = (int32_t)((north * 0.25) + 0.5);
- move_east[1] = (int32_t)((east * 0.5) + 0.5);
- move_north[1] = (int32_t)((north * 0.5) + 0.5);
- move_east[2] = (int32_t)((east * 0.75) + 0.5);
- move_north[2] = (int32_t)((north * 0.75) + 0.5);
- move_east[3] = (int32_t)(east + 0.5);
- move_north[3] = (int32_t)(north + 0.5);
- /* calculate the delta between each of the 4 step */
- move_east[3] -= move_east[2];
- move_north[3] -= move_north[2];
- move_east[2] -= move_east[1];
- move_north[2] -= move_north[1];
- move_east[1] -= move_east[0];
- move_north[1] -= move_north[0];
- /* the game takes 4 steps to move the player */
- mercenary_vr_move(1, move_east, move_north,
- 256,
- (int)(256.0 * fabs(stick_right_y) - STICK_WALK_THRESHOLD / (1.0 - STICK_WALK_THRESHOLD) + 0.5));
- } else {
- /* don't change what the game actually does when moving joystick in y-direction */
- mercenary_vr_move(0, NULL, NULL, 256, 256);
- }
+ keyboard_on = handle_vr_keyboard(hand_right_x, hand_right_y, hand_right_z, hand_right_yaw, hand_right_pitch, &vr_key);
}
#endif
double render_delay = 0.0;
uint32_t palette_address;
uint16_t palette[16];
+ int all_white = 0;
#ifdef HAVE_OVR
int eye;
+ int vr = 1;
+#else
+ int vr = 0;
#endif
last_time = ticks_sdl();
frame_render = 0;
/* start capturing for improved graphics */
if (render_improved)
- render_capture_start(config_fov, config_improve_extend_roads, config_improve_smooth_planets, config_debug_transparent);
+ render_capture_start(config_fov, config_improve_extend_roads, config_improve_smooth_planets, config_improve_stars_rotation, config_improve_fix_sky_rotation, config_improve_round_planets, config_debug_transparent);
/* execute until the rendered image is ready (wait for VBL) */
cycle_count = 0;
{
#endif
/* clear screen */
-#ifdef HAVE_OVR
- opengl_clear(1);
-#else
- opengl_clear(0);
-#endif
+ opengl_clear(vr);
/* render benson + osd ontop of improved opengl rendering, if enabled */
if (render_improved) {
#ifndef HAVE_OVR
/* 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 (all_white)
+ rc = render_all_white(vr);
+ else
+ rc = render_all_items((config_amiga_speed) ? 1.0 : frame_time, vr);
if (rc)
goto goto_legacy;
-#ifdef HAVE_OVR
- 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, 1);
-#else
- 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, 0);
-#endif
+ 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, vr);
if (help_view)
- opengl_blit_osd(0, help_osd[help_view - 1], 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);
+ opengl_blit_osd(0, help_osd[help_view - 1], config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, (vr) ? FOV_NOVAGEN : config_fov, config_monitor_distance, (vr) ? 1.0 : 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);
+ opengl_blit_osd(1, info_osd, config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, (vr) ? FOV_NOVAGEN : config_fov, config_monitor_distance, (vr) ? 1.0 : benson_size, 0.5, 0.04, 0.5, -0.95);
if (osd_timer - (int32_t)ticks_sdl() < 0)
osd_timer = 0;
}
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(window_width, window_height, (debug_opengl) ? 1 : 0, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, config_fov, 1.0);
+ opengl_viewport(window_width, window_height, (debug_opengl) ? 1 : 0, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, FOV_NOVAGEN, 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, 0);
+ opengl_blit_image(image, config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, 0, FOV_NOVAGEN, config_monitor_distance, 1.0, 0);
if (help_view)
- opengl_blit_osd(0, help_osd[help_view - 1], 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);
+ opengl_blit_osd(0, help_osd[help_view - 1], config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, FOV_NOVAGEN, 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);
+ opengl_blit_osd(1, info_osd, config_video_filter, (double_pixel_size) ? BENSON_AT_LINE * 2 : BENSON_AT_LINE, FOV_NOVAGEN, 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
/* render keyboard */
if (keyboard_on)
- render_vr_keyboard(keyboard_on - 1, camera_x, camera_y);
+ render_vr_keyboard(camera_x, camera_y);
/* end of rendering eye */
end_render_ovr_eye(eye);
/* transfer benson without game view
* because we only got benson refreshed during VBL IRQ
*/
- emul_video(image, memory, palette, IMAGE_WIDTH, IMAGE_HEIGHT, IMAGE_DIWSTART, chipreg, BENSON_AT_LINE, IMAGE_HEIGHT, double_pixel_size);
+ all_white = emul_video(image, memory, palette, IMAGE_WIDTH, IMAGE_HEIGHT, IMAGE_DIWSTART, chipreg, BENSON_AT_LINE, IMAGE_HEIGHT, double_pixel_size);
/* render sound to sound buffer
* buffer pointer read and write is atomic, so no locking required!
*/
break;
case KEYCODE_o:
#ifdef HAVE_OVR
- normalize_observer_ovr();
- osd_info("", "change height");
+ reset_observer_ovr();
+ osd_info("", "reset observer");
#else
osd_info("", "not applicable");
#endif
break;
case KEYCODE_KP_PLUS:
+#ifdef HAVE_OVR
+ osd_info("", "not applicable");
+#else
if (config_fov / 1.2 >= FOV_MIN)
config_fov /= 1.2;
disp_fov:
sprintf(text, "%.2f", config_fov);
osd_info("FOV", text);
}
+#endif
break;
case KEYCODE_KP_MINUS:
+#ifdef HAVE_OVR
+ osd_info("", "not applicable");
+#else
if (config_fov * 1.2 <= FOV_MAX)
config_fov *= 1.2;
goto disp_fov;
+#endif
+ break;
default: break;
}
/* do not pass keys to game while holding CTRL */
/* init SDL and OpenGL */
#ifdef HAVE_OVR
int vbl_sync = 0;
- int rift = 1;
+ int vr = 1;
int multisampling = 0;
window_width = SCREEN_WIDTH;
window_height = SCREEN_HEIGHT;
#else
int vbl_sync = 1;
- int rift = 0;
+ int vr = 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, 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, vr);
if (rc < 0)
goto done;
#ifdef HAVE_OVR
" 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' + `O' (or right trigger) to reset observer position.\n"
+ " Press `CTRL' + `O' (or both triggers) to reset observer position.\n"
#endif
"\n"
"Answer to a Question:\n"
text_render(help_osd[1], IMAGE_WIDTH * 2, IMAGE_HEIGHT * 2,
"Emulation using Controller:\n"
" Press `Enter' button to toggle this help screen on or off.\n"
- " Press `A' button to emulate keyboard to control game.\n"
- " Press `B' button to emulate keyboard to enter alphanumeric keys.\n"
- " Press `A' or `B' button again to dismiss keyboard.\n"
- " Point right controller to a key on keyboard. The key will highlight.\n"
- " Press `Trigger' on right controller enter the highlighted key.\n"
+ " To have a virtual keyboard, point below benson (control pannel).\n"
+ " Point to a key on keyboard. The key will highlight.\n"
+ " Pull `Trigger' on right controller to enter the highlighted key.\n"
+ " Press thumb stick on left controller to reset observer position.\n"
"\n"
"Walking / Driving / Flying using Controller:\n"
" Use thumb stick on right controller, to move player / craft.\n"
+ " Point right controller towards the direction to walk to.\n"
+ " Pull `Trigger' on right controller to change orientation.\n"
" Press `X' button to board, `Y' button to leave.\n"
" Move thumb stick on left controller to drive/fly forward or backward.\n"
- " Press and hold thumb stick on left controller for escape sequence.\n"
- " Release thumb stick on left controller stop craft.\n"
- " Press `Trigger' on right controller to fire.\n"
+ " Pull `Trigger' on left controller stop craft.\n"
+ " Pull `Trigger' on left controller for escape sequence, after stop.\n"
+ " Pull `Trigger' on right controller to fire.\n"
"\n"
- "For all other game function, use the emulated keyboards!\n"
+ "For all other game function, use the virtual or real keyboard!\n"
,HELP_ALPHA, 1, 2, 5, 0);
help_views = 2;
#endif
projects / mercenary-reloaded.git / blobdiff