X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fviewer.cxx;h=af9fe455ee859d9a2a5e92159e42d1abee5191db;hb=b125315e5067b9cb2ed6c800106b9c520afb4cf1;hp=a40f8227522e044b4dcc34eaf92a2a1ba9631543;hpb=825320e8bfaf7b0e668a7bf4210ec400f54e6c0b;p=flightgear.git diff --git a/src/Main/viewer.cxx b/src/Main/viewer.cxx index a40f82275..af9fe455e 100644 --- a/src/Main/viewer.cxx +++ b/src/Main/viewer.cxx @@ -5,7 +5,7 @@ // partially rewritten by Jim Wilson jim@kelcomaine.com using interface // by David Megginson March 2002 // -// Copyright (C) 1997 - 2000 Curtis L. Olson - curt@flightgear.org +// Copyright (C) 1997 - 2000 Curtis L. Olson - http://www.flightgear.org/~curt // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as @@ -19,41 +19,53 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // // $Id$ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include +#include "fg_props.hxx" + #ifdef HAVE_CONFIG_H # include #endif #include #include -#include #include #include +#include +#include +#include
#include - -/* from lookat */ -#include -#include "globals.hxx" -/* end from lookat */ +#include #include "viewer.hxx" +#include "CameraGroup.hxx" + +using namespace flightgear; //////////////////////////////////////////////////////////////////////// // Implementation of FGViewer. //////////////////////////////////////////////////////////////////////// -// Constructor -FGViewer::FGViewer( void ): - scalingType(FG_SCALING_MAX), - fov(55.0), +// Constructor... +FGViewer::FGViewer( fgViewType Type, bool from_model, int from_model_index, + bool at_model, int at_model_index, + double damp_roll, double damp_pitch, double damp_heading, + double x_offset_m, double y_offset_m, double z_offset_m, + double heading_offset_deg, double pitch_offset_deg, + double roll_offset_deg, + double fov_deg, double aspect_ratio_multiplier, + double target_x_offset_m, double target_y_offset_m, + double target_z_offset_m, double near_m, bool internal ): _dirty(true), _lon_deg(0), _lat_deg(0), @@ -64,18 +76,49 @@ FGViewer::FGViewer( void ): _roll_deg(0), _pitch_deg(0), _heading_deg(0), - _x_offset_m(0), - _y_offset_m(0), - _z_offset_m(0), - _heading_offset_deg(0), - _pitch_offset_deg(0), - _roll_offset_deg(0), - _goal_heading_offset_deg(0.0), - _goal_pitch_offset_deg(0.0) -{ - sgdZeroVec3(_absolute_view_pos); - sea_level_radius = SG_EQUATORIAL_RADIUS_M; - //a reasonable guess for init, so that the math doesn't blow up + _damp_sync(0), + _damp_roll(0), + _damp_pitch(0), + _damp_heading(0), + _scaling_type(FG_SCALING_MAX), + _cameraGroup(CameraGroup::getDefault()) +{ + _absolute_view_pos = SGVec3d(0, 0, 0); + _type = Type; + _from_model = from_model; + _from_model_index = from_model_index; + _at_model = at_model; + _at_model_index = at_model_index; + + _internal = internal; + + if (damp_roll > 0.0) + _damp_roll = 1.0 / pow(10.0, fabs(damp_roll)); + if (damp_pitch > 0.0) + _damp_pitch = 1.0 / pow(10.0, fabs(damp_pitch)); + if (damp_heading > 0.0) + _damp_heading = 1.0 / pow(10.0, fabs(damp_heading)); + + _offset_m.x() = x_offset_m; + _offset_m.y() = y_offset_m; + _offset_m.z() = z_offset_m; + _heading_offset_deg = heading_offset_deg; + _pitch_offset_deg = pitch_offset_deg; + _roll_offset_deg = roll_offset_deg; + _goal_heading_offset_deg = heading_offset_deg; + _goal_pitch_offset_deg = pitch_offset_deg; + _goal_roll_offset_deg = roll_offset_deg; + if (fov_deg > 0) { + _fov_deg = fov_deg; + } else { + _fov_deg = 55; + } + _aspect_ratio_multiplier = aspect_ratio_multiplier; + _target_offset_m.x() = target_x_offset_m; + _target_offset_m.y() = target_y_offset_m; + _target_offset_m.z() = target_z_offset_m; + _ground_level_nearplane_m = near_m; + // a reasonable guess for init, so that the math doesn't blow up } @@ -86,13 +129,6 @@ FGViewer::~FGViewer( void ) { void FGViewer::init () { - if ( _type == FG_LOOKAT ) { - set_reverse_view_offset(true); - } - - if ( _type == FG_RPH ) { - set_reverse_view_offset(false); - } } void @@ -109,11 +145,17 @@ void FGViewer::setType ( int type ) { if (type == 0) - _type = FG_RPH; + _type = FG_LOOKFROM; if (type == 1) _type = FG_LOOKAT; } +void +FGViewer::setInternal ( bool internal ) +{ + _internal = internal; +} + void FGViewer::setLongitude_deg (double lon_deg) { @@ -204,34 +246,85 @@ FGViewer::setOrientation (double roll_deg, double pitch_deg, double heading_deg) _heading_deg = heading_deg; } +void +FGViewer::setTargetRoll_deg (double target_roll_deg) +{ + _dirty = true; + _target_roll_deg = target_roll_deg; +} + +void +FGViewer::setTargetPitch_deg (double target_pitch_deg) +{ + _dirty = true; + _target_pitch_deg = target_pitch_deg; +} + +void +FGViewer::setTargetHeading_deg (double target_heading_deg) +{ + _dirty = true; + _target_heading_deg = target_heading_deg; +} + +void +FGViewer::setTargetOrientation (double target_roll_deg, double target_pitch_deg, double target_heading_deg) +{ + _dirty = true; + _target_roll_deg = target_roll_deg; + _target_pitch_deg = target_pitch_deg; + _target_heading_deg = target_heading_deg; +} + void FGViewer::setXOffset_m (double x_offset_m) { _dirty = true; - _x_offset_m = x_offset_m; + _offset_m.x() = x_offset_m; } void FGViewer::setYOffset_m (double y_offset_m) { _dirty = true; - _y_offset_m = y_offset_m; + _offset_m.y() = y_offset_m; } void FGViewer::setZOffset_m (double z_offset_m) { _dirty = true; - _z_offset_m = z_offset_m; + _offset_m.z() = z_offset_m; +} + +void +FGViewer::setTargetXOffset_m (double target_x_offset_m) +{ + _dirty = true; + _target_offset_m.x() = target_x_offset_m; +} + +void +FGViewer::setTargetYOffset_m (double target_y_offset_m) +{ + _dirty = true; + _target_offset_m.y() = target_y_offset_m; +} + +void +FGViewer::setTargetZOffset_m (double target_z_offset_m) +{ + _dirty = true; + _target_offset_m.z() = target_z_offset_m; } void FGViewer::setPositionOffsets (double x_offset_m, double y_offset_m, double z_offset_m) { _dirty = true; - _x_offset_m = x_offset_m; - _y_offset_m = y_offset_m; - _z_offset_m = z_offset_m; + _offset_m.x() = x_offset_m; + _offset_m.y() = y_offset_m; + _offset_m.z() = z_offset_m; } void @@ -267,10 +360,10 @@ FGViewer::setGoalPitchOffset_deg (double goal_pitch_offset_deg) { _dirty = true; _goal_pitch_offset_deg = goal_pitch_offset_deg; - while ( _goal_pitch_offset_deg < -90 ) { + if ( _goal_pitch_offset_deg < -90 ) { _goal_pitch_offset_deg = -90.0; } - while ( _goal_pitch_offset_deg > 90.0 ) { + if ( _goal_pitch_offset_deg > 90.0 ) { _goal_pitch_offset_deg = 90.0; } @@ -298,257 +391,278 @@ FGViewer::setOrientationOffsets (double roll_offset_deg, double pitch_offset_deg _heading_offset_deg = heading_offset_deg; } -double * -FGViewer::get_absolute_view_pos () -{ - if (_dirty) - recalc(); - return _absolute_view_pos; -} - -float * -FGViewer::getRelativeViewPos () -{ - if (_dirty) - recalc(); - return _relative_view_pos; -} - -float * -FGViewer::getZeroElevViewPos () -{ - if (_dirty) - recalc(); - return _zero_elev_view_pos; -} - - // recalc() is done every time one of the setters is called (making the // cached data "dirty") on the next "get". It calculates all the outputs // for viewer. void FGViewer::recalc () { - sgVec3 minus_z, right, forward, tilt; - sgMat4 VIEWo; - sgMat4 tmpROT; // temp rotation work matrices - sgVec3 tmpVec3; // temp work vector (3) - - - // The position vectors originate from the view point or target location - // depending on the type of view. - - if (_type == FG_RPH) { - recalcPositionVectors( _lon_deg, _lat_deg, _alt_ft ); + if (_type == FG_LOOKFROM) { + recalcLookFrom(); } else { - recalcPositionVectors( _target_lon_deg, _target_lat_deg, _target_alt_ft ); + recalcLookAt(); } - sgCopyVec3(zero_elev, _zero_elev_view_pos); - sgCopyVec3(view_pos, _relative_view_pos); - - if (_type == FG_LOOKAT) { - - // Make the world up rotation matrix for lookat - sgMakeRotMat4( UP, _target_lon_deg, 0.0, -_target_lat_deg ); - - // get the world up verctor from the worldup rotation matrix - sgSetVec3( world_up, UP[0][0], UP[0][1], UP[0][2] ); - - sgCopyVec3( view_up, world_up ); - - - // create offset vector - sgVec3 lookat_offset; - sgSetVec3( lookat_offset, _x_offset_m, _y_offset_m, _z_offset_m ); + set_clean(); +} - // Apply heading orientation and orientation offset to lookat_offset... - sgMakeRotMat4( tmpROT, _heading_offset_deg -_heading_deg, world_up); - sgXformVec3( lookat_offset, lookat_offset, UP ); - sgXformVec3( lookat_offset, lookat_offset, tmpROT ); +// recalculate for LookFrom view type... +void +FGViewer::recalcLookFrom () +{ + // Update location data ... + double lat, lon, alt, head, pitch, roll; + if ( _from_model ) { + SGModelPlacement* placement = globals->get_aircraft_model()->get3DModel(); + lat = placement->getLatitudeDeg(); + lon = placement->getLongitudeDeg(); + alt = placement->getElevationFt(); + + head = placement->getHeadingDeg(); + pitch = placement->getPitchDeg(); + roll = placement->getRollDeg(); + } else { + lat = _lat_deg; + lon = _lon_deg; + alt = _alt_ft; + head = _heading_deg; + pitch = _pitch_deg; + roll = _roll_deg; + } + if ( !_from_model ) { + // update from our own data... + dampEyeData(roll, pitch, head); + } - // Apply orientation offset tilt... - // FIXME: Need to get and use a "right" vector instead of 1-0-0 - sgSetVec3 (tmpVec3, 1, 0, 0); - sgMakeRotMat4( tmpROT, _pitch_offset_deg, tmpVec3 ); - sgXformPnt3( lookat_offset, lookat_offset, tmpROT ); + // The geodetic position of our base view position + SGGeod geodPos = SGGeod::fromDegFt(lon, lat, alt); + // The rotation rotating from the earth centerd frame to + // the horizontal local OpenGL frame + SGQuatd hlOr = SGQuatd::viewHL(geodPos); - // add the offsets including rotations to the coordinates - sgAddVec3( view_pos, lookat_offset ); + // the rotation from the horizontal local frame to the basic view orientation + SGQuatd hlToBody = SGQuatd::fromYawPitchRollDeg(head, pitch, roll); + hlToBody = SGQuatd::simToView(hlToBody); - // Make the VIEW matrix. - fgMakeLookAtMat4( VIEW, view_pos, view_forward, view_up ); + // The cartesian position of the basic view coordinate + SGVec3d position = SGVec3d::fromGeod(geodPos); + // the rotation offset, don't know why heading is negative here ... + SGQuatd viewOffsetOr = SGQuatd::simToView( + SGQuatd::fromYawPitchRollDeg(-_heading_offset_deg, _pitch_offset_deg, + _roll_offset_deg)); + // Compute the eyepoints orientation and position + // wrt the earth centered frame - that is global coorinates + SGQuatd ec2body = hlOr*hlToBody; + _absolute_view_pos = position + ec2body.backTransform(_offset_m); + mViewOrientation = ec2body*viewOffsetOr; +} - // the VIEW matrix includes both rotation and translation. Let's - // knock out the translation part to make the VIEW_ROT matrix - sgCopyMat4( VIEW_ROT, VIEW ); - VIEW_ROT[3][0] = VIEW_ROT[3][1] = VIEW_ROT[3][2] = 0.0; +void +FGViewer::recalcLookAt () +{ + // The geodetic position of our target to look at + SGGeod geodTargetPos; + SGQuatd geodTargetOr; + if ( _at_model ) { + SGModelPlacement* placement = globals->get_aircraft_model()->get3DModel(); + double lat = placement->getLatitudeDeg(); + double lon = placement->getLongitudeDeg(); + double alt = placement->getElevationFt(); + geodTargetPos = SGGeod::fromDegFt(lon, lat, alt); + + double head = placement->getHeadingDeg(); + double pitch = placement->getPitchDeg(); + double roll = placement->getRollDeg(); + geodTargetOr = SGQuatd::fromYawPitchRollDeg(head, pitch, roll); + } else { + dampEyeData(_target_roll_deg, _target_pitch_deg, _target_heading_deg); + + // if not model then calculate our own target position... + geodTargetPos = SGGeod::fromDegFt(_target_lon_deg, + _target_lat_deg, + _target_alt_ft); + geodTargetOr = SGQuatd::fromYawPitchRollDeg(_target_heading_deg, + _target_pitch_deg, + _target_roll_deg); + } + SGQuatd geodTargetHlOr = SGQuatd::fromLonLat(geodTargetPos); + + + SGGeod geodEyePos; + SGQuatd geodEyeOr; + if ( _from_model ) { + SGModelPlacement* placement = globals->get_aircraft_model()->get3DModel(); + double lat = placement->getLatitudeDeg(); + double lon = placement->getLongitudeDeg(); + double alt = placement->getElevationFt(); + geodEyePos = SGGeod::fromDegFt(lon, lat, alt); + + double head = placement->getHeadingDeg(); + double pitch = placement->getPitchDeg(); + double roll = placement->getRollDeg(); + geodEyeOr = SGQuatd::fromYawPitchRollDeg(head, pitch, roll); + } else { + dampEyeData(_roll_deg, _pitch_deg, _heading_deg); + // update from our own data, just the rotation here... + geodEyePos = SGGeod::fromDegFt(_lon_deg, _lat_deg, _alt_ft); + geodEyeOr = SGQuatd::fromYawPitchRollDeg(_heading_deg, + _pitch_deg, + _roll_deg); } + SGQuatd geodEyeHlOr = SGQuatd::fromLonLat(geodEyePos); - if (_type == FG_RPH) { - - // code to calculate LOCAL matrix calculated from Phi, Theta, and - // Psi (roll, pitch, yaw) in case we aren't running LaRCsim as our - // flight model - - fgMakeLOCAL( LOCAL, _pitch_deg * SG_DEGREES_TO_RADIANS, - _roll_deg * SG_DEGREES_TO_RADIANS, - -_heading_deg * SG_DEGREES_TO_RADIANS); - - // Make the world up rotation matrix for pilot view - sgMakeRotMat4( UP, _lon_deg, 0.0, -_lat_deg ); - - // get the world up verctor from the worldup rotation matrix - sgSetVec3( world_up, UP[0][0], UP[0][1], UP[0][2] ); - - // VIEWo becomes the rotation matrix with world_up incorporated - sgCopyMat4( VIEWo, LOCAL ); - sgPostMultMat4( VIEWo, UP ); - - // generate the sg view up and forward vectors - sgSetVec3( view_up, VIEWo[0][0], VIEWo[0][1], VIEWo[0][2] ); - sgSetVec3( right, VIEWo[1][0], VIEWo[1][1], VIEWo[1][2] ); - sgSetVec3( forward, VIEWo[2][0], VIEWo[2][1], VIEWo[2][2] ); - - // apply the offsets in world coordinates - sgVec3 pilot_offset_world; - sgSetVec3( pilot_offset_world, - _z_offset_m, _y_offset_m, -_x_offset_m ); - sgXformVec3( pilot_offset_world, pilot_offset_world, VIEWo ); - - // generate the view offset matrix using orientation offset (heading) - sgMakeRotMat4( VIEW_OFFSET, _heading_offset_deg, view_up ); - - // create a tilt matrix using orientation offset (pitch) - sgMat4 VIEW_TILT; - sgMakeRotMat4( VIEW_TILT, _pitch_offset_deg, right ); - sgPreMultMat4(VIEW_OFFSET, VIEW_TILT); - sgXformVec3( view_forward, forward, VIEW_OFFSET ); - SG_LOG( SG_VIEW, SG_DEBUG, "(RPH) view forward = " - << view_forward[0] << "," << view_forward[1] << "," - << view_forward[2] ); - - // VIEW_ROT = LARC_TO_SSG * ( VIEWo * VIEW_OFFSET ) - fgMakeViewRot( VIEW_ROT, VIEW_OFFSET, VIEWo ); - - sgVec3 trans_vec; - sgAddVec3( trans_vec, view_pos, pilot_offset_world ); - - // VIEW = VIEW_ROT * TRANS - sgCopyMat4( VIEW, VIEW_ROT ); - sgPostMultMat4ByTransMat4( VIEW, trans_vec ); + // the rotation offset, don't know why heading is negative here ... + SGQuatd eyeOffsetOr = + SGQuatd::fromYawPitchRollDeg(-_heading_offset_deg + 180, _pitch_offset_deg, + _roll_offset_deg); - } + // Offsets to the eye position + SGVec3d eyeOff(-_offset_m.z(), _offset_m.x(), -_offset_m.y()); + SGQuatd ec2eye = geodEyeHlOr*geodEyeOr; + SGVec3d eyeCart = SGVec3d::fromGeod(geodEyePos); + eyeCart += (ec2eye*eyeOffsetOr).backTransform(eyeOff); - // Given a vector pointing straight down (-Z), map into onto the - // local plane representing "horizontal". This should give us the - // local direction for moving "south". - sgSetVec3( minus_z, 0.0, 0.0, -1.0 ); + SGVec3d atCart = SGVec3d::fromGeod(geodTargetPos); - sgmap_vec_onto_cur_surface_plane(world_up, view_pos, minus_z, - surface_south); - sgNormalizeVec3(surface_south); + // add target offsets to at_position... + SGVec3d target_pos_off(-_target_offset_m.z(), _target_offset_m.x(), + -_target_offset_m.y()); + target_pos_off = (geodTargetHlOr*geodTargetOr).backTransform(target_pos_off); + atCart += target_pos_off; + eyeCart += target_pos_off; - // now calculate the surface east vector - sgVec3 world_down; - sgNegateVec3(world_down, world_up); - sgVectorProductVec3(surface_east, surface_south, world_down); + // Compute the eyepoints orientation and position + // wrt the earth centered frame - that is global coorinates + _absolute_view_pos = eyeCart; - set_clean(); + // the view direction + SGVec3d dir = normalize(atCart - eyeCart); + // the up directon + SGVec3d up = ec2eye.backTransform(SGVec3d(0, 0, -1)); + // rotate dir to the 0-th unit vector + // rotate up to 2-th unit vector + mViewOrientation = SGQuatd::fromRotateTo(-dir, 2, up, 1); } void -FGViewer::recalcPositionVectors (double lon_deg, double lat_deg, double alt_ft) const -{ - double sea_level_radius_m; - double lat_geoc_rad; - - - // Convert from geodetic to geocentric - // coordinates. - sgGeodToGeoc(lat_deg * SGD_DEGREES_TO_RADIANS, - alt_ft * SG_FEET_TO_METER, - &sea_level_radius_m, - &lat_geoc_rad); +FGViewer::dampEyeData(double &roll_deg, double &pitch_deg, double &heading_deg) +{ + const double interval = 0.01; + + static FGViewer *last_view = 0; + if (last_view != this) { + _damp_sync = 0.0; + _damped_roll_deg = roll_deg; + _damped_pitch_deg = pitch_deg; + _damped_heading_deg = heading_deg; + last_view = this; + return; + } - // Calculate the cartesian coordinates - // of point directly below at sea level. - // aka Zero Elevation Position - Point3D p = Point3D(lon_deg * SG_DEGREES_TO_RADIANS, - lat_geoc_rad, - sea_level_radius_m); - Point3D tmp = sgPolarToCart3d(p) - scenery.get_next_center(); - sgSetVec3(_zero_elev_view_pos, tmp[0], tmp[1], tmp[2]); + if (_damp_sync < interval) { + if (_damp_roll > 0.0) + roll_deg = _damped_roll_deg; + if (_damp_pitch > 0.0) + pitch_deg = _damped_pitch_deg; + if (_damp_heading > 0.0) + heading_deg = _damped_heading_deg; + return; + } - // Calculate the absolute view position - // in fgfs coordinates. - // aka Absolute View Position - p.setz(p.radius() + alt_ft * SG_FEET_TO_METER); - tmp = sgPolarToCart3d(p); - sgdSetVec3(_absolute_view_pos, tmp[0], tmp[1], tmp[2]); + while (_damp_sync >= interval) { + _damp_sync -= interval; + + double d; + if (_damp_roll > 0.0) { + d = _damped_roll_deg - roll_deg; + if (d >= 180.0) + _damped_roll_deg -= 360.0; + else if (d < -180.0) + _damped_roll_deg += 360.0; + roll_deg = _damped_roll_deg = roll_deg * _damp_roll + _damped_roll_deg * (1 - _damp_roll); + } - // Calculate the relative view position - // from the scenery center. - // aka Relative View Position - sgdVec3 scenery_center; - sgdSetVec3(scenery_center, - scenery.get_next_center().x(), - scenery.get_next_center().y(), - scenery.get_next_center().z()); - sgdVec3 view_pos; - sgdSubVec3(view_pos, _absolute_view_pos, scenery_center); - sgSetVec3(_relative_view_pos, view_pos); + if (_damp_pitch > 0.0) { + d = _damped_pitch_deg - pitch_deg; + if (d >= 180.0) + _damped_pitch_deg -= 360.0; + else if (d < -180.0) + _damped_pitch_deg += 360.0; + pitch_deg = _damped_pitch_deg = pitch_deg * _damp_pitch + _damped_pitch_deg * (1 - _damp_pitch); + } + if (_damp_heading > 0.0) { + d = _damped_heading_deg - heading_deg; + if (d >= 180.0) + _damped_heading_deg -= 360.0; + else if (d < -180.0) + _damped_heading_deg += 360.0; + heading_deg = _damped_heading_deg = heading_deg * _damp_heading + _damped_heading_deg * (1 - _damp_heading); + } + } } double FGViewer::get_h_fov() { - switch (scalingType) { + switch (_scaling_type) { case FG_SCALING_WIDTH: // h_fov == fov - return fov; + return _fov_deg; case FG_SCALING_MAX: - if (aspect_ratio < 1.0) { + if (_aspect_ratio < 1.0) { // h_fov == fov - return fov; + return _fov_deg; } else { // v_fov == fov - return atan(tan(fov/2 * SG_DEGREES_TO_RADIANS) / aspect_ratio) * - SG_RADIANS_TO_DEGREES * 2; + return + atan(tan(_fov_deg/2 * SG_DEGREES_TO_RADIANS) + / (_aspect_ratio*_aspect_ratio_multiplier)) + * SG_RADIANS_TO_DEGREES * 2; } default: assert(false); } + return 0.0; } + + double FGViewer::get_v_fov() { - switch (scalingType) { + switch (_scaling_type) { case FG_SCALING_WIDTH: // h_fov == fov - return atan(tan(fov/2 * SG_DEGREES_TO_RADIANS) * aspect_ratio) * - SG_RADIANS_TO_DEGREES * 2; + return + atan(tan(_fov_deg/2 * SG_DEGREES_TO_RADIANS) + * (_aspect_ratio*_aspect_ratio_multiplier)) + * SG_RADIANS_TO_DEGREES * 2; case FG_SCALING_MAX: - if (aspect_ratio < 1.0) { + if (_aspect_ratio < 1.0) { // h_fov == fov - return atan(tan(fov/2 * SG_DEGREES_TO_RADIANS) * aspect_ratio) * - SG_RADIANS_TO_DEGREES * 2; + return + atan(tan(_fov_deg/2 * SG_DEGREES_TO_RADIANS) + * (_aspect_ratio*_aspect_ratio_multiplier)) + * SG_RADIANS_TO_DEGREES * 2; } else { // v_fov == fov - return fov; + return _fov_deg; } default: assert(false); } + return 0.0; } void -FGViewer::update (int dt) +FGViewer::update (double dt) { + _damp_sync += dt; + int i; - for ( i = 0; i < dt; i++ ) { + int dt_ms = int(dt * 1000); + for ( i = 0; i < dt_ms; i++ ) { if ( fabs( _goal_heading_offset_deg - _heading_offset_deg) < 1 ) { setHeadingOffset_deg( _goal_heading_offset_deg ); break; @@ -558,45 +672,37 @@ FGViewer::update (int dt) if ( _goal_heading_offset_deg > _heading_offset_deg ) { if ( _goal_heading_offset_deg - _heading_offset_deg < 180 ){ - inc_view_offset( 0.5 ); + incHeadingOffset_deg( 0.5 ); } else { - inc_view_offset( -0.5 ); + incHeadingOffset_deg( -0.5 ); } } else { if ( _heading_offset_deg - _goal_heading_offset_deg < 180 ){ - inc_view_offset( -0.5 ); + incHeadingOffset_deg( -0.5 ); } else { - inc_view_offset( 0.5 ); + incHeadingOffset_deg( 0.5 ); } } if ( _heading_offset_deg > 360 ) { - inc_view_offset( -360 ); + incHeadingOffset_deg( -360 ); } else if ( _heading_offset_deg < 0 ) { - inc_view_offset( 360 ); + incHeadingOffset_deg( 360 ); } } } - for ( i = 0; i < dt; i++ ) { + for ( i = 0; i < dt_ms; i++ ) { if ( fabs( _goal_pitch_offset_deg - _pitch_offset_deg ) < 1 ) { setPitchOffset_deg( _goal_pitch_offset_deg ); break; } else { // move current_view.pitch_offset_deg towards - // current_view.goal_view_tilt + // current_view.goal_pitch_offset if ( _goal_pitch_offset_deg > _pitch_offset_deg ) { - if ( _goal_pitch_offset_deg - _pitch_offset_deg < 0 ){ - inc_view_tilt( 1.0 ); - } else { - inc_view_tilt( -1.0 ); - } + incPitchOffset_deg( 1.0 ); } else { - if ( _pitch_offset_deg - _goal_pitch_offset_deg < 0 ){ - inc_view_tilt( -1.0 ); - } else { - inc_view_tilt( 1.0 ); - } + incPitchOffset_deg( -1.0 ); } if ( _pitch_offset_deg > 90 ) { setPitchOffset_deg(90); @@ -605,109 +711,29 @@ FGViewer::update (int dt) } } } -} - - -void FGViewer::fgMakeLookAtMat4 ( sgMat4 dst, const sgVec3 eye, const sgVec3 center, - const sgVec3 up ) -{ - // Caveats: - // 1) In order to compute the line of sight, the eye point must not be equal - // to the center point. - // 2) The up vector must not be parallel to the line of sight from the eye - // to the center point. - - /* Compute the direction vectors */ - sgVec3 x,y,z; - - /* Y vector = center - eye */ - sgSubVec3 ( y, center, eye ) ; - - /* Z vector = up */ - sgCopyVec3 ( z, up ) ; - - /* X vector = Y cross Z */ - sgVectorProductVec3 ( x, y, z ) ; - - /* Recompute Z = X cross Y */ - sgVectorProductVec3 ( z, x, y ) ; - /* Normalize everything */ - sgNormaliseVec3 ( x ) ; - sgNormaliseVec3 ( y ) ; - sgNormaliseVec3 ( z ) ; - /* Build the matrix */ -#define M(row,col) dst[row][col] - M(0,0) = x[0]; M(0,1) = x[1]; M(0,2) = x[2]; M(0,3) = 0.0; - M(1,0) = y[0]; M(1,1) = y[1]; M(1,2) = y[2]; M(1,3) = 0.0; - M(2,0) = z[0]; M(2,1) = z[1]; M(2,2) = z[2]; M(2,3) = 0.0; - M(3,0) = eye[0]; M(3,1) = eye[1]; M(3,2) = eye[2]; M(3,3) = 1.0; -#undef M -} -/* end from lookat */ - -/* from rph */ -// VIEW_ROT = LARC_TO_SSG * ( VIEWo * VIEW_OFFSET ) -// This takes advantage of the fact that VIEWo and VIEW_OFFSET -// only have entries in the upper 3x3 block -// and that LARC_TO_SSG is just a shift of rows NHV -void FGViewer::fgMakeViewRot( sgMat4 dst, const sgMat4 m1, const sgMat4 m2 ) -{ - for ( int j = 0 ; j < 3 ; j++ ) { - dst[2][j] = m2[0][0] * m1[0][j] + - m2[0][1] * m1[1][j] + - m2[0][2] * m1[2][j]; - - dst[0][j] = m2[1][0] * m1[0][j] + - m2[1][1] * m1[1][j] + - m2[1][2] * m1[2][j]; - - dst[1][j] = m2[2][0] * m1[0][j] + - m2[2][1] * m1[1][j] + - m2[2][2] * m1[2][j]; + for ( i = 0; i < dt_ms; i++ ) { + if ( fabs( _goal_roll_offset_deg - _roll_offset_deg ) < 1 ) { + setRollOffset_deg( _goal_roll_offset_deg ); + break; + } else { + // move current_view.roll_offset_deg towards + // current_view.goal_roll_offset + if ( _goal_roll_offset_deg > _roll_offset_deg ) + { + incRollOffset_deg( 1.0 ); + } else { + incRollOffset_deg( -1.0 ); + } + if ( _roll_offset_deg > 90 ) { + setRollOffset_deg(90); + } else if ( _roll_offset_deg < -90 ) { + setRollOffset_deg( -90 ); + } } - dst[0][3] = - dst[1][3] = - dst[2][3] = - dst[3][0] = - dst[3][1] = - dst[3][2] = SG_ZERO; - dst[3][3] = SG_ONE; -} - - -void FGViewer::fgMakeLOCAL( sgMat4 dst, const double Theta, - const double Phi, const double Psi) -{ - SGfloat cosTheta = (SGfloat) cos(Theta); - SGfloat sinTheta = (SGfloat) sin(Theta); - SGfloat cosPhi = (SGfloat) cos(Phi); - SGfloat sinPhi = (SGfloat) sin(Phi); - SGfloat sinPsi = (SGfloat) sin(Psi) ; - SGfloat cosPsi = (SGfloat) cos(Psi) ; - - dst[0][0] = cosPhi * cosTheta; - dst[0][1] = sinPhi * cosPsi + cosPhi * -sinTheta * -sinPsi; - dst[0][2] = sinPhi * sinPsi + cosPhi * -sinTheta * cosPsi; - dst[0][3] = SG_ZERO; - - dst[1][0] = -sinPhi * cosTheta; - dst[1][1] = cosPhi * cosPsi + -sinPhi * -sinTheta * -sinPsi; - dst[1][2] = cosPhi * sinPsi + -sinPhi * -sinTheta * cosPsi; - dst[1][3] = SG_ZERO ; - - dst[2][0] = sinTheta; - dst[2][1] = cosTheta * -sinPsi; - dst[2][2] = cosTheta * cosPsi; - dst[2][3] = SG_ZERO; - - dst[3][0] = SG_ZERO; - dst[3][1] = SG_ZERO; - dst[3][2] = SG_ZERO; - dst[3][3] = SG_ONE ; -} - -/* end from rph */ - - + } + recalc(); + _cameraGroup->update(_absolute_view_pos.osg(), mViewOrientation.osg()); + _cameraGroup->setCameraParameters(get_v_fov(), get_aspect_ratio()); +}