X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=mercenary-reloaded.git;a=blobdiff_plain;f=src%2Fmercenary%2Fmain.c;h=1ba1f440e7afe3c8cc53c61a1b8b55fb79adb02a;hp=f944dd0399dd87133faee6878c1a00dfc7cdfeec;hb=4a148b62da861f72c05a058fb14f7232f17e4cab;hpb=b4d06ff78ae4d481ee517f82b6008a17943c8bbe

diff --git a/src/mercenary/main.c b/src/mercenary/main.c
index f944dd0..1ba1f44 100644
--- a/src/mercenary/main.c
+++ b/src/mercenary/main.c
@@ -55,7 +55,7 @@
 
 static int config_ctrl_c = 0;
 static int config_amiga_speed = 0; /* fast speed */
-static double config_fps = 16.0;
+static double config_fps = 10.0;
 #if !defined(_WIN32)
 static const char *config_gamesave_dir = ".mercenary";
 #endif
@@ -64,6 +64,7 @@ static int config_audio_filter = 1;
 static int config_render = 1; /* opengl render */
 static int config_skip_intro = 0;
 static int config_multisampling = 8;
+static int config_joystick = -1, config_joystick_x = -1, config_joystick_y = -1, config_joystick_fire = -1;
 #ifdef HAVE_OVR
 static double config_benson_size = 0.7;
 static double config_fov = FOV_JOLLY;
@@ -171,6 +172,12 @@ int parse_args(int argc, char *argv[])
 			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(" -j --joystick <num> | list\n");
+			print_info("        Select given joystick number or show list. (default = 0, if available)\n");
+			print_info("    --joystick-x <axis num>\n");
+			print_info("    --joystick-y <axis num>\n");
+			print_info("    --joystick-fire <button num>\n");
+			print_info("        Specify explicit axis and button of joystick.\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");
@@ -295,6 +302,34 @@ illegal_parameter:
 		if (!strcmp(argv[i], "-i") || !strcmp(argv[i], "--skip-intro")) {
 			config_skip_intro = 1;
 		} else
+		if (!strcmp(argv[i], "-j") || !strcmp(argv[i], "--joystick")) {
+			i++;
+			if (argc == i)
+				goto missing_parameter;
+			if (!strcmp(argv[i], "list")) {
+				sdl_list_joysticks();
+				return 1;
+			}
+			config_joystick = atoi(argv[i]);
+		} else
+		if (!strcmp(argv[i], "--joystick-x")) {
+			i++;
+			if (argc == i)
+				goto missing_parameter;
+			config_joystick_x = atoi(argv[i]);
+		} else
+		if (!strcmp(argv[i], "--joystick-y")) {
+			i++;
+			if (argc == i)
+				goto missing_parameter;
+			config_joystick_y = atoi(argv[i]);
+		} else
+		if (!strcmp(argv[i], "--joystick-fire")) {
+			i++;
+			if (argc == i)
+				goto missing_parameter;
+			config_joystick_fire = atoi(argv[i]);
+		} else
 		if (!strcmp(argv[i], "--extend-roads")) {
 			i++;
 			if (argc == i)
@@ -386,6 +421,7 @@ 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 int we_walk = 0, we_rotate = 0;
 
 static void handle_vr_poses(void)
 {
@@ -401,41 +437,34 @@ static void handle_vr_poses(void)
 
 	/* 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) {
+	if (button_a && !button_a_last) {
+		/* menu toggle */
+		toggle_help();
+	}
+	if (button_b && !button_b_last) {
+		/* reset observer */
+		reset_observer_ovr();
+		osd_info("", "reset observer");
+	}
+	if (button_x && !button_x_last) {
 		/* menu toggle */
 		toggle_help();
 	}
-	if (button_right_thumb) {
+	if (button_y && !button_y_last) {
 		/* 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_right_trigger && !button_right_trigger_last) {
 			/* trigger pressed */
 			if (keyboard_on) {
 				if (vr_key) {
 					vr_key_pressed = vr_key;
 					set_amiga_key(vr_key_pressed, 1);
+					/* reset vr thrust */
+					thrust = 0;
 				}
-			} 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);
@@ -480,24 +509,48 @@ static void handle_vr_poses(void)
 			}
 		} else {
 			double roll, pitch, yaw;
-			double dist, dir, east, north;
+			double tilt, 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) {
+			tilt = sqrt(stick_right_x * stick_right_x + stick_right_y * stick_right_y);
+
+			/* check if we rotate, walk or rest */
+			if (we_rotate == 0 && we_walk == 0) {
+				/* we rest */
+				if (fabs(stick_right_y) > fabs(stick_right_x) && tilt > STICK_WALK_THRESHOLD)
+					we_walk = 1;
+				if (fabs(stick_right_x) > fabs(stick_right_y) && tilt > STICK_ROTATE_THRESHOLD)
+					we_rotate = 1;
+			} else if (we_walk) {
+				/* we walk */
+				if (tilt < STICK_WALK_THRESHOLD) {
+					we_walk = 0;
+					/* we need to stop right here and not continue until next rendering */
+					set_joystick(-1, -1, 0, 0, -1); /* stop y */
+					reset_joystick(); /* commit stop */
+				}
+			} else {
+				/* we rotate */
+				if (tilt < STICK_ROTATE_THRESHOLD)
+					we_rotate = 0;
+			}
+
+			/* if we walk */
+			if (we_walk) {
 				/* 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;
+				if (tilt > 1.0)
+					tilt = 1.0;
+				tilt = (tilt - STICK_WALK_THRESHOLD) / (1.0 - STICK_WALK_THRESHOLD) * 40.0;
 				dir = atan2(stick_right_x, stick_right_y);
+#if 0
 				/* 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 */
+#endif
+				/* flip direction, if we walk backwards */
 				if (dir > M_PI / 2.0 || dir < -M_PI / 2.0) {
 					/* go backwards */
 					set_joystick(-1, -1, 0, 1, -1);
@@ -507,10 +560,9 @@ static void handle_vr_poses(void)
 					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;
+				east = sin(yaw - dir + M_PI) * tilt;
+				north = -cos(yaw - dir + M_PI) * tilt;
 				/* 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);
@@ -530,6 +582,18 @@ static void handle_vr_poses(void)
 				/* the game takes 4 steps to move the player */
 				mercenary_vr_move(1, move_east, move_north, 256, 256);
 			}
+
+			/* if we rotate */
+			if (we_rotate == 1) {
+				/* change orientation */
+				mercenary_get_orientation(&roll, &pitch, &yaw);
+				if (stick_right_x > 0)
+					mercenary_set_orientation(yaw - 45.0 / 180.0 * M_PI);
+				else
+					mercenary_set_orientation(yaw + 45.0 / 180.0 * M_PI);
+				/* rotate only once */
+				we_rotate = 2;
+			}
 		}
 		if (joystick_set_x_last && !joystick_set_x)
 			set_joystick(0, 0, -1, -1, -1);
@@ -1272,10 +1336,43 @@ static void keyboard_sdl(int down, enum keycode keycode)
 		set_amiga_key(KEYCODE_HELP, down);
 		break;
 	default:
+		/* reset vr thrust */
+#ifdef HAVE_OVR
+		thrust_last = 0;
+#endif
 		set_amiga_key(keycode, down);
 	}
 }
 
