Index: controlconfig/controlsconfig.cpp =================================================================== --- controlconfig/controlsconfig.cpp (revision 9256) +++ controlconfig/controlsconfig.cpp (working copy) @@ -2212,43 +2212,43 @@ // joy_get_scaled_reading will return a value represents the joystick pos from -1 to +1 (fixed point) *h = 0; - if (Axis_map_to[0] >= 0) { + if (Axis_map_to[JOY_HEADING_AXIS] >= 0) { *h = joy_get_scaled_reading(axes_values[Axis_map_to[0]], Axis_map_to[0]); } *p = 0; - if (Axis_map_to[1] >= 0) { + if (Axis_map_to[JOY_PITCH_AXIS] >= 0) { *p = joy_get_scaled_reading(axes_values[Axis_map_to[1]], Axis_map_to[1]); } *b = 0; - if (Axis_map_to[2] >= 0) { + if (Axis_map_to[JOY_BANK_AXIS] >= 0) { *b = joy_get_scaled_reading(axes_values[Axis_map_to[2]], Axis_map_to[2]); } *ta = 0; - if (Axis_map_to[3] >= 0) { + if (Axis_map_to[JOY_ABS_THROTTLE_AXIS] >= 0) { *ta = joy_get_unscaled_reading(axes_values[Axis_map_to[3]], Axis_map_to[3]); } *tr = 0; - if (Axis_map_to[4] >= 0) { + if (Axis_map_to[JOY_REL_THROTTLE_AXIS] >= 0) { *tr = joy_get_scaled_reading(axes_values[Axis_map_to[4]], Axis_map_to[4]); } - if (Invert_axis[0]) { + if (Invert_axis[JOY_HEADING_AXIS]) { *h = -(*h); } - if (Invert_axis[1]) { + if (Invert_axis[JOY_PITCH_AXIS]) { *p = -(*p); } - if (Invert_axis[2]) { + if (Invert_axis[JOY_BANK_AXIS]) { *b = -(*b); } - if (Invert_axis[3]) { + if (Invert_axis[JOY_ABS_THROTTLE_AXIS]) { *ta = F1_0 - *ta; } - if (Invert_axis[4]) { + if (Invert_axis[JOY_REL_THROTTLE_AXIS]) { *tr = -(*tr); } Index: playerman/player.h =================================================================== --- playerman/player.h (revision 9256) +++ playerman/player.h (working copy) @@ -54,11 +54,14 @@ #define PLAYER_KILLED_SELF ( PLAYER_FLAGS_KILLED_SELF_MISSILES | PLAYER_FLAGS_KILLED_SELF_SHOCKWAVE ) -#define PCM_NORMAL 0 // normal flying mode -#define PCM_WARPOUT_STAGE1 1 // speed up to 40 km/s -#define PCM_WARPOUT_STAGE2 2 // flying towards and through warp hole -#define PCM_WARPOUT_STAGE3 3 // through warp hole, waiting for it to disapper. -#define PCM_SUPERNOVA 4 // supernova. lock everything to where it is. +enum Player_control_mode +{ + PCM_NORMAL, // normal flying mode + PCM_WARPOUT_STAGE1, // speed up to 40 km/s + PCM_WARPOUT_STAGE2, // flying towards and through warp hole + PCM_WARPOUT_STAGE3, // through warp hole, waiting for it to disapper. + PCM_SUPERNOVA // supernova. lock everything to where it is. +}; // 'lua game control' settings #define LGC_NORMAL (1<<0) // normal controls @@ -343,7 +346,7 @@ //extern control_info PlayerControls; extern int Player_use_ai; -extern int view_centering; +extern bool view_is_centering; extern angles chase_slew_angles; // The viewing angles in which viewer_slew_angles will chase to. extern void player_init(); // initialization per level Index: playerman/playercontrol.cpp =================================================================== --- playerman/playercontrol.cpp (revision 9256) +++ playerman/playercontrol.cpp (working copy) @@ -34,6 +34,7 @@ #include "network/multiutil.h" #include "network/multi_obj.h" #include "parse/parselo.h" +#include "controlconfig/controlsconfig.h" #ifndef NDEBUG #include "io/key.h" @@ -58,8 +59,8 @@ physics_info Descent_physics; // used when we want to control the player like the descent ship angles chase_slew_angles; -int view_centering = 0; - +bool view_is_centering = false; +bool freelook_mode_active; // Used to determine if slew mode (a.k.a FreeLook mode) is active int toggle_glide = 0; int press_glide = 0; @@ -73,6 +74,7 @@ DCF_BOOL( show_killer_weapon, Show_killer_weapon ) #endif +void playercontrol_read_mouse(int *axis, float frame_time); void playercontrol_read_stick(int *axis, float frame_time); void player_set_padlock_state(); @@ -80,104 +82,180 @@ * @brief Slew angles chase towards a value like they're on a spring. * @details When furthest away, move fastest. Minimum speed set so that doesn't take too long. When gets close, clamps to the value. */ -void chase_angles_to_value(angles *ap, angles *bp, int scale) +void chase_angles_to_value(angles *current_angles, angles *target_angles, int scale) { float sk; angles delta; // Make sure we actually need to do all this math. - if ((ap->p == bp->p) && (ap->h == bp->h)) + if ((current_angles->p == target_angles->p) && (current_angles->h == target_angles->h)) return; sk = 1.0f - scale*flRealframetime; CLAMP(sk, 0.0f, 1.0f); - delta.p = ap->p - bp->p; - delta.h = ap->h - bp->h; + delta.p = current_angles->p - target_angles->p; + delta.h = current_angles->h - target_angles->h; - ap->p = ap->p - delta.p * (1.0f - sk); - ap->h = ap->h - delta.h * (1.0f - sk); - // If we're very close, put ourselves at goal. if ((fl_abs(delta.p) < 0.005f) && (fl_abs(delta.h) < 0.005f)) { - ap->p = bp->p; - ap->h = bp->h; + current_angles->p = target_angles->p; + current_angles->h = target_angles->h; + } else { + // Else, apply the changes + current_angles->p -= ( delta.p * (1.0f - sk) ); + current_angles->h -= ( delta.h * (1.0f - sk) ); } } angles Viewer_slew_angles_delta; angles Viewer_external_angles_delta; +/** + * @brief Modifies the camera veiw angles according to its current view mode. (External, External Locked, + * TrackIR, Freelook, Normal, and Centering) + * @param[in,out] ma The camera veiw angles to modify (magnitude is saturated to be within max_p and max_h). + * @param[out] da The delta angles applied to ma (magnitude is saturated to 1 radian). + * @param[in] max_p The maximum pitch magnitude ma may have (radians). + * @param[in] max_h The maximum heading magnitude ma may have (radians). + * @param[in] frame_time The frame time at which this function is called. + */ void view_modify(angles *ma, angles *da, float max_p, float max_h, float frame_time) { + // Digital inputs + float t = 0.0f; + float u = 0.0f; + // Analog inputs int axis[NUM_JOY_AXIS_ACTIONS]; - float t = 0; - float u = 0; + float h = 0.0f; + float p = 0.0f; vec3d trans = ZERO_VECTOR; - if ( Viewer_mode & VM_EXTERNAL) { - if (! (Viewer_mode & VM_EXTERNAL_CAMERA_LOCKED) ) { - t = t + (check_control_timef(YAW_LEFT) - check_control_timef(YAW_RIGHT)); - u = u + (check_control_timef(PITCH_BACK) - check_control_timef(PITCH_FORWARD)); + if ( Viewer_mode & VM_EXTERNAL ) { + if ( !(Viewer_mode & VM_EXTERNAL_CAMERA_LOCKED) ) { + // Digital + // May have to look at this again later... + // YAW_LEFT -> SLEW_LEFT YAW_RIGHT -> SLEW_RIGHT + // PITCH_BACK -> SLEW_UP PITCH_FORWARD -> SLEW_DOWN + t = (check_control_timef(YAW_LEFT) - check_control_timef(YAW_RIGHT)); + u = (check_control_timef(PITCH_BACK) - check_control_timef(PITCH_FORWARD)); + + // Analog + if( Use_mouse_to_fly ) { + // Use normal mouse mode for slew + playercontrol_read_mouse(axis, frame_time); + } else { + // Use joystick for slew + playercontrol_read_stick(axis, frame_time); + } + + h = -f2fl(axis[JOY_HEADING_AXIS]); + p = -f2fl(axis[JOY_PITCH_AXIS]); } else { + // External camera is locked in place, nothing to do here return; } - } else if ( gTirDll_TrackIR.Enabled( ) ) { - gTirDll_TrackIR.Query(); - ma->h = -PI2*(gTirDll_TrackIR.GetYaw()); - ma->p = PI2*(gTirDll_TrackIR.GetPitch()); + } else { + // We're in the cockpit + if ( gTirDll_TrackIR.Enabled() ) { + gTirDll_TrackIR.Query(); + ma->h = -PI2*(gTirDll_TrackIR.GetYaw()); + ma->p = PI2*(gTirDll_TrackIR.GetPitch()); - trans.xyz.x = -0.4f*gTirDll_TrackIR.GetX(); - trans.xyz.y = 0.4f*gTirDll_TrackIR.GetY(); - trans.xyz.z = -gTirDll_TrackIR.GetZ(); + trans.xyz.x = -0.4f*gTirDll_TrackIR.GetX(); + trans.xyz.y = 0.4f*gTirDll_TrackIR.GetY(); + trans.xyz.z = -gTirDll_TrackIR.GetZ(); - if(trans.xyz.z < 0) - trans.xyz.z = 0.0f; + if(trans.xyz.z < 0) { + trans.xyz.z = 0.0f; + } - vm_vec_unrotate(&leaning_position,&trans,&Eye_matrix); - } else { - // View slewing commands commented out until we can safely add more commands in the pilot code. + vm_vec_unrotate(&leaning_position,&trans,&Eye_matrix); + } else if ( freelook_mode_active ) { + // Freelook mode is enabled. Use flight controls for slewing + // Digital + t = (check_control_timef(YAW_LEFT) - check_control_timef(YAW_RIGHT)); + u = (check_control_timef(PITCH_BACK) - check_control_timef(PITCH_FORWARD)); + + // Analog + if( Use_mouse_to_fly ) { + // Use normal mouse mode for slew + playercontrol_read_mouse(axis, frame_time); + } else { + // Use joystick for slew + playercontrol_read_stick(axis, frame_time); + } + + h = -f2fl(axis[JOY_HEADING_AXIS]); + p = -f2fl(axis[JOY_PITCH_AXIS]); + } else { + // freelook mode is disabled. Use only slew commands + /** These have been commented out until Slew commands are actually doable + t = (check_control_timef(SLEW_LEFT) - check_control_timef(SLEW_RIGHT)); + u = (check_control_timef(SLEW_UP) - check_control_timef(SLEW_DOWN)); + */ + + if( !Use_mouse_to_fly ) { + // Mouse now controls slew when not being used as flight controler + playercontrol_read_mouse(axis,frame_time); + + h = -f2fl( axis[JOY_HEADING_AXIS] ); + p = -f2fl( axis[JOY_PITCH_AXIS] ); + } + // Else, don't do any slewing + } } - if (t != 0.0f) - da->h += t; - else - da->h = 0.0f; + if( !view_is_centering ) { + // Combine Analog and Digital slew commands + // Strip out any floating point errors before adding veiw changes + if ( (t != 0.0f) && (h != 0.0f) ) { + da->h += (t + h); + } else if (t!= 0.0f) { + da->h += t; + } else if (h != 0.0f) { + // Careful! playercontrol_read_mouse returns a delta, not an absolute position + da->h = h; + } else { + da->h = 0.0f; + } - if (u != 0.0f) - da->p += u; - else - da->p = 0.0f; - - da->b = 0.0f; + if ( (u != 0.0f) && (p != 0.0f) ) { + da->p += (u + p); + } else if ( u!= 0.0f ) { + da->p += u; + } else if ( p != 0.0f ) { + // Careful! playercontrol_read_mouse returns a delta, not an absolute position + da->p = p; + } else { + da->p = 0.0f; + } - playercontrol_read_stick(axis, frame_time); + da->b = 0.0f; // Twisting the veiw isn't very helpful, anyway - if (( Viewer_mode & VM_EXTERNAL ) && !(Viewer_mode & VM_EXTERNAL_CAMERA_LOCKED)) { - // check the heading on the x and y axes - da->h -= f2fl( axis[0] ); - da->p -= f2fl( axis[1] ); - } + // Saturate delta angles + if ( da->h > 1.0f ) { + da->h = 1.0f; + } else if ( da->h < -1.0f ) { + da->h = -1.0f; + } - if (da->h > 1.0f) - da->h = 1.0f; - else if (da->h < -1.0f) - da->h = -1.0f; + if ( da->p > 1.0f ) { + da->p = 1.0f; + } else if (da->p < -1.0f) { + da->p = -1.0f; + } + } else { + // View is centering, so ignore any and all slew commands until veiw has been centered + return; + } - if (da->p > 1.0f) - da->p = 1.0f; - else if (da->p < -1.0f) - da->p = -1.0f; - - if ( (Game_time_compression >= F1_0) && !(Viewer_mode & VM_EXTERNAL) ) - { + if ( (Game_time_compression >= F1_0) && !(Viewer_mode & VM_EXTERNAL) ) { ma->p += 2*da->p * flFrametime; ma->b += 2*da->b * flFrametime; ma->h += 2*da->h * flFrametime; - } - else - { + } else { //If time compression is less than normal, still move camera at same speed //This gives a cool matrix effect ma->p += da->p * flRealframetime; @@ -185,15 +263,17 @@ ma->h += da->h * flRealframetime; } - if (ma->p > max_p) + if (ma->p > max_p) { ma->p = max_p; - else if (ma->p < -max_p) + } else if (ma->p < -max_p) { ma->p = -max_p; + } - if (ma->h > max_h) + if (ma->h > max_h) { ma->h = max_h; - else if (ma->h < -max_h) + } else if (ma->h < -max_h) { ma->h = -max_h; + } } void do_view_track_target(float frame_time) @@ -262,7 +342,9 @@ /** - * When PAD0 is pressed, keypad controls viewer direction slewing. + * @brief When VIEW_SLEW is pressed, pitch and heading controls viewer direction slewing. + * @details Prevents the player's "head" from swiveling unrealistacally far with a max_p of Pi/2 and a max_h of2/3 Pi. + * @param[in] frame_time The frame time at which this function is called */ void do_view_slew(float frame_time) { @@ -350,16 +432,56 @@ ci->forward_cruise_percent = oldspeed; } -// Read the 4 joystick axis. This is its own function -// because we only want to read it at a certain rate, -// since it takes time. +/** + * @brief Reads the 3 axis Mouse with sensitivy scaling. (Third axis doesn't actually work...) + * @details This is its own function so we can use the mouse in freelook mode as well as use it as a flight controller in (normal mode). + * @param[out] axis The axis array to store the scaled mouse position. + * @param[in] frame_time The frame time at which this function is called. + */ +void playercontrol_read_mouse(int *axis, float frame_time) +{ + int dx, dy, dz; + float factor; + + factor = (float) Mouse_sensitivity + 1.77f; + factor = factor * factor / frame_time / 0.6f; + + mouse_get_delta(&dx, &dy, &dz); + + if ( Invert_axis[JOY_HEADING_AXIS] ) + { + dx = -dx; + } + + if ( Invert_axis[JOY_PITCH_AXIS] ) + { + dy = -dy; + } + + if ( Invert_axis[JOY_ABS_THROTTLE_AXIS] ) + { + dz = -dz; + } + + axis[JOY_X_AXIS] = (int) ((float) dx * factor); + axis[JOY_Y_AXIS] = (int) ((float) dy * factor); + axis[JOY_RX_AXIS] = (int) ((float) dz * factor); +} + static int Joystick_saved_reading[JOY_NUM_AXES]; static int Joystick_last_reading = -1; +/** + * @brief Reads the joystick axes. + * @details This is its own function because we only want to read it at a certain rate, since it takes time. + * @param[out] axis The axis array to store the scaled joystick position. (Must have a size of NUM_JOY_AXIS_ACTIONS) + * @param[in] frame_time The frame time at which this function is called. + */ void playercontrol_read_stick(int *axis, float frame_time) { int i; + int mouse_axis[NUM_JOY_AXIS_ACTIONS]; #ifndef NDEBUG // Make sure things get reset properly between missions. @@ -375,46 +497,31 @@ Joystick_last_reading = timestamp( 1000/10 ); // Read 10x per second, like we did in Descent. } - for (i=0; iforward_cruise_percent; //Backslash - int ok_to_read_ci_pitch_yaw=1; + bool ok_to_read_ci_pitch_yaw = true; int centering_speed = 7; // the scale speed in which the camera will smoothly center when the player presses Center View oldspeed = ci->forward_cruise_percent; @@ -423,48 +530,59 @@ if ( Viewer_mode & VM_EXTERNAL ) { control_used(VIEW_EXTERNAL); if ( !(Viewer_mode & VM_EXTERNAL_CAMERA_LOCKED) ) { - ok_to_read_ci_pitch_yaw=0; + ok_to_read_ci_pitch_yaw = false; } - do_view_external(frame_time); do_thrust_keys(ci); - slew_active=0; + freelook_mode_active = false; + } else if ( Viewer_mode & VM_CHASE ) { do_view_chase(frame_time); - slew_active=0; - } else { // We're in the cockpit. - if (view_centering) { + freelook_mode_active = false; + + } else { + // We're in the cockpit. + if ( view_is_centering ) { // If we're centering the view, check to see if we're actually centered and bypass any view modifications // until the view has finally been centered. - if ((Viewer_slew_angles.h == 0.0f) && (Viewer_slew_angles.p == 0.0f)) { - view_centering = 0; // if the view has been centered, allow the player to freelook again. + if ( (Viewer_slew_angles.h == 0.0f) && (Viewer_slew_angles.p == 0.0f) ) { + view_is_centering = false; // if the view has been centered, allow the player to freelook again. } - slew_active = 0; - } else if ( Viewer_mode & VM_TRACK ) { // Player's vision will track current target. + freelook_mode_active = false; + + } else if ( Viewer_mode & VM_TRACK ) { + // Player's vision will track current target. do_view_track_target(frame_time); + } else { - // The Center View command check is here because - // we don't want the player centering the view in target padlock mode - if (check_control_timef(VIEW_CENTER) && !view_centering) { - view_centering = 1; - slew_active = 0; - } - do_view_slew(frame_time); + // We're not centering the view currently, nor are we tracking any targets + if ( check_control_timef(VIEW_SLEW) ) { + // Enable slewing/freelook mode + freelook_mode_active = true; + ok_to_read_ci_pitch_yaw = false; - // Orthogonal padlock views moved here in order to get the springy chase effect when transitioning. - player_set_padlock_state(); - + } else if ( check_control_timef(VIEW_CENTER) || freelook_mode_active ) { + // Start centering the view if the VIEW_CENTER control was active, or the player previously used freelook mode + view_is_centering = true; + // ok_to_read_ci_pitch_yaw = true; // This is already handled by initialization + freelook_mode_active = false; + } // Else, do nothing } + do_view_slew(frame_time); + // Orthogonal padlock views moved here in order to get the springy chase effect when transitioning. + player_set_padlock_state(); } - + if ( ok_to_read_ci_pitch_yaw ) { - // From keyboard... do_thrust_keys(ci); + // Bank and Yaw controls (Keyboard) if ( check_control(BANK_WHEN_PRESSED) ) { ci->bank = check_control_timef(BANK_LEFT) + check_control_timef(YAW_LEFT) - check_control_timef(YAW_RIGHT) - check_control_timef(BANK_RIGHT); ci->heading = 0.0f; + } else { kh = (check_control_timef(YAW_RIGHT) - check_control_timef(YAW_LEFT)) / 8.0f; + if (kh == 0.0f) { ci->heading = 0.0f; @@ -472,33 +590,36 @@ if (ci->heading < 0.0f) ci->heading = 0.0f; - } else { // kh < 0 - if (ci->heading > 0.0f) + } else { + // kh < 0 + if (ci->heading > 0.0f) { ci->heading = 0.0f; + } } - ci->bank = check_control_timef(BANK_LEFT) - check_control_timef(BANK_RIGHT); } - ci->heading += kh; + kh = (check_control_timef(PITCH_FORWARD) - check_control_timef(PITCH_BACK)) / 8.0f; - kh = (check_control_timef(PITCH_FORWARD) - check_control_timef(PITCH_BACK)) / 8.0f; if (kh == 0.0f) { ci->pitch = 0.0f; + } else if (kh > 0.0f) { - if (ci->pitch < 0.0f) + if (ci->pitch < 0.0f) { ci->pitch = 0.0f; + } - } else { // kh < 0 - if (ci->pitch > 0.0f) + } else { + // kh < 0 + if (ci->pitch > 0.0f) { ci->pitch = 0.0f; + } } - ci->pitch += kh; } - if ( !slew_active ) { - // If we're not in a view that slews (ie, not a cockpit view), make the viewer slew angles spring to the center. + // If we're not in a view that slews (ie, not a cockpit view), make the viewer slew angles spring to the center. + if ( !freelook_mode_active ) { chase_slew_angles.h = 0.0f; chase_slew_angles.p = 0.0f; } @@ -506,9 +627,11 @@ chase_angles_to_value(&Viewer_slew_angles, &chase_slew_angles, centering_speed); if (!(Game_mode & GM_DEAD)) { + // Engine Controls if ( button_info_query(&Player->bi, ONE_THIRD_THROTTLE) ) { control_used(ONE_THIRD_THROTTLE); player_clear_speed_matching(); + if ( Player->ci.forward_cruise_percent < 33.3f ) { snd_play( &Snds[ship_get_sound(Player_obj, SND_THROTTLE_UP)], 0.0f ); @@ -523,6 +646,7 @@ if ( button_info_query(&Player->bi, TWO_THIRDS_THROTTLE) ) { control_used(TWO_THIRDS_THROTTLE); player_clear_speed_matching(); + if ( Player->ci.forward_cruise_percent < 66.6f ) { snd_play( &Snds[ship_get_sound(Player_obj, SND_THROTTLE_UP)], 0.0f ); @@ -537,15 +661,17 @@ if ( button_info_query(&Player->bi, PLUS_5_PERCENT_THROTTLE) ) { control_used(PLUS_5_PERCENT_THROTTLE); Player->ci.forward_cruise_percent += 5.0f; - if (Player->ci.forward_cruise_percent > 100.0f) + if (Player->ci.forward_cruise_percent > 100.0f) { Player->ci.forward_cruise_percent = 100.0f; + } } if ( button_info_query(&Player->bi, MINUS_5_PERCENT_THROTTLE) ) { control_used(MINUS_5_PERCENT_THROTTLE); Player->ci.forward_cruise_percent -= 5.0f; - if (Player->ci.forward_cruise_percent < 0.0f) + if (Player->ci.forward_cruise_percent < 0.0f) { Player->ci.forward_cruise_percent = 0.0f; + } } if ( button_info_query(&Player->bi, ZERO_THROTTLE) ) { @@ -591,8 +717,7 @@ Assert(targeted_objp->type == OBJ_SHIP); // Goober5000 - if (object_is_docked(targeted_objp)) - { + if (object_is_docked(targeted_objp)) { tspeed = dock_calc_docked_speed(targeted_objp); //changed from fspeed } } @@ -614,41 +739,49 @@ } override_analog_throttle = 1; } - - } else + } else { Player->flags &= ~PLAYER_FLAGS_MATCH_TARGET; + } } // code to read joystick axis for pitch/heading. Code to read joystick buttons // for bank. - if ( !(Game_mode & GM_DEAD) ) { + // Double check that the player didn't die during read_keyboard_controls... + if ( !(Game_mode & GM_DEAD) ) { playercontrol_read_stick(axis, frame_time); } else { axis[0] = axis[1] = axis[2] = axis[3] = axis[4] = 0; } - if (Axis_map_to[JOY_HEADING_AXIS] >= 0) { - // check the heading on the x axis - if ( check_control(BANK_WHEN_PRESSED) ) { - delta = f2fl( axis[JOY_HEADING_AXIS] ); - if ( (delta > 0.05f) || (delta < -0.05f) ) { - ci->bank -= delta; + if (ok_to_read_ci_pitch_yaw) { + if (Axis_map_to[JOY_HEADING_AXIS] >= 0) { + // Check the heading axis and apply it to either heading or bank angles + if ( check_control(BANK_WHEN_PRESSED) ) { + delta = f2fl( axis[JOY_HEADING_AXIS] ); + if ( (delta > 0.05f) || (delta < -0.05f) ) { + ci->bank -= delta; + } + } else { + ci->heading += f2fl( axis[JOY_HEADING_AXIS] ); } - } else { - ci->heading += f2fl( axis[JOY_HEADING_AXIS] ); } - } - // check the pitch on the y axis - if (Axis_map_to[JOY_PITCH_AXIS] >= 0) { - ci->pitch -= f2fl( axis[JOY_PITCH_AXIS] ); + // Check the pitch axis + if (Axis_map_to[JOY_PITCH_AXIS] >= 0) { + ci->pitch -= f2fl( axis[JOY_PITCH_AXIS] ); + } + } else { + // We're in slew mode, so stop rotating the player craft before the pilot becomes billious + ci->pitch = 0.0f; + ci->heading = 0.0f; } + // Check the bank axis if (Axis_map_to[JOY_BANK_AXIS] >= 0) { ci->bank -= f2fl( axis[JOY_BANK_AXIS] ) * 1.5f; } - // axis 2 is for throttle + // Check the absolute throttle axis if (Axis_map_to[JOY_ABS_THROTTLE_AXIS] >= 0) { scaled = (float) axis[JOY_ABS_THROTTLE_AXIS] * 1.2f / (float) F1_0 - 0.1f; // convert to -0.1 - 1.1 range oldspeed = ci->forward_cruise_percent; @@ -663,13 +796,19 @@ } } - if (Axis_map_to[JOY_REL_THROTTLE_AXIS] >= 0) + // Check the relative throttle axis + if (Axis_map_to[JOY_REL_THROTTLE_AXIS] >= 0) { ci->forward_cruise_percent += f2fl(axis[JOY_REL_THROTTLE_AXIS]) * 100.0f * frame_time; + } - if ( ci->forward_cruise_percent > 100.0f ) + // Saturate speed to be within 0 to 100% + if ( ci->forward_cruise_percent > 100.0f ) { ci->forward_cruise_percent = 100.0f; - if ( ci->forward_cruise_percent < 0.0f ) + } + + if ( ci->forward_cruise_percent < 0.0f ) { ci->forward_cruise_percent = 0.0f; + } // set up the firing stuff. Read into control info ala Descent so that weapons will be // created during the object simulation phase, and not immediately as was happening before. @@ -688,11 +827,11 @@ #endif // keyboard: fire the current secondary weapon - if (check_control(FIRE_SECONDARY)) { + if (check_control(FIRE_SECONDARY)){ ci->fire_secondary_count++; // if we're a multiplayer client, set our accum bits now - if( MULTIPLAYER_CLIENT && (Net_player != NULL)){ + if( MULTIPLAYER_CLIENT && (Net_player != NULL)) { Net_player->s_info.accum_buttons |= OOC_FIRE_SECONDARY; } } @@ -718,9 +857,9 @@ afterburner_last = 1; } else { - if (afterburner_last) + if (afterburner_last) { ci->afterburner_stop = 1; - + } afterburner_last = 0; } @@ -729,6 +868,7 @@ // Check for toggle button pressed. if ( button_info_query(&Player->bi, TOGGLE_GLIDING) ) { control_used(TOGGLE_GLIDING); + if ( Player_obj != NULL && Ship_info[Player_ship->ship_info_index].can_glide ) { toggle_glide = !toggle_glide; } @@ -779,7 +919,7 @@ } } else { // Probably don't need to do the second half of this check, but just in case... - if ( Player_obj != NULL && Ship_info[Player_ship->ship_info_index].can_glide ) { + if ( Player_obj != NULL && Ship_info[Player_ship->ship_info_index].can_glide ){ // Only bother doing this if we need to. if ( object_get_gliding(Player_obj) && !object_glide_forced(Player_obj) ) { object_set_gliding(Player_obj, false); @@ -794,14 +934,13 @@ } } } - } if ( (Viewer_mode & VM_EXTERNAL) ) { if ( !(Viewer_mode & VM_EXTERNAL_CAMERA_LOCKED) ) { - ci->heading=0.0f; - ci->pitch=0.0f; - ci->bank=0.0f; + ci->heading = 0.0f; + ci->pitch = 0.0f; + ci->bank = 0.0f; } } }