Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next
This commit is contained in:
commit
0d5d7cf6f5
1 changed files with 6 additions and 6 deletions
|
@ -289,10 +289,10 @@ void
|
||||||
FGViewer::setHeadingOffset_deg (double heading_offset_deg)
|
FGViewer::setHeadingOffset_deg (double heading_offset_deg)
|
||||||
{
|
{
|
||||||
_dirty = true;
|
_dirty = true;
|
||||||
if (_at_model && (_offset_m.x() == 0.0)&&(_offset_m.y() == 0.0))
|
if (_at_model && (_offset_m.x() == 0.0)&&(_offset_m.z() == 0.0))
|
||||||
{
|
{
|
||||||
/* avoid optical effects (e.g. rotating sky) when looking at something
|
/* avoid optical effects (e.g. rotating sky) when "looking at" with
|
||||||
* with heading offsets x==y==0 (view heading cannot change). */
|
* heading offsets x==z==0 (view heading cannot change). */
|
||||||
_heading_offset_deg = 0.0;
|
_heading_offset_deg = 0.0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -324,10 +324,10 @@ void
|
||||||
FGViewer::setGoalHeadingOffset_deg (double goal_heading_offset_deg)
|
FGViewer::setGoalHeadingOffset_deg (double goal_heading_offset_deg)
|
||||||
{
|
{
|
||||||
_dirty = true;
|
_dirty = true;
|
||||||
if (_at_model && (_offset_m.x() == 0.0)&&(_offset_m.y() == 0.0))
|
if (_at_model && (_offset_m.x() == 0.0)&&(_offset_m.z() == 0.0))
|
||||||
{
|
{
|
||||||
/* avoid optical effects (e.g. rotating sky) when looking at something
|
/* avoid optical effects (e.g. rotating sky) when "looking at" with
|
||||||
* with heading offsets x==y==0 (view heading cannot change). */
|
* heading offsets x==z==0 (view heading cannot change). */
|
||||||
_goal_heading_offset_deg = 0.0;
|
_goal_heading_offset_deg = 0.0;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue