Disable two sided light model because Andy's patch to plib makes it unneeded. This...

[flightgear.git] / src / Main / fg_commands.cxx

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 3e1d9e7ce8a36d3a123be4b2ef389931bbd0dd29..6769654f5ed3cf5af8cbd4960caa6049d30e503a 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -3,7 +3,6 @@
 #include <string.h>            // strcmp()
 
 #include <simgear/compiler.h>
-#include <simgear/misc/exception.hxx>
 
 #include STL_STRING
 #include STL_FSTREAM
@@ -11,7 +10,8 @@
 #include <simgear/sg_inlines.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_random.h>
-#include <simgear/misc/commands.hxx>
+#include <simgear/structure/exception.hxx>
+#include <simgear/structure/commands.hxx>
 #include <simgear/props/props.hxx>
 
 #include <Cockpit/panel.hxx>
@@ -202,7 +202,7 @@ do_reinit (const SGPropertyNode * arg)
     } else {
         for ( unsigned int i = 0; i < subsystems.size(); i++ ) {
             const char * name = subsystems[i]->getStringValue();
-            FGSubsystem * subsystem = globals->get_subsystem(name);
+            SGSubsystem * subsystem = globals->get_subsystem(name);
             if (subsystem == 0) {
                 result = false;
                 SG_LOG( SG_GENERAL, SG_ALERT,
@@ -213,6 +213,8 @@ do_reinit (const SGPropertyNode * arg)
         }
     }
 
+    globals->get_event_mgr()->reinit();
+
     return result;
 }
 
@@ -229,7 +231,7 @@ do_suspend (const SGPropertyNode * arg)
     vector<SGPropertyNode_ptr> subsystems = arg->getChildren("subsystem");
     for ( unsigned int i = 0; i < subsystems.size(); i++ ) {
         const char * name = subsystems[i]->getStringValue();
-        FGSubsystem * subsystem = globals->get_subsystem(name);
+        SGSubsystem * subsystem = globals->get_subsystem(name);
         if (subsystem == 0) {
             result = false;
             SG_LOG(SG_GENERAL, SG_ALERT, "Subsystem " << name << "not found");
@@ -253,7 +255,7 @@ do_resume (const SGPropertyNode * arg)
     vector<SGPropertyNode_ptr> subsystems = arg->getChildren("subsystem");
     for ( unsigned int i = 0; i < subsystems.size(); i++ ) {
         const char * name = subsystems[i]->getStringValue();
-        FGSubsystem * subsystem = globals->get_subsystem(name);
+        SGSubsystem * subsystem = globals->get_subsystem(name);
         if (subsystem == 0) {
             result = false;
             SG_LOG(SG_GENERAL, SG_ALERT, "Subsystem " << name << "not found");
@@ -468,17 +470,6 @@ do_tile_cache_reload (const SGPropertyNode * arg)
 }
 
 
-/**
- * Update the lighting manually.
- */
-static bool
-do_lighting_update (const SGPropertyNode * arg)
-{
-  fgUpdateSkyAndLightingParams();
-  return true;
-}
-
-
 /**
  * Update the lighting manually.
  */
@@ -501,30 +492,57 @@ do_timeofday (const SGPropertyNode * arg)
     // cout << "orig_warp = " << orig_warp << endl;
 
     int warp = 0;
-    if ( offset_type == "noon" ) {
-        warp = fgTimeSecondsUntilNoon( cur_time,
-                                       longitude->getDoubleValue()
-                                         * SGD_DEGREES_TO_RADIANS,
-                                       latitude->getDoubleValue()
-                                         * SGD_DEGREES_TO_RADIANS ); 
-    } else if ( offset_type == "midnight" ) {
-        warp = fgTimeSecondsUntilMidnight( cur_time,
+    if ( offset_type == "real" ) {
+        warp = -orig_warp;
+    } else if ( offset_type == "dawn" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
                                            longitude->getDoubleValue()
                                              * SGD_DEGREES_TO_RADIANS,
                                            latitude->getDoubleValue()
-                                             * SGD_DEGREES_TO_RADIANS ); 
-    } else if ( offset_type == "dawn" ) {
-        warp = fgTimeSecondsUntilDawn( cur_time,
-                                       longitude->getDoubleValue()
-                                         * SGD_DEGREES_TO_RADIANS,
-                                       latitude->getDoubleValue()
-                                         * SGD_DEGREES_TO_RADIANS ); 
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           90.0, true ); 
+    } else if ( offset_type == "morning" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           75.0, true ); 
+    } else if ( offset_type == "noon" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           0.0, true ); 
+    } else if ( offset_type == "afternoon" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           60.0, false ); 
      } else if ( offset_type == "dusk" ) {
-        warp = fgTimeSecondsUntilDusk( cur_time,
-                                       longitude->getDoubleValue()
-                                         * SGD_DEGREES_TO_RADIANS,
-                                       latitude->getDoubleValue()
-                                         * SGD_DEGREES_TO_RADIANS ); 
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           90.0, false ); 
+     } else if ( offset_type == "evening" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           100.0, false ); 
+    } else if ( offset_type == "midnight" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           180.0, false ); 
     }
     // cout << "warp = " << warp << endl;
     globals->set_warp( orig_warp + warp );
@@ -534,8 +552,6 @@ do_timeofday (const SGPropertyNode * arg)
                cur_time_override->getLongValue(),
                globals->get_warp() );
 
-    fgUpdateSkyAndLightingParams();
-
     return true;
 }
 
@@ -967,7 +983,6 @@ static struct {
     { "view-cycle", do_view_cycle },
     { "screen-capture", do_screen_capture },
     { "tile-cache-reload", do_tile_cache_reload },
-    { "lighting-update", do_lighting_update },
     { "timeofday", do_timeofday },
     { "property-toggle", do_property_toggle },
     { "property-assign", do_property_assign },