#include <stdlib.h>
#include <time.h>
-#ifdef WIN32
-#include <sys/time.h> /* for gettimeofday() */
-#include <unistd.h> /* for gettimeofday() */
-#endif
+#ifdef USE_FTIME
+# include <sys/timeb.h> /* for ftime() and struct timeb */
+#else
+# include <unistd.h> /* for gettimeofday() */
+# include <sys/time.h> /* for get/setitimer, gettimeofday, struct timeval */
+#endif /* USE_FTIME */
#include "fg_time.h"
-#include "../constants.h"
+#include "../Include/constants.h"
#include "../Flight/flight.h"
#include "../Time/fg_time.h"
struct fgTIME cur_time_params;
+struct fgLIGHT cur_light_params;
/* Initialize the time dependent variables */
void fgTimeInit(struct fgTIME *t) {
+ printf("Initializing Time\n");
+
t->gst_diff = -9999.0;
+ t->warp = 0;
+ t->warp = 0 * 3600;
+ t->warp_delta = 0;
}
x /= 3600.0;
gst = (1.0/SIDRATE)*hr + x;
- printf("gst => %.4f\n", gst);
+ printf(" gst => %.4f\n", gst);
return(gst);
}
long int offset;
double diff, part, days, hours, lst;
+#ifdef USE_FTIME
+ struct timeb current;
+#endif /* USE_FTIME */
+
#ifdef WIN32
int daylight;
long int timezone;
+#endif /* WIN32 */
- struct timeval tv;
- struct timezone tz;
-#endif
-
- printf("COURSE: GMT = %d/%d/%2d %d:%02d:%02d\n",
+ /*
+ 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);
+ */
mt.tm_mon = 2;
mt.tm_mday = 21;
mt.tm_hour = 12;
mt.tm_min = 0;
mt.tm_sec = 0;
+ mt.tm_isdst = -1; /* let the system determine the proper time zone */
start = mktime(&mt);
-#ifdef WIN32
+ /* printf("start1 = %ld\n", start);
+ printf("start2 = %s", ctime(&start));
+ printf("start3 = %ld\n", start); */
+
daylight = mt.tm_isdst;
- gettimeofday(&tv, &tz);
- timezone = tz.tz_minuteswest * 60;
-#endif
+
+#ifdef USE_FTIME
+ ftime(¤t);
+ timezone = current.timezone * 60;
+#endif /* USE_FTIME */
if ( daylight > 0 ) {
daylight = 1;
offset = -(timezone / 3600 - daylight);
- printf("Raw time zone offset = %ld\n", timezone);
- printf("Daylight Savings = %d\n", daylight);
+ /* printf(" Raw time zone offset = %ld\n", timezone); */
+ /* printf(" Daylight Savings = %d\n", daylight); */
- printf("Local hours from GMT = %ld\n", offset);
+ /* printf(" Local hours from GMT = %ld\n", offset); */
start_gmt = start - timezone + (daylight * 3600);
- printf("March 21 noon (CST) = %ld\n", start);
- printf("March 21 noon (GMT) = %ld\n", start_gmt);
+ /* printf(" March 21 noon (CST) = %ld\n", start); */
+ /* printf(" March 21 noon (GMT) = %ld\n", start_gmt); */
diff = (now - start_gmt) / (3600.0 * 24.0);
- printf("Time since 3/21/%2d GMT = %.2f\n", gmt->tm_year, diff);
+ /* printf(" Time since 3/21/%2d GMT = %.2f\n", gmt->tm_year, diff); */
part = fmod(diff, 1.0);
days = diff - part;
lst += 24.0;
}
- printf("days = %.1f hours = %.2f lon = %.2f lst = %.2f\n",
- days, hours, lng, lst);
+ /* printf(" days = %.1f hours = %.2f lon = %.2f lst = %.2f\n",
+ days, hours, lng, lst); */
return(lst);
}
/* 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;
+
+ printf("Updating time\n");
/* get current Unix calendar time (in seconds) */
- warp += 60;
- /* warp = 0; */
- t->cur_time = time(NULL);
- t->cur_time += warp;
- printf("Current Unix calendar time = %ld warp = %ld\n", t->cur_time, warp);
+ t->warp += t->warp_delta;
+ t->cur_time = time(NULL) + t->warp;
+ printf(" Current Unix calendar time = %ld warp = %ld delta = %ld\n",
+ t->cur_time, t->warp, t->warp_delta);
/* get GMT break down for current time */
t->gmt = gmtime(&t->cur_time);
- printf("Current GMT = %d/%d/%2d %d:%02d:%02d\n",
+ printf(" Current GMT = %d/%d/%2d %d:%02d:%02d\n",
t->gmt->tm_mon+1, t->gmt->tm_mday, t->gmt->tm_year,
t->gmt->tm_hour, t->gmt->tm_min, t->gmt->tm_sec);
/* convert "back" to Julian date + partial day (as a fraction of one) */
t->jd = t->mjd + MJD0;
- printf("Current Julian Date = %.5f\n", t->jd);
+ printf(" Current Julian Date = %.5f\n", t->jd);
- printf("Current Longitude = %.3f\n", FG_Longitude * RAD_TO_DEG);
+ /* printf(" Current Longitude = %.3f\n", FG_Longitude * RAD_TO_DEG); */
/* Calculate local side real time */
if ( t->gst_diff < -100.0 ) {
/* first time through do the expensive calculation & cheap
calculation to get the difference. */
- printf("First time, doing precise gst\n");
+ printf(" First time, doing precise gst\n");
t->gst = gst_precise = sidereal_precise(t->mjd, 0.00);
gst_course = sidereal_course(t->gmt, t->cur_time, 0.00);
t->gst_diff = gst_precise - gst_course;
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.8 1997/10/25 03:30:08 curt
-/* Misc. tweaks.
+/* Revision 1.28 1998/01/19 18:35:49 curt
+/* Minor tweaks and fixes for cygwin32.
/*
+ * Revision 1.27 1998/01/13 00:23:13 curt
+ * Initial changes to support loading and management of scenery tiles. Note,
+ * there's still a fair amount of work left to be done.
+ *
+ * Revision 1.26 1998/01/05 18:44:36 curt
+ * Add an option to advance/decrease time from keyboard.
+ *
+ * Revision 1.25 1997/12/31 17:46:50 curt
+ * Tweaked fg_time.c to be able to use ftime() instead of gettimeofday()
+ *
+ * Revision 1.24 1997/12/30 22:22:42 curt
+ * Further integration of event manager.
+ *
+ * Revision 1.23 1997/12/30 20:47:58 curt
+ * Integrated new event manager with subsystem initializations.
+ *
+ * Revision 1.22 1997/12/30 01:38:47 curt
+ * Switched back to per vertex normals and smooth shading for terrain.
+ *
+ * Revision 1.21 1997/12/23 04:58:39 curt
+ * Tweaked the sky coloring a bit to build in structures to allow finer rgb
+ * control.
+ *
+ * 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.
*
projects / flightgear.git / blobdiff