fly/flightgear
1
0
Fork 0
Code Activity

src/Viewer/view.cxx: Fix bad initialisation of SGVec3d's.

Browse source 
SGVec3d's default constructor leaves the fields uninitialised, which seems to
sometimes break fg with lots of NaN-related diagnostics.

The fix is to use SGVec3d::zeros() instead.

Also call resetOffsetsAndFOV() from the View::View() constructor, to ensure
that things are set up consistently.
This commit is contained in:
Julian Smith 2019-07-22 14:04:18 +01:00
parent 9a67910899
commit f666a551b3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Viewer/view.cxx
View file

@ -128,6 +128,8 @@ View::View( ViewType Type, bool from_model, int from_model_index,
_ground_level_nearplane_m = near_m; _ground_level_nearplane_m = near_m;
// a reasonable guess for init, so that the math doesn't blow up // a reasonable guess for init, so that the math doesn't blow up
resetOffsetsAndFOV();
} }
View* View::createFromProperties(SGPropertyNode_ptr config, int view_index) View* View::createFromProperties(SGPropertyNode_ptr config, int view_index)
@ -356,7 +358,7 @@ void View::resetOffsetsAndFOV()
{ {
_target_offset_m = _configTargetOffset_m; _target_offset_m = _configTargetOffset_m;
_offset_m = _configOffset_m; _offset_m = _configOffset_m;
_adjust_offset_m = SGVec3d(); _adjust_offset_m = SGVec3d::zeros();
_pitch_offset_deg = _configPitchOffsetDeg; _pitch_offset_deg = _configPitchOffsetDeg;
_heading_offset_deg = _configHeadingOffsetDeg; _heading_offset_deg = _configHeadingOffsetDeg;
_roll_offset_deg = _configRollOffsetDeg; _roll_offset_deg = _configRollOffsetDeg;
@ -981,7 +983,7 @@ View::recalcLookAt ()
SGQuatd geodTargetHlOr = SGQuatd::fromLonLat(_target); SGQuatd geodTargetHlOr = SGQuatd::fromLonLat(_target);
SGVec3d target_pos_off; SGVec3d target_pos_off;
getViewOffsets(root, _view_index, "target-", SGVec3d(), target_pos_off); getViewOffsets(root, _view_index, "target-", SGVec3d::zeros(), target_pos_off);
target_pos_off = SGVec3d( target_pos_off = SGVec3d(
-target_pos_off.z(), -target_pos_off.z(),
target_pos_off.x(), target_pos_off.x(),