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 d540faf4050ef75cffae49ea0e52612392a8d639..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>
@@ -25,10 +25,12 @@
 #if defined(HAVE_PLIB_PSL)
 #  include <Scripting/scriptmgr.hxx>
 #endif
+#include <Time/sunsolver.hxx>
 #include <Time/tmp.hxx>
 
 #include "fg_init.hxx"
 #include "fg_commands.hxx"
+#include "fg_props.hxx"
 
 SG_USING_STD(string);
 SG_USING_STD(ifstream);
@@ -200,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,
@@ -211,6 +213,8 @@ do_reinit (const SGPropertyNode * arg)
         }
     }
 
+    globals->get_event_mgr()->reinit();
+
     return result;
 }
 
@@ -227,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");
@@ -251,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");
@@ -470,10 +474,85 @@ do_tile_cache_reload (const SGPropertyNode * arg)
  * Update the lighting manually.
  */
 static bool
-do_lighting_update (const SGPropertyNode * arg)
+do_timeofday (const SGPropertyNode * arg)
 {
-  fgUpdateSkyAndLightingParams();
-  return true;
+    const string &offset_type = arg->getStringValue("timeofday", "noon");
+
+    static const SGPropertyNode *longitude
+        = fgGetNode("/position/longitude-deg");
+    static const SGPropertyNode *latitude
+        = fgGetNode("/position/latitude-deg");
+    static const SGPropertyNode *cur_time_override
+        = fgGetNode("/sim/time/cur-time-override", true);
+
+    int orig_warp = globals->get_warp();
+    SGTime *t = globals->get_time_params();
+    time_t cur_time = t->get_cur_time();
+    // cout << "cur_time = " << cur_time << endl;
+    // cout << "orig_warp = " << orig_warp << endl;
+
+    int warp = 0;
+    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,
+                                           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 = 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 );
+
+    t->update( longitude->getDoubleValue() * SGD_DEGREES_TO_RADIANS,
+               latitude->getDoubleValue() * SGD_DEGREES_TO_RADIANS,
+               cur_time_override->getLongValue(),
+               globals->get_warp() );
+
+    return true;
 }
 
 
@@ -835,7 +914,12 @@ do_replay (const SGPropertyNode * arg)
 
     fgSetDouble( "/sim/replay/start-time", r->get_start_time() );
     fgSetDouble( "/sim/replay/end-time", r->get_end_time() );
-    fgSetDouble( "/sim/replay/time", r->get_start_time() );
+    double duration = fgGetDouble( "/sim/replay/duration" );
+    if( duration && duration < (r->get_end_time() - r->get_start_time()) ) {
+        fgSetDouble( "/sim/replay/time", r->get_end_time() - duration );
+    } else {
+        fgSetDouble( "/sim/replay/time", r->get_start_time() );
+    }
 
     cout << "start = " << r->get_start_time()
          << "  end = " << r->get_end_time() << endl;
@@ -845,7 +929,29 @@ do_replay (const SGPropertyNode * arg)
 
 
 
-\f
+static bool
+do_decrease_visibility (const SGPropertyNode * arg)
+{
+    double new_value = fgGetDouble("/environment/visibility-m") * 0.9;
+    fgSetDouble("/environment/visibility-m", new_value);
+    fgDefaultWeatherValue("visibility-m", new_value);
+    globals->get_subsystem("environment")->reinit();
+
+    return true;
+}
+ 
+static bool
+do_increase_visibility (const SGPropertyNode * arg)
+{
+    double new_value = fgGetDouble("/environment/visibility-m") * 1.1;
+    fgSetDouble("/environment/visibility-m", new_value);
+    fgDefaultWeatherValue("visibility-m", new_value);
+    globals->get_subsystem("environment")->reinit();
+
+    return true;
+}
+
+
 ////////////////////////////////////////////////////////////////////////
 // Command setup.
 ////////////////////////////////////////////////////////////////////////
@@ -877,7 +983,7 @@ 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 },
     { "property-adjust", do_property_adjust },
@@ -894,6 +1000,8 @@ static struct {
     { "presets-commit", do_presets_commit },
     { "log-level", do_log_level },
     { "replay", do_replay },
+    { "decrease-visibility", do_decrease_visibility },
+    { "increase-visibility", do_increase_visibility },
     { 0, 0 }                   // zero-terminated
 };