C++-ifying.

[flightgear.git] / Time / fg_time.hxx

diff --git a/Time/fg_time.hxx b/Time/fg_time.hxx
index 45e37ee906d14a9597e14f3916c4d9d22d5d5c73..10a1608fd27905b1998c97ae1b3cbf243ea48c77 100644 (file)
--- a/Time/fg_time.hxx
+++ b/Time/fg_time.hxx
@@ -43,12 +43,11 @@
 #include <GL/glut.h>
 #include <time.h>
 
-#include <Include/fg_types.h>
-#include <Flight/flight.h>
+#include <Flight/flight.hxx>
 
 
 // Define a structure containing global time parameters
-struct fgTIME {
+typedef struct {
     // the date/time in various forms
     // Unix "calendar" time in seconds
     time_t cur_time;
@@ -80,12 +79,15 @@ struct fgTIME {
     // How much to change the value of warp each iteration.  Allows us
     // to make time progress faster than normal.
     long int warp_delta; 
-};
 
-extern struct fgTIME cur_time_params;
+    // Paused (0 = no, 1 = yes)
+    int pause;
+} fgTIME;
 
+extern fgTIME cur_time_params;
 
-typedef struct fg_timestamp_t {
+
+typedef struct {
     long seconds;
     long millis;
 } fg_timestamp;
@@ -103,18 +105,44 @@ long timediff(fg_timestamp *first, fg_timestamp *last);
 void timesum(fg_timestamp *res, fg_timestamp *start, long millis);
 
 
-// Initialize the time dependent variables
-void fgTimeInit(struct fgTIME *t);
+// Update time variables such as gmt, julian date, and sidereal time
+void fgTimeInit(fgTIME *t);
 
 
 // Update the time dependent variables
-void fgTimeUpdate(fgFLIGHT *f, struct fgTIME *t);
+void fgTimeUpdate(fgFLIGHT *f, fgTIME *t);
 
 
 #endif // _FG_TIME_HXX
 
 
 // $Log$
+// Revision 1.8  1998/10/16 23:28:00  curt
+// C++-ifying.
+//
+// Revision 1.7  1998/10/16 00:56:09  curt
+// Converted to Point3D class.
+//
+// Revision 1.6  1998/07/27 18:42:22  curt
+// Added a pause option.
+//
+// Revision 1.5  1998/05/22 21:14:54  curt
+// Rewrote event.cxx in C++ as a class using STL for the internal event list
+// and run queue this removes the arbitrary list sizes and makes things much
+// more dynamic.  Because this is C++-classified we can now have multiple
+// event_tables if we'd ever want them.
+//
+// Revision 1.4  1998/04/28 01:22:17  curt
+// Type-ified fgTIME and fgVIEW.
+//
+// Revision 1.3  1998/04/25 22:06:34  curt
+// Edited cvs log messages in source files ... bad bad bad!
+//
+// Revision 1.2  1998/04/25 20:24:03  curt
+// Cleaned up initialization sequence to eliminate interdependencies
+// between sun position, lighting, and view position.  This creates a
+// valid single pass initialization path.
+//
 // Revision 1.1  1998/04/24 00:52:28  curt
 // Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
 // Fog color fixes.
@@ -143,7 +171,7 @@ void fgTimeUpdate(fgFLIGHT *f, struct fgTIME *t);
 // <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
+// Incorporated Paul Bleisch's <pbleisch@acm.org> new debug message
 // system and commandline/config file processing code.
 //
 // Revision 1.14  1998/01/22 02:59:43  curt