# include <config.h>
#endif
-#include <Aircraft/aircraft.h>
-#include <Debug/fg_debug.h>
+#include <Aircraft/aircraft.hxx>
+#include <Debug/logstream.hxx>
#include <Include/fg_constants.h>
#include <Math/mat3.h>
+#include <Math/point3d.hxx>
#include <Math/polar3d.hxx>
#include <Math/vector.hxx>
#include <Scenery/scenery.hxx>
// Initialize a view structure
void fgVIEW::Init( void ) {
- fgPrintf( FG_VIEW, FG_INFO, "Initializing View parameters\n");
+ FG_LOG( FG_VIEW, FG_INFO, "Initializing View parameters" );
view_offset = 0.0;
goal_view_offset = 0.0;
xglLoadIdentity();
// set up our view volume (default)
- LookAt(view_pos.x, view_pos.y, view_pos.z,
- view_pos.x + view_forward[0],
- view_pos.y + view_forward[1],
- view_pos.z + view_forward[2],
+ LookAt(view_pos.x(), view_pos.y(), view_pos.z(),
+ view_pos.x() + view_forward[0],
+ view_pos.y() + view_forward[1],
+ view_pos.z() + view_forward[2],
view_up[0], view_up[1], view_up[2]);
// look almost straight up (testing and eclipse watching)
- /* LookAt(view_pos.x, view_pos.y, view_pos.z,
- view_pos.x + view_up[0] + .001,
- view_pos.y + view_up[1] + .001,
- view_pos.z + view_up[2] + .001,
+ /* LookAt(view_pos.x(), view_pos.y(), view_pos.z(),
+ view_pos.x() + view_up[0] + .001,
+ view_pos.y() + view_up[1] + .001,
+ view_pos.z() + view_up[2] + .001,
view_up[0], view_up[1], view_up[2]); */
// lock view horizontally towards sun (testing)
- /* LookAt(view_pos.x, view_pos.y, view_pos.z,
- view_pos.x + surface_to_sun[0],
- view_pos.y + surface_to_sun[1],
- view_pos.z + surface_to_sun[2],
+ /* LookAt(view_pos.x(), view_pos.y(), view_pos.z(),
+ view_pos.x() + surface_to_sun[0],
+ view_pos.y() + surface_to_sun[1],
+ view_pos.z() + surface_to_sun[2],
view_up[0], view_up[1], view_up[2]); */
// lock view horizontally towards south (testing)
- /* LookAt(view_pos.x, view_pos.y, view_pos.z,
- view_pos.x + surface_south[0],
- view_pos.y + surface_south[1],
- view_pos.z + surface_south[2],
+ /* LookAt(view_pos.x(), view_pos.y(), view_pos.z(),
+ view_pos.x() + surface_south[0],
+ view_pos.y() + surface_south[1],
+ view_pos.z() + surface_south[2],
view_up[0], view_up[1], view_up[2]); */
// set the sun position
// Update the view parameters
void fgVIEW::UpdateViewMath( fgFLIGHT *f ) {
- fgPoint3d p;
+ Point3D p;
MAT3vec vec, forward, v0, minus_z;
MAT3mat R, TMP, UP, LOCAL, VIEW;
double ntmp;
update_fov = false;
}
- scenery.center.x = scenery.next_center.x;
- scenery.center.y = scenery.next_center.y;
- scenery.center.z = scenery.next_center.z;
+ scenery.center = scenery.next_center;
// printf("scenery center = %.2f %.2f %.2f\n", scenery.center.x,
// scenery.center.y, scenery.center.z);
// calculate the cartesion coords of the current lat/lon/0 elev
- p.lon = FG_Longitude;
- p.lat = FG_Lat_geocentric;
- p.radius = FG_Sea_level_radius * FEET_TO_METER;
+ p = Point3D( FG_Longitude,
+ FG_Lat_geocentric,
+ FG_Sea_level_radius * FEET_TO_METER );
- cur_zero_elev = fgPolarToCart3d(p);
-
- cur_zero_elev.x -= scenery.center.x;
- cur_zero_elev.y -= scenery.center.y;
- cur_zero_elev.z -= scenery.center.z;
+ cur_zero_elev = fgPolarToCart3d(p) - scenery.center;
// calculate view position in current FG view coordinate system
// p.lon & p.lat are already defined earlier, p.radius was set to
// the sea level radius, so now we add in our altitude.
if ( FG_Altitude * FEET_TO_METER >
(scenery.cur_elev + 0.5 * METER_TO_FEET) ) {
- p.radius += FG_Altitude * FEET_TO_METER;
+ p.setz( p.radius() + FG_Altitude * FEET_TO_METER );
} else {
- p.radius += scenery.cur_elev + 0.5 * METER_TO_FEET;
+ p.setz( p.radius() + scenery.cur_elev + 0.5 * METER_TO_FEET );
}
abs_view_pos = fgPolarToCart3d(p);
+ view_pos = abs_view_pos - scenery.center;
- view_pos.x = abs_view_pos.x - scenery.center.x;
- view_pos.y = abs_view_pos.y - scenery.center.y;
- view_pos.z = abs_view_pos.z - scenery.center.z;
-
- fgPrintf( FG_VIEW, FG_DEBUG, "Absolute view pos = %.4f, %.4f, %.4f\n",
- abs_view_pos.x, abs_view_pos.y, abs_view_pos.z);
- fgPrintf( FG_VIEW, FG_DEBUG, "Relative view pos = %.4f, %.4f, %.4f\n",
- view_pos.x, view_pos.y, view_pos.z);
+ FG_LOG( FG_VIEW, FG_DEBUG, "Absolute view pos = "
+ << abs_view_pos.x() << ", "
+ << abs_view_pos.y() << ", "
+ << abs_view_pos.z() );
+ FG_LOG( FG_VIEW, FG_DEBUG, "Relative view pos = "
+ << view_pos.x() << ", " << view_pos.y() << ", " << view_pos.z() );
// Derive the LOCAL aircraft rotation matrix (roll, pitch, yaw)
// from FG_T_local_to_body[3][3]
MAT3mult_vec(view_forward, forward, TMP);
// make a vector to the current view position
- MAT3_SET_VEC(v0, view_pos.x, view_pos.y, view_pos.z);
+ MAT3_SET_VEC(v0, view_pos.x(), view_pos.y(), view_pos.z());
// Given a vector pointing straight down (-Z), map into onto the
// local plane representing "horizontal". This should give us the
// MAT3print(AIRCRAFT, stdout);
// View position in scenery centered coordinates
- MAT3_SET_HVEC(vec, view_pos.x, view_pos.y, view_pos.z, 1.0);
+ MAT3_SET_HVEC(vec, view_pos.x(), view_pos.y(), view_pos.z(), 1.0);
MAT3translate(T_view, vec);
// printf("\nTranslation matrix\n");
// MAT3print(T_view, stdout);
// Olson curt@me.umn.edu and Norman Vine nhv@yahoo.com with 'gentle
// guidance' from Steve Baker sbaker@link.com
int
-fgVIEW::SphereClip( const fgPoint3d *cp,
- const double radius )
+fgVIEW::SphereClip( const Point3D& cp, const double radius )
{
double x1, y1;
// $Log$
+// Revision 1.25 1998/11/06 21:18:15 curt
+// Converted to new logstream debugging facility. This allows release
+// builds with no messages at all (and no performance impact) by using
+// the -DFG_NDEBUG flag.
+//
+// Revision 1.24 1998/10/18 01:17:19 curt
+// Point3D tweaks.
+//
+// Revision 1.23 1998/10/17 01:34:26 curt
+// C++ ifying ...
+//
+// Revision 1.22 1998/10/16 00:54:03 curt
+// Converted to Point3D class.
+//
// Revision 1.21 1998/09/17 18:35:33 curt
// Added F8 to toggle fog and F9 to toggle texturing.
//
projects / flightgear.git / blobdiff