Move the texture loader to SimGear

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

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index f96948796bf11df8197996f00a0be4a2723f25a9..389c28fc64c270b6706eaa722a88feeffab0ff27 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -9,6 +9,7 @@
 #include STL_FSTREAM
 
 #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>
@@ -208,7 +209,6 @@ do_reinit (const SGPropertyNode * arg)
     return result;
 }
 
-
 /**
  * Built-in command: suspend one or more subsystems.
  *
@@ -325,10 +325,10 @@ do_panel_load (const SGPropertyNode * arg)
     return false;
   }
   SG_LOG(SG_INPUT, SG_INFO, "Loaded new panel from " << panel_path);
-  current_panel->unbind();
-  delete current_panel;
-  current_panel = new_panel;
-  current_panel->bind();
+  globals->get_current_panel()->unbind();
+  delete globals->get_current_panel();
+  globals->set_current_panel( new_panel );
+  globals->get_current_panel()->bind();
   return true;
 }
 
@@ -344,8 +344,8 @@ do_panel_load (const SGPropertyNode * arg)
 static bool
 do_panel_mouse_click (const SGPropertyNode * arg)
 {
-  if (current_panel != 0)
-    return current_panel
+  if (globals->get_current_panel() != 0)
+    return globals->get_current_panel()
       ->doMouseAction(arg->getIntValue("button"),
                      arg->getBoolValue("is-down") ? PU_DOWN : PU_UP,
                      arg->getIntValue("x-pos"),
@@ -685,6 +685,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.
  *
@@ -706,7 +724,7 @@ static bool
 do_dialog_close (const SGPropertyNode * arg)
 {
     NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
-    gui->closeActiveDialog();
+    return gui->closeActiveDialog();
 }
 
 
@@ -778,10 +796,12 @@ do_presets_commit (const SGPropertyNode * arg)
 
     globals->get_tile_mgr()->update( fgGetDouble("/environment/visibility-m") );
 
+#if 0
     if ( ! fgGetBool("/sim/presets/onground") ) {
         fgSetBool( "/sim/freeze/master", true );
         fgSetBool( "/sim/freeze/clock", true );
     }
+#endif
 
     return true;
 }
@@ -839,6 +859,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 },