X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fviewer.cxx;h=8dcfb982dbf5f4913eb0c573e2d9e55019293c7d;hb=7cde2e800bccd4883f03eceb5283add24755b377;hp=d05e8274ca4ef107996deed1ebd09f3297e4440a;hpb=19331f2813b0c20528a975a7061e7ecd1c29d2ab;p=flightgear.git diff --git a/src/Main/viewer.cxx b/src/Main/viewer.cxx index d05e8274c..8dcfb982d 100644 --- a/src/Main/viewer.cxx +++ b/src/Main/viewer.cxx @@ -31,14 +31,8 @@ #include "fg_props.hxx" -#ifdef HAVE_CONFIG_H -# include -#endif - #include #include -#include -#include #include #include @@ -67,12 +61,6 @@ FGViewer::FGViewer( fgViewType Type, bool from_model, int from_model_index, 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), - _alt_ft(0), - _target_lon_deg(0), - _target_lat_deg(0), - _target_alt_ft(0), _roll_deg(0), _pitch_deg(0), _heading_deg(0), @@ -81,6 +69,7 @@ FGViewer::FGViewer( fgViewType Type, bool from_model, int from_model_index, _damp_pitch(0), _damp_heading(0), _scaling_type(FG_SCALING_MAX), + _aspect_ratio(0), _cameraGroup(CameraGroup::getDefault()) { _absolute_view_pos = SGVec3d(0, 0, 0); @@ -157,64 +146,18 @@ FGViewer::setInternal ( bool internal ) _internal = internal; } -void -FGViewer::setLongitude_deg (double lon_deg) -{ - _dirty = true; - _lon_deg = lon_deg; -} - -void -FGViewer::setLatitude_deg (double lat_deg) -{ - _dirty = true; - _lat_deg = lat_deg; -} - -void -FGViewer::setAltitude_ft (double alt_ft) -{ - _dirty = true; - _alt_ft = alt_ft; -} - void FGViewer::setPosition (double lon_deg, double lat_deg, double alt_ft) { _dirty = true; - _lon_deg = lon_deg; - _lat_deg = lat_deg; - _alt_ft = alt_ft; -} - -void -FGViewer::setTargetLongitude_deg (double lon_deg) -{ - _dirty = true; - _target_lon_deg = lon_deg; -} - -void -FGViewer::setTargetLatitude_deg (double lat_deg) -{ - _dirty = true; - _target_lat_deg = lat_deg; -} - -void -FGViewer::setTargetAltitude_ft (double alt_ft) -{ - _dirty = true; - _target_alt_ft = alt_ft; + _position = SGGeod::fromDegFt(lon_deg, lat_deg, alt_ft); } void FGViewer::setTargetPosition (double lon_deg, double lat_deg, double alt_ft) { _dirty = true; - _target_lon_deg = lon_deg; - _target_lat_deg = lat_deg; - _target_alt_ft = alt_ft; + _target = SGGeod::fromDegFt(lon_deg, lat_deg, alt_ft); } void @@ -414,17 +357,13 @@ FGViewer::recalcLookFrom () // Update location data ... if ( _from_model ) { SGModelPlacement* placement = globals->get_aircraft_model()->get3DModel(); - _lat_deg = placement->getLatitudeDeg(); - _lon_deg = placement->getLongitudeDeg(); - _alt_ft = placement->getElevationFt(); - + _position = placement->getPosition(); + _heading_deg = placement->getHeadingDeg(); _pitch_deg = placement->getPitchDeg(); _roll_deg = placement->getRollDeg(); } - double lat = _lat_deg; - double lon = _lon_deg; - double alt = _alt_ft; + double head = _heading_deg; double pitch = _pitch_deg; double roll = _roll_deg; @@ -433,28 +372,31 @@ FGViewer::recalcLookFrom () dampEyeData(roll, pitch, head); } - // 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); + // the horizontal local frame + SGQuatd hlOr = SGQuatd::fromLonLat(_position); - // the rotation from the horizontal local frame to the basic view orientation + // The rotation from the horizontal local frame to the basic view orientation SGQuatd hlToBody = SGQuatd::fromYawPitchRollDeg(head, pitch, roll); - hlToBody = SGQuatd::simToView(hlToBody); - // 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)); + // The rotation offset, don't know why heading is negative here ... + mViewOffsetOr + = 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 cartesian position of the basic view coordinate + SGVec3d position = SGVec3d::fromGeod(_position); + + // This is rotates the x-forward, y-right, z-down coordinate system the where + // simulation runs into the OpenGL camera system with x-right, y-up, z-back. + SGQuatd q(-0.5, -0.5, 0.5, 0.5); + + _absolute_view_pos = position + (ec2body*q).backTransform(_offset_m); + mViewOrientation = ec2body*mViewOffsetOr*q; } void @@ -463,9 +405,7 @@ FGViewer::recalcLookAt () // The geodetic position of our target to look at if ( _at_model ) { SGModelPlacement* placement = globals->get_aircraft_model()->get3DModel(); - _target_lat_deg = placement->getLatitudeDeg(); - _target_lon_deg = placement->getLongitudeDeg(); - _target_alt_ft = placement->getElevationFt(); + _target = placement->getPosition(); _target_heading_deg = placement->getHeadingDeg(); _target_pitch_deg = placement->getPitchDeg(); _target_roll_deg = placement->getRollDeg(); @@ -474,20 +414,16 @@ FGViewer::recalcLookAt () dampEyeData(_target_roll_deg, _target_pitch_deg, _target_heading_deg); } - SGGeod geodTargetPos = SGGeod::fromDegFt(_target_lon_deg, - _target_lat_deg, - _target_alt_ft); + SGQuatd geodTargetOr = SGQuatd::fromYawPitchRollDeg(_target_heading_deg, _target_pitch_deg, _target_roll_deg); - SGQuatd geodTargetHlOr = SGQuatd::fromLonLat(geodTargetPos); + SGQuatd geodTargetHlOr = SGQuatd::fromLonLat(_target); if ( _from_model ) { SGModelPlacement* placement = globals->get_aircraft_model()->get3DModel(); - _lat_deg = placement->getLatitudeDeg(); - _lon_deg = placement->getLongitudeDeg(); - _alt_ft = placement->getElevationFt(); + _position = placement->getPosition(); _heading_deg = placement->getHeadingDeg(); _pitch_deg = placement->getPitchDeg(); _roll_deg = placement->getRollDeg(); @@ -495,24 +431,23 @@ FGViewer::recalcLookAt () // update from our own data, just the rotation here... dampEyeData(_roll_deg, _pitch_deg, _heading_deg); } - SGGeod geodEyePos = SGGeod::fromDegFt(_lon_deg, _lat_deg, _alt_ft); SGQuatd geodEyeOr = SGQuatd::fromYawPitchRollDeg(_heading_deg, _pitch_deg, _roll_deg); - SGQuatd geodEyeHlOr = SGQuatd::fromLonLat(geodEyePos); + SGQuatd geodEyeHlOr = SGQuatd::fromLonLat(_position); // the rotation offset, don't know why heading is negative here ... - SGQuatd eyeOffsetOr = + mViewOffsetOr = 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); + SGVec3d eyeCart = SGVec3d::fromGeod(_position); + eyeCart += (ec2eye*mViewOffsetOr).backTransform(eyeOff); - SGVec3d atCart = SGVec3d::fromGeod(geodTargetPos); + SGVec3d atCart = SGVec3d::fromGeod(_target); // add target offsets to at_position... SGVec3d target_pos_off(-_target_offset_m.z(), _target_offset_m.x(), @@ -529,8 +464,10 @@ FGViewer::recalcLookAt () 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 + // rotate -dir to the 2-th unit vector + // rotate up to 1-th unit vector + // Note that this matches the OpenGL camera coordinate system + // with x-right, y-up, z-back. mViewOrientation = SGQuatd::fromRotateTo(-dir, 2, up, 1); } @@ -722,6 +659,6 @@ FGViewer::update (double dt) } } recalc(); - _cameraGroup->update(_absolute_view_pos.osg(), mViewOrientation.osg()); + _cameraGroup->update(toOsg(_absolute_view_pos), toOsg(mViewOrientation)); _cameraGroup->setCameraParameters(get_v_fov(), get_aspect_ratio()); }