Updated to support new weather subsystem (visibility variable determins

[flightgear.git] / src / Main / views.hxx

diff --git a/src/Main/views.hxx b/src/Main/views.hxx
index b15a47d9f4af2375cf6e8887243b26c05147d6cd..764f6fd2c208fb4d28bbd66d5b507c648aecefac 100644 (file)
--- a/src/Main/views.hxx
+++ b/src/Main/views.hxx
@@ -119,7 +119,7 @@ public:
     Point3D view_pos;
 
     // cartesion coordinates of current lon/lat if at sea level
-    // translated to scenery.center*/
+    // translated to scenery.center
     Point3D cur_zero_elev;
 
     // vector in cartesian coordinates from current position to the
@@ -150,6 +150,7 @@ public:
     // up vector for the view (usually point straight up through the
     // top of the aircraft
     MAT3vec view_up;
+    sgVec3 sgview_up;
 
     // the vector pointing straight out the nose of the aircraft
     MAT3vec view_forward;
@@ -160,17 +161,7 @@ public:
     // Transformation matrix for the view direction offset relative to
     // the AIRCRAFT matrix
     MAT3mat VIEW_OFFSET;
-
-    // Transformation matrix for aircraft coordinates to world
-    // coordinates
-    MAT3mat WORLD;
-
-    // Combined transformation from eye coordinates to world coordinates
-    MAT3mat EYE_TO_WORLD;
-
-    // Inverse of EYE_TO_WORLD which is a transformation from world
-    // coordinates to eye coordinates
-    MAT3mat WORLD_TO_EYE;
+    sgMat4 sgVIEW_OFFSET;
 
     // Current model view matrix;
     GLfloat MODEL_VIEW[16];
@@ -195,14 +186,6 @@ public:
     // Initialize a view class
     void Init( void );
 
-    // Basically, this is a modified version of the Mesa gluLookAt()
-    // function that's been modified slightly so we can capture the
-    // result (and use it later) otherwise this all gets calculated in
-    // OpenGL land and we don't have access to the results.
-    void LookAt( GLdouble eyex, GLdouble eyey, GLdouble eyez,
-                GLdouble centerx, GLdouble centery, GLdouble centerz,
-                GLdouble upx, GLdouble upy, GLdouble upz );
-
     // Update the view volume, position, and orientation
     void UpdateViewParams( void );
 
@@ -213,9 +196,6 @@ public:
     // Update the view parameters
     void UpdateViewMath( FGInterface *f );
 
-    // Update the "World to Eye" transformation matrix
-    void UpdateWorldToEye( FGInterface *f );
-
     // Update the field of view coefficients
     void UpdateFOV( const fgOPTIONS& o );
 
@@ -277,7 +257,6 @@ public:
     inline double *get_surface_east() { return surface_east; }
     inline double *get_local_up() { return local_up; }
     inline double *get_view_forward() { return view_forward; }
-    inline const MAT3mat *get_WORLD_TO_EYE() const { return &WORLD_TO_EYE; }
     inline GLfloat *get_MODEL_VIEW() { return MODEL_VIEW; }
 };