mat3[0][1] = tmp * axis3[1] + s * axis3[2] ;
mat3[0][2] = tmp * axis3[2] - s * axis3[1] ;
- tmp = t * axis2[1];
+ tmp = t * axis3[1];
mat3[1][0] = tmp * axis3[0] - s * axis3[2] ;
mat3[1][1] = tmp * axis3[1] + c ;
mat3[1][2] = tmp * axis3[2] + s * axis3[0] ;
return _relative_view_pos;
}
-float *
-FGViewer::getZeroElevViewPos ()
-{
- if (_dirty)
- recalc();
- return _zero_elev_view_pos;
-}
-
void
FGViewer::updateFromModelLocation (SGLocation * location)
{
- Point3D center = globals->get_scenery()->get_next_center();
- sgCopyMat4(LOCAL, location->getTransformMatrix(center));
+ sgCopyMat4(LOCAL, location->getTransformMatrix());
}
void
FGViewer::updateAtModelLocation (SGLocation * location)
{
- Point3D center = globals->get_scenery()->get_next_center();
- sgCopyMat4(ATLOCAL, location->getTransformMatrix(center));
+ sgCopyMat4(ATLOCAL, location->getTransformMatrix());
}
void
dampEyeData(roll_deg, pitch_deg, heading_deg);
location->setPosition( lon_deg, lat_deg, alt_ft );
location->setOrientation( roll_deg, pitch_deg, heading_deg );
- Point3D center = globals->get_scenery()->get_next_center();
- sgCopyMat4(LOCAL, location->getTransformMatrix(center));
-}
-
-void
-FGViewer::set_scenery_center(const Point3D& center)
-{
- _location->set_tile_center(center);
- _location->getTransformMatrix(center);
- if (_type == FG_LOOKAT) {
- _target_location->set_tile_center(center);
- _target_location->getTransformMatrix(center);
- }
- set_dirty();
+ sgCopyMat4(LOCAL, location->getTransformMatrix());
}
// recalc() is done every time one of the setters is called (making the
Point3D center = globals->get_scenery()->get_next_center();
sgdVec3 dVec3;
sgdSetVec3(dVec3, center[0], center[1], center[2]);
- sgdSubVec3(dVec3,
- _target_location->get_absolute_view_pos(center),
- dVec3 );
+ sgdSubVec3(dVec3, _target_location->get_absolute_view_pos(), dVec3 );
sgSetVec3(at_pos, dVec3[0], dVec3[1], dVec3[2]);
// Update location data for eye...
_roll_deg, _pitch_deg, _heading_deg );
}
// save the eye positon...
- sgCopyVec3(eye_pos, _location->get_view_pos());
+ sgCopyVec3(eye_pos, _location->get_view_pos(center));
// copy data from location class to local items...
copyLocationData();
void
FGViewer::copyLocationData()
{
+ Point3D center = globals->get_scenery()->get_center();
// Get our friendly vectors from the eye location...
- sgdCopyVec3(_absolute_view_pos,
- _location->get_absolute_view_pos(globals->get_scenery()->get_next_center()));
- sgCopyVec3(_zero_elev_view_pos, _location->get_zero_elev());
- sgCopyVec3(_relative_view_pos, _location->get_view_pos());
+ sgdCopyVec3(_absolute_view_pos, _location->get_absolute_view_pos());
+ sgCopyVec3(_relative_view_pos, _location->get_view_pos(center));
sgCopyMat4(UP, _location->getCachedUpMatrix());
sgCopyVec3(_world_up, _location->get_world_up());
// these are the vectors that the sun and moon code like to get...
}
// copy coordinates to outputs for viewer...
- sgCopyVec3(_zero_elev, _zero_elev_view_pos);
+ sgCopyVec3(_zero_elev, _relative_view_pos);
+ sgAddScaledVec3(_zero_elev, _world_up, -_alt_ft*SG_FEET_TO_METER);
sgCopyVec3(_view_pos, _relative_view_pos);
}