fly/flightgear
1
0
Fork 0
Code Activity

src/Viewer/view.*: avoid confusing zooming artifacts in Tower View AGL mode.

Browse source 
Un-caching of scenery appears to happen fairly often, and means that we fail
to find height of ground under aircraft, so we now go back to the last found
value instead of using zero.
This commit is contained in:
Julian Smith 2019-08-09 12:47:06 +01:00
parent e3b3f40f0a
commit a89fbc40aa
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Viewer/view.cxx
View file

@ -74,6 +74,7 @@ View::View( ViewType Type, bool from_model, int from_model_index,
_target_pitch_deg(0),
_target_heading_deg(0),
_lookat_agl_damping(lookat_agl_damping /*damping*/, 0 /*min*/, 0 /*max*/),
_lookat_agl_ground_altitude(0),
_scaling_type(FG_SCALING_MAX)
{
_absolute_view_pos = SGVec3d(0, 0, 0);
@ -825,10 +826,18 @@ void View::handleAGL()
target_plus.setElevationM(target_plus.getElevationM() + 1);
bool ok = globals->get_scenery()->get_elevation_m(target_plus, ground_altitude, &material);
if (!ok)
{
/* Just in case get_elevation_m() fails, we may as well use sea level. */
ground_altitude = 0;
if (ok) {
_lookat_agl_ground_altitude = ground_altitude;
}
else {
/* get_elevation_m() can fail if scenery has been un-cached, which
appears to happen quite often with remote multiplayer aircraft, so we
preserve the previous ground altitude to give some consistency and avoid
confusing zooming when switching between views.
[Might be better to have per-aircraft state too, so that switching
between multiplayer aircraft doesn't cause zooming.] */
ground_altitude = _lookat_agl_ground_altitude;
SG_LOG(SG_VIEW, SG_DEBUG, "get_elevation_m() failed. _target=" << _target << "\n");
}
@ -877,6 +886,7 @@ void View::handleAGL()
/* Damping of relative_height_ground can result in it being
temporarily above the aircraft, so we ensure the aircraft is visible.
*/
_lookat_agl_damping.reset(relative_height_ground_);
relative_height_ground = relative_height_ground_;
}
@ -1141,6 +1151,12 @@ void View::Damping::updateTarget(double& io)
io = get();
}
void View::Damping::reset(double target)
{
_target = target;
_current = target;
}
double
View::get_h_fov()
{

2
src/Viewer/view.hxx
View file

@ -350,6 +350,7 @@ private:
void update(double dt, void* id);
double get();
void updateTarget(double& io);
void reset(double target);
private:
void* _id;
@ -361,6 +362,7 @@ private:
};
Damping _lookat_agl_damping;
double _lookat_agl_ground_altitude;
// Position offsets from FDM origin. The X axis is positive
// out the tail, Y is out the right wing, and Z is positive up.