Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message

[flightgear.git] / Main / views.h

diff --git a/Main/views.h b/Main/views.h
index 6df74ec5f6a0397b212ca0551a5b56e85dc69fd0..a7b4bdfb9b9078e032d76d0c70ecc771ee8d17cc 100644 (file)
--- a/Main/views.h
+++ b/Main/views.h
@@ -24,20 +24,54 @@
  **************************************************************************/
 
 
-#ifndef VIEWS_H
-#define VIEWS_H
+#ifndef _VIEWS_H
+#define _VIEWS_H
 
 
-#include "../types.h"
-#include "../Flight/flight.h"
-#include "../Math/mat3.h"
+#include <Include/fg_types.h>
+#include <Flight/flight.h>
+#include <Math/mat3.h>
+#include <Time/fg_time.h>
 
 
 /* Define a structure containing view information */
 struct fgVIEW {
+    /* view position translated to scenery.center */
     struct fgCartesianPoint view_pos;
-    MAT3vec local_up, view_up, view_forward;
-    double view_offset, goal_view_offset;
+
+    /* cartesion coordinates of current lon/lat if at sea level
+     * translated to scenery.center*/
+    struct fgCartesianPoint cur_zero_elev;
+
+    /* vector in cartesian coordinates from current position to the
+     * postion on the earth's surface the sun is directly over */
+    MAT3vec to_sun;
+    
+    /* surface direction to go to head towards sun */
+    MAT3vec surface_to_sun;
+
+    /* surface vector heading south */
+    MAT3vec surface_south;
+
+    /* surface vector heading east (used to unambiguously align sky with sun) */
+    MAT3vec surface_east;
+
+    /* local up vector (normal to the plane tangent to the earth's
+     * surface at the spot we are directly above */
+    MAT3vec local_up;
+
+    /* up vector for the view (usually point straight up through the
+     * top of the aircraft */
+    MAT3vec view_up;
+
+    /* the vector pointing straight out the nose of the aircraft */
+    MAT3vec view_forward;
+
+    /* the current offset from forward for viewing */
+    double view_offset;
+
+    /* the goal view offset for viewing (used for smooth view changes) */
+    double goal_view_offset;
 };
 
 
@@ -48,17 +82,38 @@ extern struct fgVIEW current_view;
 void fgViewInit(struct fgVIEW *v);
 
 /* Update the view parameters */
-void fgViewUpdate(struct fgFLIGHT *f, struct fgVIEW *v);
+void fgViewUpdate(struct fgFLIGHT *f, struct fgVIEW *v, struct fgLIGHT *l);
 
 
-#endif /* VIEWS_H */
+#endif /* _VIEWS_H */
 
 
 /* $Log$
-/* Revision 1.2  1997/12/10 22:37:48  curt
-/* Prepended "fg" on the name of all global structures that didn't have it yet.
-/* i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+/* Revision 1.8  1998/01/27 00:47:58  curt
+/* Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
+/* system and commandline/config file processing code.
 /*
+ * Revision 1.7  1998/01/22 02:59:38  curt
+ * Changed #ifdef FILE_H to #ifdef _FILE_H
+ *
+ * Revision 1.6  1998/01/19 19:27:10  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.5  1997/12/22 04:14:32  curt
+ * Aligned sky with sun so dusk/dawn effects can be correct relative to the sun.
+ *
+ * Revision 1.4  1997/12/17 23:13:36  curt
+ * Began working on rendering a sky.
+ *
+ * Revision 1.3  1997/12/15 23:54:51  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
+ * Revision 1.2  1997/12/10 22:37:48  curt
+ * Prepended "fg" on the name of all global structures that didn't have it yet.
+ * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+ *
  * Revision 1.1  1997/08/27 21:31:18  curt
  * Initial revision.
  *