C++ ifying ...

[flightgear.git] / Time / fg_time.cxx

diff --git a/Time/fg_time.cxx b/Time/fg_time.cxx
index 422a5701530be68517e8a615e324c42543b9c509..4cdb20c761d077a648899ace092eba9b71e28ae5 100644 (file)
--- a/Time/fg_time.cxx
+++ b/Time/fg_time.cxx
@@ -42,11 +42,19 @@
 #  include <sys/time.h>  // for get/setitimer, gettimeofday, struct timeval
 #endif
 
-#include <Astro/orbits.hxx>
-#include <Astro/sun.hxx>
+#ifdef  WIN32
+#  include <windows.h>
+#  ifdef __CYGWIN32__
+#    define NEAR /* */
+#    define FAR  /* */
+#  endif
+#  include <mmsystem.h>
+#endif
+
 #include <Astro/sky.hxx>
+#include <Astro/solarsystem.hxx>
 #include <Debug/fg_debug.h>
-#include <Flight/flight.h>
+#include <Flight/flight.hxx>
 #include <Include/fg_constants.h>
 #include <Main/options.hxx>
 #include <Time/light.hxx>
@@ -66,8 +74,9 @@ fgTIME cur_time_params;
 
 // Force an update of the sky and lighting parameters
 static void local_update_sky_and_lighting_params( void ) {
-    fgSunInit();
-    fgLightUpdate();
+    // fgSunInit();
+    SolarSystem::theSolarSystem->rebuild();
+    cur_light_params.Update();
     fgSkyColorsInit();
 }
 
@@ -90,7 +99,12 @@ void fgTimeInit(fgTIME *t) {
 
 // Portability wrap to get current time.
 void timestamp(fg_timestamp *timestamp) {
-#if defined( HAVE_GETTIMEOFDAY )
+#if defined( WIN32 )
+    unsigned int t;
+    t = timeGetTime();
+    timestamp->seconds = 0;
+    timestamp->millis =  t;
+#elif defined( HAVE_GETTIMEOFDAY )
     struct timeval current;
     struct timezone tz;
     // fg_timestamp currtime;
@@ -115,16 +129,25 @@ void timestamp(fg_timestamp *timestamp) {
 
 // Return duration in millis from first to last
 long timediff(fg_timestamp *first, fg_timestamp *last) {
-    return 1000 * (last->seconds - first->seconds) + 
-       (last->millis - first->millis);
+#if defined( WIN32 )
+    return (last->millis - first->millis);
+#else
+    return ( 1000 * (last->seconds - first->seconds) + 
+            (last->millis - first->millis) );
+#endif
 }
 
 
 // Return new timestamp given a time stamp and an interval to add in
 void timesum(fg_timestamp *res, fg_timestamp *start, long millis) {
+#ifdef WIN32
+    res->seconds = 0;
+    res->millis = ( start->millis + millis );
+#else
     res->seconds = start->seconds + 
        ( start->millis + millis ) / 1000;
     res->millis = ( start->millis + millis ) % 1000;
+#endif
 }
 
 
@@ -425,6 +448,41 @@ void fgTimeUpdate(fgFLIGHT *f, fgTIME *t) {
 
 
 // $Log$
+// Revision 1.19  1998/10/17 01:34:29  curt
+// C++ ifying ...
+//
+// Revision 1.18  1998/10/02 21:36:09  curt
+// Fixes to try to break through the win95/98 18.3 fps barrier.
+//
+// Revision 1.17  1998/09/15 04:27:49  curt
+// Changes for new astro code.
+//
+// Revision 1.16  1998/08/29 13:11:32  curt
+// Bernie Bright writes:
+//   I've created some new classes to enable pointers-to-functions and
+//   pointers-to-class-methods to be treated like objects.  These objects
+//   can be registered with fgEVENT_MGR.
+//
+//   File "Include/fg_callback.hxx" contains the callback class defns.
+//
+//   Modified fgEVENT and fgEVENT_MGR to use the callback classes.  Also
+//   some minor tweaks to STL usage.
+//
+//   Added file "Include/fg_stl_config.h" to deal with STL portability
+//   issues.  I've added an initial config for egcs (and probably gcc-2.8.x).
+//   I don't have access to Visual C++ so I've left that for someone else.
+//   This file is influenced by the stl_config.h file delivered with egcs.
+//
+//   Added "Include/auto_ptr.hxx" which contains an implementation of the
+//   STL auto_ptr class which is not provided in all STL implementations
+//   and is needed to use the callback classes.
+//
+//   Deleted fgLightUpdate() which was just a wrapper to call
+//   fgLIGHT::Update().
+//
+//   Modified fg_init.cxx to register two method callbacks in place of the
+//   old wrapper functions.
+//
 // Revision 1.15  1998/08/24 20:12:16  curt
 // Rewrote sidereal_course with simpler parameters.
 //