Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss

[flightgear.git] / Time / fg_time.h

diff --git a/Time/fg_time.h b/Time/fg_time.h
index bb734686d1285e1c43b7ae431b1fe3945a1b595f..0ac15110bae2da0ca954fd1bf6601c6b87e5f732 100644 (file)
--- a/Time/fg_time.h
+++ b/Time/fg_time.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef FG_TIME_H
-#define FG_TIME_H
+#ifndef _FG_TIME_H
+#define _FG_TIME_H
 
 
 #ifdef WIN32
@@ -35,8 +35,8 @@
 #include <GL/glut.h>
 #include <time.h>
 
-#include "../types.h"
-#include "../Flight/flight.h"
+#include <Include/fg_types.h>
+#include <Flight/flight.h>
 
 
 /* Define a structure containing global time parameters */
@@ -55,6 +55,13 @@ struct fgTIME {
                            sidereal time algorithm result and the
                            course result.  course + diff has good
                            accuracy for the short term */
+
+    long int warp;       /* An offset in seconds from the true time.
+                           Allows us to adjust the effective time of day. */
+
+    long int warp_delta; /* How much to change the value of warp each
+                           iteration.  Allows us to make time
+                           progress faster than normal. */
 };
 
 extern struct fgTIME cur_time_params;
@@ -74,8 +81,8 @@ struct fgLIGHT {
     /* Derived lighting values */
     GLfloat scene_ambient[3];           /* ambient component */
     GLfloat scene_diffuse[3];           /* diffuse component */
-    GLfloat scene_fog[4];               /* fog color */
-    GLfloat scene_clear[4];             /* clear screen color */
+    GLfloat fog_color[4];               /* fog color */
+    GLfloat sky_color[4];               /* clear screen color */
 };
 
 extern struct fgLIGHT cur_light_params;
@@ -85,16 +92,45 @@ extern struct fgLIGHT cur_light_params;
 void fgTimeInit(struct fgTIME *t);
 
 /* Update the time dependent variables */
-void fgTimeUpdate(struct FLIGHT *f, struct fgTIME *t);
+void fgTimeUpdate(fgFLIGHT *f, struct fgTIME *t);
 
 
-#endif /* FG_TIME_H */
+#endif /* _FG_TIME_H */
 
 
 /* $Log$
-/* Revision 1.8  1997/12/09 04:25:38  curt
-/* Working on adding a global lighting params structure.
+/* Revision 1.16  1998/02/07 15:29:47  curt
+/* Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+/* <chotchkiss@namg.us.anritsu.com>
 /*
+ * Revision 1.15  1998/01/27 00:48:06  curt
+ * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
+ * system and commandline/config file processing code.
+ *
+ * Revision 1.14  1998/01/22 02:59:43  curt
+ * Changed #ifdef FILE_H to #ifdef _FILE_H
+ *
+ * Revision 1.13  1998/01/19 19:27:20  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.12  1998/01/05 18:44:37  curt
+ * Add an option to advance/decrease time from keyboard.
+ *
+ * Revision 1.11  1997/12/19 23:35:07  curt
+ * Lot's of tweaking with sky rendering and lighting.
+ *
+ * Revision 1.10  1997/12/15 23:55:07  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
+ * Revision 1.9  1997/12/10 22:37:55  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  1997/12/09 04:25:38  curt
+ * Working on adding a global lighting params structure.
+ *
  * Revision 1.7  1997/11/25 19:25:41  curt
  * Changes to integrate Durk's moon/sun code updates + clean up.
  *