+static double joystick_last_x = 0, joystick_last_y = 0;
+static int joystick_last_fire = 0;
+
+static void joystick_sdl(double x, double y, int fire)
+{
+	int left = -1, right = -1, up = -1, down = -1;
+
+	if (x <= -0.5 && joystick_last_x > -0.5)
+		left = 1;
+	if (x > -0.5 && joystick_last_x <= -0.5)
+		left = 0;
+	if (x >= 0.5 && joystick_last_x < 0.5)
+		right = 1;
+	if (x < 0.5 && joystick_last_x >= 0.5)
+		right = 0;
+	if (y <= -0.5 && joystick_last_y > -0.5)
+		up = 1;
+	if (y > -0.5 && joystick_last_y <= -0.5)
+		up = 0;
+	if (y >= 0.5 && joystick_last_y < 0.5)
+		down = 1;
+	if (y < 0.5 && joystick_last_y >= 0.5)
+		down = 0;
+	set_joystick(left, right, up, down, fire);
+	joystick_last_x = x;
+	joystick_last_y = y;
+	joystick_last_fire = fire;
+}
+
 void audio_sdl(float *data, int length)
 {
 	int fill, s;
@@ -1399,7 +1496,7 @@ int main(int argc, char *argv[])
 	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, vr);
+	rc = init_sdl(mercenary_name, window_width, window_height, SOUND_SAMPLERATE, sdl_sound_chunk, keyboard_sdl, config_joystick, config_joystick_x, config_joystick_y, config_joystick_fire, joystick_sdl, audio_sdl, resize_window, multisampling, vbl_sync, vr);
 	if (rc < 0)
 		goto done;
 #ifdef HAVE_OVR
@@ -1443,7 +1540,7 @@ int main(int argc, char *argv[])
 		"        Press `CTRL' + `I' to skip intro (approaching to Eris).\n"
 		"        Press `CTRL' + `1' or `2' to insert or `0' to remove mission disk.\n"
 #ifdef HAVE_OVR
-		"        Press `CTRL' + `O' (or both triggers) to reset observer position.\n"
+		"        Press `CTRL' + `O' to reset observer position.\n"
 #endif
 		"\n"
 		"Answer to a Question:\n"
@@ -1484,15 +1581,15 @@ int main(int argc, char *argv[])
 	text_render(help_osd[2], IMAGE_WIDTH * 2, IMAGE_HEIGHT * 2, mercenary_name, HELP_ALPHA, 3, (double)(80 - strlen(mercenary_name)) / 2.0, 1, 1);
 	text_render(help_osd[2], IMAGE_WIDTH * 2, IMAGE_HEIGHT * 2,
 		"Emulation using Controller:\n"
-		"        Press `Enter' button to toggle this help screen on or off.\n"
-		"        To have a virtual keyboard, point below benson (control pannel).\n"
+		"        Press `A' or 'X' button to toggle this help screen on or off.\n"
+		"        Press 'B' or 'Y' button to reset observer position. (importaint!)\n"
+		"        To have a virtual keyboard, point right hand below 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"
+		"        Move thumb stick forth and back to walk, left and right to rotate.\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"