Sync with latest JSBSim CVS

[flightgear.git] / src / Main / viewer.cxx

diff --git a/src/Main/viewer.cxx b/src/Main/viewer.cxx
index 4922be6a020a594a13168dd69fd6080c2187b3b3..b723733ffd771c25d8ab8ae2b3c52a426a694cc3 100644 (file)
--- a/src/Main/viewer.cxx
+++ b/src/Main/viewer.cxx
@@ -28,67 +28,29 @@
 #  include <config.h>
 #endif
 
-#include <plib/ssg.h>          // plib include
-
-#include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/point3d.hxx>
-#include <simgear/math/polar3d.hxx>
-#include <simgear/math/vector.hxx>
+#include <simgear/constants.h>
 
-#include "globals.hxx"
 #include "viewer.hxx"
 
 
 // Constructor
-FGViewer::FGViewer( void )
-{
-}
-
-
-#define USE_FAST_VIEWROT
-#ifdef USE_FAST_VIEWROT
-// VIEW_ROT = LARC_TO_SSG * ( VIEWo * VIEW_OFFSET )
-// This takes advantage of the fact that VIEWo and VIEW_OFFSET
-// only have entries in the upper 3x3 block
-// and that LARC_TO_SSG is just a shift of rows   NHV
-inline static void fgMakeViewRot( sgMat4 dst, const sgMat4 m1, const sgMat4 m2 )
+FGViewer::FGViewer( void ):
+    fov(55.0),
+    view_offset(0.0),
+    goal_view_offset(0.0)
 {
-    for ( int j = 0 ; j < 3 ; j++ ) {
-       dst[2][j] = m2[0][0] * m1[0][j] +
-           m2[0][1] * m1[1][j] +
-           m2[0][2] * m1[2][j];
-
-       dst[0][j] = m2[1][0] * m1[0][j] +
-           m2[1][1] * m1[1][j] +
-           m2[1][2] * m1[2][j];
-
-       dst[1][j] = m2[2][0] * m1[0][j] +
-           m2[2][1] * m1[1][j] +
-           m2[2][2] * m1[2][j];
-    }
-    dst[0][3] = 
-       dst[1][3] = 
-       dst[2][3] = 
-       dst[3][0] = 
-       dst[3][1] = 
-       dst[3][2] = SG_ZERO;
-    dst[3][3] = SG_ONE;
-}
-#endif
-
-
-// Initialize a view structure
-void FGViewer::init( void ) {
-    FG_LOG( FG_VIEW, FG_ALERT, "Shouldn't ever see this" );
-    exit(-1);
+    sgSetVec3( pilot_offset, 0.0, 0.0, 0.0 );
+    sgdZeroVec3(geod_view_pos);
+    sgdZeroVec3(abs_view_pos);
+    sea_level_radius = SG_EQUATORIAL_RADIUS_M; 
+    //a reasonable guess for init, so that the math doesn't blow up
 }
 
 
 // Update the view parameters
 void FGViewer::update() {
-    FG_LOG( FG_VIEW, FG_ALERT, "Shouldn't ever see this" );
-    exit(-1);
+    SG_LOG( SG_VIEW, SG_ALERT, "Shouldn't ever see this" );
 }