Add xgl wrappers for debugging.

[flightgear.git] / Time / fg_time.c

diff --git a/Time/fg_time.c b/Time/fg_time.c
index 4b9c23075fd91d9b7ece5014fd4fec4c0b3eb825..07acaa3d82ed7c4b4aa5ab4a02f8da0e3909f7cb 100644 (file)
--- a/Time/fg_time.c
+++ b/Time/fg_time.c
@@ -29,8 +29,13 @@
 #include <stdlib.h>
 #include <time.h>
 
+#ifdef WIN32
+#include <sys/time.h> /* for gettimeofday() */
+#include <unistd.h>   /* for gettimeofday() */
+#endif
+
 #include "fg_time.h"
-#include "../constants.h"
+#include "../Include/constants.h"
 #include "../Flight/flight.h"
 #include "../Time/fg_time.h"
 
@@ -40,6 +45,7 @@
 
 
 struct fgTIME cur_time_params;
+struct fgLIGHT cur_light_params;
 
 
 /* Initialize the time dependent variables */
@@ -152,6 +158,14 @@ double sidereal_course(struct tm *gmt, time_t now, double lng) {
     long int offset;
     double diff, part, days, hours, lst;
 
+#ifdef WIN32
+    int daylight;
+    long int timezone;
+
+    struct timeval tv;
+    struct timezone tz;
+#endif
+
     printf("COURSE: GMT = %d/%d/%2d %d:%02d:%02d\n", 
            gmt->tm_mon, gmt->tm_mday, gmt->tm_year,
            gmt->tm_hour, gmt->tm_min, gmt->tm_sec);
@@ -165,6 +179,18 @@ double sidereal_course(struct tm *gmt, time_t now, double lng) {
 
     start = mktime(&mt);
 
+#ifdef WIN32
+    daylight = mt.tm_isdst;
+    gettimeofday(&tv, &tz);
+    timezone = tz.tz_minuteswest * 60;
+#endif
+
+    if ( daylight > 0 ) {
+       daylight = 1;
+    } else if ( daylight < 0 ) {
+       printf("OOOPS, big time problem in fg_time.c, no daylight savings info.\n");
+    }
+
     offset = -(timezone / 3600 - daylight);
 
     printf("Raw time zone offset = %ld\n", timezone);
@@ -200,14 +226,14 @@ double sidereal_course(struct tm *gmt, time_t now, double lng) {
 
 /* Update the time dependent variables */
 
-void fgTimeUpdate(struct FLIGHT *f, struct fgTIME *t) {
+void fgTimeUpdate(struct fgFLIGHT *f, struct fgTIME *t) {
     double gst_precise, gst_course;
     static long int warp = 0;
 
     /* get current Unix calendar time (in seconds) */
-    /* warp += 120; */
-    warp = 0;
-    t->cur_time = time(NULL);
+    /* warp = 60; */
+    warp += 0;
+    t->cur_time = time(NULL) + (0) * 60 * 60;
     t->cur_time += warp;
     printf("Current Unix calendar time = %ld  warp = %ld\n", t->cur_time, warp);
 
@@ -251,17 +277,65 @@ void fgTimeUpdate(struct FLIGHT *f, struct fgTIME *t) {
            sidereal_course(t->gmt, t->cur_time, -(FG_Longitude * RAD_TO_DEG))
            + t->gst_diff;
     }
-    printf("Current lon=0.00 Sidereal Time = %.3f\n", t->gst);
-    printf("Current LOCAL Sidereal Time = %.3f (%.3f) (diff = %.3f)\n", t->lst,
-          sidereal_precise(t->mjd, -(FG_Longitude * RAD_TO_DEG)),
-          t->gst_diff);
+    /* printf("Current lon=0.00 Sidereal Time = %.3f\n", t->gst); */
+    /* printf("Current LOCAL Sidereal Time = %.3f (%.3f) (diff = %.3f)\n", 
+           t->lst, sidereal_precise(t->mjd, -(FG_Longitude * RAD_TO_DEG)),
+          t->gst_diff); */
 }
 
 
 /* $Log$
-/* Revision 1.6  1997/09/20 03:34:34  curt
-/* Still trying to get those durned stars aligned properly.
+/* Revision 1.20  1997/12/15 23:55:06  curt
+/* Add xgl wrappers for debugging.
+/* Generate terrain normals on the fly.
 /*
+ * Revision 1.19  1997/12/15 20:59:10  curt
+ * Misc. tweaks.
+ *
+ * Revision 1.18  1997/12/12 21:41:31  curt
+ * More light/material property tweaking ... still a ways off.
+ *
+ * Revision 1.17  1997/12/12 19:53:04  curt
+ * Working on lightling and material properties.
+ *
+ * Revision 1.16  1997/12/11 04:43:57  curt
+ * Fixed sun vector and lighting problems.  I thing the moon is now lit
+ * correctly.
+ *
+ * Revision 1.15  1997/12/10 22:37:54  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.14  1997/12/10 01:19:52  curt
+ * Tweaks for verion 0.15 release.
+ *
+ * Revision 1.13  1997/12/09 05:11:56  curt
+ * Working on tweaking lighting.
+ *
+ * Revision 1.12  1997/12/09 04:25:37  curt
+ * Working on adding a global lighting params structure.
+ *
+ * Revision 1.11  1997/11/25 19:25:40  curt
+ * Changes to integrate Durk's moon/sun code updates + clean up.
+ *
+ * Revision 1.10  1997/11/15 18:16:42  curt
+ * minor tweaks.
+ *
+ * Revision 1.9  1997/11/14 00:26:50  curt
+ * Transform scenery coordinates earlier in pipeline when scenery is being
+ * created, not when it is being loaded.  Precalculate normals for each node
+ * as average of the normals of each containing polygon so Garoude shading is
+ * now supportable.
+ *
+ * Revision 1.8  1997/10/25 03:30:08  curt
+ * Misc. tweaks.
+ *
+ * Revision 1.7  1997/09/23 00:29:50  curt
+ * Tweaks to get things to compile with gcc-win32.
+ *
+ * Revision 1.6  1997/09/20 03:34:34  curt
+ * Still trying to get those durned stars aligned properly.
+ *
  * Revision 1.5  1997/09/16 22:14:52  curt
  * Tweaked time of day lighting equations.  Don't draw stars during the day.
  *