Turn back to default lighting when specular-highlight gets disabled

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

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 8218dfa3d31f61476852f13d45799e9595282378..0efd3c09d86236000cfc73d64d1cc05e5f0a88cd 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -8,10 +8,11 @@
 #include STL_STRING
 #include STL_FSTREAM
 
+#include <simgear/sg_inlines.h>
 #include <simgear/debug/logstream.hxx>
+#include <simgear/math/sg_random.h>
 #include <simgear/misc/commands.hxx>
-#include <simgear/misc/props.hxx>
-#include <simgear/sg_inlines.h>
+#include <simgear/props/props.hxx>
 
 #include <Cockpit/panel.hxx>
 #include <Cockpit/panel_io.hxx>
@@ -19,14 +20,16 @@
 #include <GUI/gui.h>
 #include <GUI/new_gui.hxx>
 #include <GUI/dialog.hxx>
+#include <Replay/replay.hxx>
 #include <Scenery/tilemgr.hxx>
 #if defined(HAVE_PLIB_PSL)
-#include <Scripting/scriptmgr.hxx>
+#  include <Scripting/scriptmgr.hxx>
 #endif
 #include <Time/tmp.hxx>
 
 #include "fg_init.hxx"
 #include "fg_commands.hxx"
+#include "fg_props.hxx"
 
 SG_USING_STD(string);
 SG_USING_STD(ifstream);
@@ -193,18 +196,22 @@ do_reinit (const SGPropertyNode * arg)
     bool result = true;
 
     vector<SGPropertyNode_ptr> subsystems = arg->getChildren("subsystem");
-    if (subsystems.size() == 0)
+    if (subsystems.size() == 0) {
         globals->get_subsystem_mgr()->reinit();
-    else for (int i = 0; i < subsystems.size(); i++) {
-        const char * name = subsystems[i]->getStringValue();
-        FGSubsystem * subsystem = globals->get_subsystem(name);
-        if (subsystem == 0) {
-            result = false;
-            SG_LOG(SG_GENERAL, SG_ALERT, "Subsystem " << name << "not found");
-        } else {
-            subsystem->reinit();
+    } else {
+        for ( unsigned int i = 0; i < subsystems.size(); i++ ) {
+            const char * name = subsystems[i]->getStringValue();
+            FGSubsystem * subsystem = globals->get_subsystem(name);
+            if (subsystem == 0) {
+                result = false;
+                SG_LOG( SG_GENERAL, SG_ALERT,
+                        "Subsystem " << name << "not found" );
+            } else {
+                subsystem->reinit();
+            }
         }
     }
+
     return result;
 }
 
@@ -219,7 +226,7 @@ do_suspend (const SGPropertyNode * arg)
     bool result = true;
 
     vector<SGPropertyNode_ptr> subsystems = arg->getChildren("subsystem");
-    for (int i = 0; i < subsystems.size(); i++) {
+    for ( unsigned int i = 0; i < subsystems.size(); i++ ) {
         const char * name = subsystems[i]->getStringValue();
         FGSubsystem * subsystem = globals->get_subsystem(name);
         if (subsystem == 0) {
@@ -243,7 +250,7 @@ do_resume (const SGPropertyNode * arg)
     bool result = true;
 
     vector<SGPropertyNode_ptr> subsystems = arg->getChildren("subsystem");
-    for (int i = 0; i < subsystems.size(); i++) {
+    for ( unsigned int i = 0; i < subsystems.size(); i++ ) {
         const char * name = subsystems[i]->getStringValue();
         FGSubsystem * subsystem = globals->get_subsystem(name);
         if (subsystem == 0) {
@@ -684,6 +691,24 @@ do_property_cycle (const SGPropertyNode * arg)
 }
 
 
+/**
+ * Built-in command: randomize a numeric property value.
+ *
+ * property: the name of the property value to randomize.
+ * min: the minimum allowed value.
+ * max: the maximum allowed value.
+ */
+static bool
+do_property_randomize (const SGPropertyNode * arg)
+{
+    SGPropertyNode * prop = get_prop(arg);
+    double min = arg->getDoubleValue("min", DBL_MIN);
+    double max = arg->getDoubleValue("max", DBL_MAX);
+    prop->setDoubleValue(sg_random() * (max - min) + min);
+    return true;
+}
+
+
 /**
  * Built-in command: Show an XML-configured dialog.
  *
@@ -798,9 +823,57 @@ do_log_level (const SGPropertyNode * arg)
    return true;
 }
 
+/**
+ * Built-in command: replay the FDR buffer
+ */
+static bool
+do_replay (const SGPropertyNode * arg)
+{
+    // freeze the master fdm
+    fgSetBool( "/sim/freeze/replay", true );
+
+    FGReplay *r = (FGReplay *)(globals->get_subsystem( "replay" ));
+
+    fgSetDouble( "/sim/replay/start-time", r->get_start_time() );
+    fgSetDouble( "/sim/replay/end-time", r->get_end_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;
+
+    return true;
+}
+
+
+
+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;
+}
 
 
-\f
 ////////////////////////////////////////////////////////////////////////
 // Command setup.
 ////////////////////////////////////////////////////////////////////////
@@ -840,6 +913,7 @@ static struct {
     { "property-swap", do_property_swap },
     { "property-scale", do_property_scale },
     { "property-cycle", do_property_cycle },
+    { "property-randomize", do_property_randomize },
     { "dialog-show", do_dialog_show },
     { "dialog-close", do_dialog_close },
     { "dialog-show", do_dialog_show },
@@ -847,6 +921,9 @@ static struct {
     { "dialog-apply", do_dialog_apply },
     { "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
 };