X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_commands.cxx;h=15328eb69efdd19b5edf4f6504c0e9f3c6fe63be;hb=45390e0655fffa45a16cba77fafdd9421ed7d6e2;hp=cedd772ac3bb3e215dff1aa6e0d292cc19fc0408;hpb=7f6d4b0a01954d01010b2b9c0bb354b070738ee4;p=flightgear.git

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index cedd772ac..15328eb69 100644
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -1,6 +1,7 @@
 // fg_commands.cxx - internal FGFS commands.
 
 #include <simgear/compiler.h>
+#include <simgear/misc/exception.hxx>
 
 #include STL_STRING
 #include STL_FSTREAM
@@ -12,6 +13,8 @@
 #include <GUI/gui.h>
 #include <Cockpit/panel.hxx>
 #include <Cockpit/panel_io.hxx>
+#include <Scenery/tilemgr.hxx>
+#include <Time/tmp.hxx>
 
 #include "fg_commands.hxx"
 
@@ -24,13 +27,92 @@ SG_USING_STD(ofstream);
 #include "fg_props.hxx"
 #include "fg_io.hxx"
 #include "globals.hxx"
+#include "viewmgr.hxx"
+
+
+
+////////////////////////////////////////////////////////////////////////
+// Saved command states.
+////////////////////////////////////////////////////////////////////////
+
+
+/**
+ * Base saved state for property commands.
+ *
+ * Since this class isn't publicly visible, it is simply an aggregate
+ * of all the stuff any property command needs.
+ */
+class PropertyCommandState : public SGCommandState
+{
+public:
+  PropertyCommandState (const SGPropertyNode * arg);
+  virtual SGPropertyNode * getProp () const { return _prop; }
+  virtual SGPropertyNode * getProp2 () const { return _prop2; }
+  virtual const SGPropertyNode * getValue () const
+    { return _value ? _value : &_dummy_0; }
+  virtual const SGPropertyNode * getStep () const 
+    { return _step ? _step : &_dummy_0; }
+  virtual const SGPropertyNode * getMin () const { return _min; }
+  virtual const SGPropertyNode * getMax () const { return _max; }
+  virtual const SGPropertyNode * getWrap () const
+    { return _wrap ? _wrap : &_dummy_0; }
+  virtual const SGPropertyNode * getFactor () const 
+    { return _factor ? _factor : &_dummy_1; }
+  virtual const SGPropertyNode * getSetting () const 
+    { return _setting ? _setting : &_dummy_0; }
+  virtual const SGPropertyNode * getOffset () const
+    { return _offset ? _offset : &_dummy_0; }
+private:
+  static SGPropertyNode _dummy_0;
+  static SGPropertyNode _dummy_1;
+  mutable SGPropertyNode * _prop;
+  mutable SGPropertyNode * _prop2;
+  const SGPropertyNode * _value;
+  const SGPropertyNode * _step;
+  const SGPropertyNode * _min;
+  const SGPropertyNode * _max;
+  const SGPropertyNode * _wrap;
+  const SGPropertyNode * _factor;
+  const SGPropertyNode * _setting;
+  const SGPropertyNode * _offset;
+};
+
+SGPropertyNode PropertyCommandState::_dummy_0;
+SGPropertyNode PropertyCommandState::_dummy_1;
+
+PropertyCommandState::PropertyCommandState (const SGPropertyNode * arg)
+  : SGCommandState(arg),
+    _prop(fgGetNode(arg->getStringValue("property[0]", "/null"), true)),
+    _prop2(fgGetNode(arg->getStringValue("property[1]", "/null"), true)),
+    _value(arg->getNode("value")),
+    _step(arg->getNode("step")),
+    _min(arg->getNode("min")),
+    _max(arg->getNode("max")),
+    _wrap(arg->getNode("wrap")),
+    _factor(arg->getNode("factor")),
+    _setting(arg->getNode("setting")),
+    _offset(arg->getNode("offset"))
+{
+				// It would be better not to do this
+				// every time, but it's not that big
+				// a deal.  I don't know enough about
+				// C++ static initialization to fix it.
+  _dummy_1.setDoubleValue(1.0);
+}
+
+
+
+
+////////////////////////////////////////////////////////////////////////
+// Command implementations.
+////////////////////////////////////////////////////////////////////////
 
 
 /**
  * Built-in command: do nothing.
  */
 static bool
-do_null (const SGPropertyNode * arg)
+do_null (const SGPropertyNode * arg, SGCommandState ** state)
 {
   return true;
 }
@@ -42,10 +124,10 @@ do_null (const SGPropertyNode * arg)
  * TODO: show a confirm dialog.
  */
 static bool
-do_exit (const SGPropertyNode * arg)
+do_exit (const SGPropertyNode * arg, SGCommandState ** state)
 {
-  fgIOShutdownAll();
-  exit(0);
+  SG_LOG(SG_INPUT, SG_ALERT, "Program exit requested.");
+  ConfirmExitDialog();
   return true;
 }
 
@@ -57,7 +139,7 @@ do_exit (const SGPropertyNode * arg)
  * directory).  Defaults to "fgfs.sav".
  */
 static bool
-do_load (const SGPropertyNode * arg)
+do_load (const SGPropertyNode * arg, SGCommandState ** state)
 {
   const string &file = arg->getStringValue("file", "fgfs.sav");
   ifstream input(file.c_str());
@@ -79,7 +161,7 @@ do_load (const SGPropertyNode * arg)
  * current directory).  Defaults to "fgfs.sav".
  */
 static bool
-do_save (const SGPropertyNode * arg)
+do_save (const SGPropertyNode * arg, SGCommandState ** state)
 {
   const string &file = arg->getStringValue("file", "fgfs.sav");
   SG_LOG(SG_INPUT, SG_INFO, "Saving flight");
@@ -103,7 +185,7 @@ do_save (const SGPropertyNode * arg)
  * and if that's unspecified, to "Panels/Default/default.xml".
  */
 static bool
-do_panel_load (const SGPropertyNode * arg)
+do_panel_load (const SGPropertyNode * arg, SGCommandState ** state)
 {
   string panel_path =
     arg->getStringValue("path",
@@ -131,20 +213,21 @@ do_panel_load (const SGPropertyNode * arg)
  * to FG_ROOT). Defaults to "preferences.xml".
  */
 static bool
-do_preferences_load (const SGPropertyNode * arg)
+do_preferences_load (const SGPropertyNode * arg, SGCommandState ** state)
 {
   const string &path = arg->getStringValue("path", "preferences.xml");
   SGPath props_path(globals->get_fg_root());
   props_path.append(path);
   SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences from "
 	 << props_path.str());
-  if (!readProperties(props_path.str(), globals->get_props())) {
-    SG_LOG(SG_INPUT, SG_ALERT, "Failed to reread global preferences");
+  try {
+    readProperties(props_path.str(), globals->get_props());
+  } catch (const sg_exception &e) {
+    guiErrorMessage("Error reading global preferences: ", e);
     return false;
-  } else {
-    SG_LOG(SG_INPUT, SG_INFO, "Successfully read global preferences.");
-    return true;
   }
+  SG_LOG(SG_INPUT, SG_INFO, "Successfully read global preferences.");
+  return true;
 }
 
 
@@ -152,7 +235,7 @@ do_preferences_load (const SGPropertyNode * arg)
  * Built-in command: cycle view.
  */
 static bool
-do_view_cycle (const SGPropertyNode * arg)
+do_view_cycle (const SGPropertyNode * arg, SGCommandState ** state)
 {
   globals->get_current_view()->set_view_offset(0.0);
   globals->set_current_view(globals->get_viewmgr()->next_view());
@@ -165,27 +248,63 @@ do_view_cycle (const SGPropertyNode * arg)
  * Built-in command: capture screen.
  */
 static bool
-do_screen_capture (const SGPropertyNode * arg)
+do_screen_capture (const SGPropertyNode * arg, SGCommandState ** state)
 {
   fgDumpSnapShot();
   return true;
 }
 
 
+/**
+ * Reload the tile cache.
+ */
+static bool
+do_tile_cache_reload (const SGPropertyNode * arg, SGCommandState ** state)
+{
+  bool freeze = globals->get_freeze();
+  SG_LOG(SG_INPUT, SG_INFO, "ReIniting TileCache");
+  if ( !freeze ) 
+    globals->set_freeze( true );
+  BusyCursor(0);
+  if ( global_tile_mgr.init() ) {
+    // Load the local scenery data
+    global_tile_mgr.update(fgGetDouble("/position/longitude-deg"),
+			   fgGetDouble("/position/latitude-deg"));
+  } else {
+    SG_LOG( SG_GENERAL, SG_ALERT, 
+	    "Error in Tile Manager initialization!" );
+    exit(-1);
+  }
+  BusyCursor(1);
+  if ( !freeze )
+    globals->set_freeze( false );
+  return true;
+}
+
+
+/**
+ * Update the lighting manually.
+ */
+static bool
+do_lighting_update (const SGPropertyNode * arg, SGCommandState ** state)
+{
+  fgUpdateSkyAndLightingParams();
+  return true;
+}
+
+
 /**
  * Built-in command: toggle a bool property value.
  *
  * property: The name of the property to toggle.
  */
 static bool
-do_property_toggle (const SGPropertyNode * arg)
+do_property_toggle (const SGPropertyNode * arg, SGCommandState ** state)
 {
-  const string & propname = arg->getStringValue("property", "");
-  if (propname == "")
-    return false;
-
-  SGPropertyNode * node = fgGetNode(propname);
-  return node->setBoolValue(!node->getBoolValue());
+  if (*state == 0)
+    *state = new PropertyCommandState(arg);
+  SGPropertyNode * prop = ((PropertyCommandState *)(*state))->getProp();
+  return prop->setBoolValue(!prop->getBoolValue());
 }
 
 
@@ -196,29 +315,29 @@ do_property_toggle (const SGPropertyNode * arg)
  * value: the value to assign.
  */
 static bool
-do_property_assign (const SGPropertyNode * arg)
+do_property_assign (const SGPropertyNode * arg, SGCommandState ** state)
 {
-  const string & propname = arg->getStringValue("property", "");
-  if (propname == "")
-    return false;
-
-  SGPropertyNode * node = fgGetNode(propname, true);
-
-  switch (node->getType()) {
-  case SGValue::BOOL:
-    return node->setBoolValue(arg->getBoolValue("value"));
-  case SGValue::INT:
-    return node->setIntValue(arg->getIntValue("value"));
-  case SGValue::LONG:
-    return node->setLongValue(arg->getLongValue("value"));
-  case SGValue::FLOAT:
-    return node->setFloatValue(arg->getFloatValue("value"));
-  case SGValue::DOUBLE:
-    return node->setDoubleValue(arg->getDoubleValue("value"));
-  case SGValue::STRING:
-    return node->setStringValue(arg->getStringValue("value"));
+  if (*state == 0)
+    *state = new PropertyCommandState(arg);
+  SGPropertyNode * prop = ((PropertyCommandState *)(*state))->getProp();
+  const SGPropertyNode * value =
+    ((PropertyCommandState *)(*state))->getValue();
+
+  switch (prop->getType()) {
+  case SGPropertyNode::BOOL:
+    return prop->setBoolValue(value->getBoolValue());
+  case SGPropertyNode::INT:
+    return prop->setIntValue(value->getIntValue());
+  case SGPropertyNode::LONG:
+    return prop->setLongValue(value->getLongValue());
+  case SGPropertyNode::FLOAT:
+    return prop->setFloatValue(value->getFloatValue());
+  case SGPropertyNode::DOUBLE:
+    return prop->setDoubleValue(value->getDoubleValue());
+  case SGPropertyNode::STRING:
+    return prop->setStringValue(value->getStringValue());
   default:
-    return node->setUnknownValue(arg->getStringValue("value"));
+    return prop->setUnspecifiedValue(value->getStringValue());
   }
 }
 
@@ -227,35 +346,139 @@ do_property_assign (const SGPropertyNode * arg)
  * Built-in command: increment or decrement a property value.
  *
  * property: the name of the property to increment or decrement.
- * step: the amount of the increment or decrement.
+ * step: the amount of the increment or decrement (default: 0).
+ * min: the minimum allowed value (default: no minimum).
+ * max: the maximum allowed value (default: no maximum).
+ * wrap: true if the value should be wrapped when it passes min or max;
+ *       both min and max must be present for this to work (default:
+ *       false).
  */
 static bool
-do_property_adjust (const SGPropertyNode * arg)
+do_property_adjust (const SGPropertyNode * arg, SGCommandState ** state)
 {
-  const string & propname = arg->getStringValue("property", "");
-  if (propname == "")
+  if (*state == 0)
+    *state = new PropertyCommandState(arg);
+  SGPropertyNode * prop = ((PropertyCommandState *)(*state))->getProp();
+  const SGPropertyNode * step = ((PropertyCommandState *)(*state))->getStep();
+  const SGPropertyNode * min = ((PropertyCommandState *)(*state))->getMin();
+  const SGPropertyNode * max = ((PropertyCommandState *)(*state))->getMax();
+  bool wrap = ((PropertyCommandState *)(*state))->getWrap()->getBoolValue();
+
+  switch (prop->getType()) {
+  case SGPropertyNode::BOOL:
+    if (step->getBoolValue())
+      return prop->setBoolValue(!prop->getBoolValue());
+    else
+      return true;
+  case SGPropertyNode::INT: {
+    int value = prop->getIntValue() + step->getIntValue();
+    if (min && (value < min->getIntValue())) {
+      if (wrap && max)
+	value = max->getIntValue();
+      else
+	value = min->getIntValue();
+    }
+    if (max && value > max->getIntValue()) {
+      if (wrap && min)
+	value = min->getIntValue();
+      else
+	value = max->getIntValue();
+    }
+    return prop->setIntValue(value);
+  }
+  case SGPropertyNode::LONG: {
+    long value = prop->getLongValue() + step->getLongValue();
+    if (min && (value < min->getLongValue())) {
+      if (wrap && max)
+	value = max->getLongValue();
+      else
+	value = min->getLongValue();
+    }
+    if (max && value > max->getLongValue()) {
+      if (wrap && min)
+	value = min->getLongValue();
+      else
+	value = max->getLongValue();
+    }
+    return prop->setLongValue(value);
+  }
+  case SGPropertyNode::FLOAT: {
+    float value = prop->getFloatValue() + step->getFloatValue();
+    if (min && (value < min->getFloatValue())) {
+      if (wrap && max)
+	value = max->getFloatValue();
+      else
+	value = min->getFloatValue();
+    }
+    if (max && value > max->getFloatValue()) {
+      if (wrap && min)
+	value = min->getFloatValue();
+      else
+	value = max->getFloatValue();
+    }
+    return prop->setFloatValue(value);
+  }
+  case SGPropertyNode::DOUBLE:
+  case SGPropertyNode::UNSPECIFIED:
+  case SGPropertyNode::NONE: {
+    double value = prop->getDoubleValue() + step->getDoubleValue();
+    if (min && (value < min->getDoubleValue())) {
+      if (wrap && max)
+	value = max->getDoubleValue();
+      else
+	value = min->getDoubleValue();
+    }
+    if (max && value > max->getDoubleValue()) {
+      if (wrap && min)
+	value = min->getDoubleValue();
+      else
+	value = max->getDoubleValue();
+    }
+    return prop->setDoubleValue(value);
+  }
+  case SGPropertyNode::STRING: // doesn't make sense with strings
+    SG_LOG(SG_INPUT, SG_ALERT, "Cannot adjust a string value");
     return false;
+  default:
+    SG_LOG(SG_INPUT, SG_ALERT, "Unknown value type");
+    return false;
+  }
+}
 
-  SGPropertyNode * node = fgGetNode(propname, true);
 
-  switch (node->getType()) {
-  case SGValue::BOOL:
-    if (arg->getBoolValue("step"))
-      return node->setBoolValue(!node->getBoolValue());
-    else
-      return true;
-  case SGValue::INT:
-    return node->setIntValue(node->getIntValue()
-			     + arg->getIntValue("step"));
-  case SGValue::LONG:
-    return node->setLongValue(node->getLongValue()
-			      + arg->getLongValue("step"));
-  case SGValue::FLOAT:
-    return node->setFloatValue(node->getFloatValue()
-			       + arg->getFloatValue("step"));
-  case SGValue::DOUBLE:
-    return node->setDoubleValue(node->getDoubleValue()
-				+ arg->getDoubleValue("step"));
+/**
+ * Built-in command: multiply a property value.
+ *
+ * property: the name of the property to multiply.
+ * factor: the amount by which to multiply.
+ */
+static bool
+do_property_multiply (const SGPropertyNode * arg, SGCommandState ** state)
+{
+  if (*state == 0)
+    *state = new PropertyCommandState(arg);
+  SGPropertyNode * prop = ((PropertyCommandState *)(*state))->getProp();
+  const SGPropertyNode * factor =
+    ((PropertyCommandState *)(*state))->getFactor();
+
+  switch (prop->getType()) {
+  case SGPropertyNode::BOOL:
+    return prop->setBoolValue(prop->getBoolValue() &&
+			      factor->getBoolValue());
+  case SGPropertyNode::INT:
+    return prop->setIntValue(int(prop->getIntValue()
+				 * factor->getDoubleValue()));
+  case SGPropertyNode::LONG:
+    return prop->setLongValue(long(prop->getLongValue()
+				   * factor->getDoubleValue()));
+  case SGPropertyNode::FLOAT:
+    return prop->setFloatValue(float(prop->getFloatValue()
+				     * factor->getDoubleValue()));
+  case SGPropertyNode::DOUBLE:
+  case SGPropertyNode::UNSPECIFIED:
+  case SGPropertyNode::NONE:
+    return prop->setDoubleValue(prop->getDoubleValue()
+				* factor->getDoubleValue());
   default:			// doesn't make sense with strings
     return false;
   }
@@ -269,18 +492,17 @@ do_property_adjust (const SGPropertyNode * arg)
  * property[1]: the name of the second property.
  */
 static bool
-do_property_swap (const SGPropertyNode * arg)
+do_property_swap (const SGPropertyNode * arg, SGCommandState ** state)
 {
-  const string &propname1 = arg->getStringValue("property[0]", "");
-  const string &propname2 = arg->getStringValue("property[1]", "");
-  if (propname1 == "" || propname2 == "")
-    return false;
-
-  SGPropertyNode * node1 = fgGetNode(propname1, true);
-  SGPropertyNode * node2 = fgGetNode(propname2, true);
-  const string & tmp = node1->getStringValue();
-  return (node1->setUnknownValue(node2->getStringValue()) &&
-	  node2->setUnknownValue(tmp));
+  if (*state == 0)
+    *state = new PropertyCommandState(arg);
+  SGPropertyNode * prop1 = ((PropertyCommandState *)(*state))->getProp();
+  SGPropertyNode * prop2 = ((PropertyCommandState *)(*state))->getProp2();
+
+				// FIXME: inefficient
+  const string & tmp = prop1->getStringValue();
+  return (prop1->setUnspecifiedValue(prop2->getStringValue()) &&
+	  prop2->setUnspecifiedValue(tmp));
 }
 
 
@@ -293,17 +515,28 @@ do_property_swap (const SGPropertyNode * arg)
  * factor: the factor to multiply by (use negative to reverse).
  */
 static bool
-do_property_scale (const SGPropertyNode * arg)
+do_property_scale (const SGPropertyNode * arg, SGCommandState ** state)
 {
-  const string &propname = arg->getStringValue("property");
-  double setting = arg->getDoubleValue("setting", 0.0);
-  double offset = arg->getDoubleValue("offset", 0.0);
-  double factor = arg->getDoubleValue("factor", 1.0);
-  return fgSetDouble(propname, (setting + offset) * factor);
+  if (*state == 0)
+    *state = new PropertyCommandState(arg);
+  SGPropertyNode * prop = ((PropertyCommandState *)(*state))->getProp();
+  double setting =
+    ((PropertyCommandState *)(*state))->getSetting()->getDoubleValue();
+  double offset =
+    ((PropertyCommandState *)(*state))->getOffset()->getDoubleValue();
+  double factor =
+    ((PropertyCommandState *)(*state))->getFactor()->getDoubleValue();
+
+  return prop->setDoubleValue((setting + offset) * factor);
 }
 
 
 
+////////////////////////////////////////////////////////////////////////
+// Command setup.
+////////////////////////////////////////////////////////////////////////
+
+
 /**
  * Table of built-in commands.
  *
@@ -314,20 +547,23 @@ static struct {
   const char * name;
   SGCommandMgr::command_t command;
 } built_ins [] = {
-  "null", do_null,
-  "exit", do_exit,
-  "load", do_load,
-  "save", do_save,
-  "panel-load", do_panel_load,
-  "preferences-load", do_preferences_load,
-  "view-cycle", do_view_cycle,
-  "screen-capture", do_screen_capture,
-  "property-toggle", do_property_toggle,
-  "property-assign", do_property_assign,
-  "property-adjust", do_property_adjust,
-  "property-swap", do_property_swap,
-  "property-scale", do_property_scale,
-  0, 0				// zero-terminated
+    { "null", do_null },
+    { "exit", do_exit },
+    { "load", do_load },
+    { "save", do_save },
+    { "panel-load", do_panel_load },
+    { "preferences-load", do_preferences_load },
+    { "view-cycle", do_view_cycle },
+    { "screen-capture", do_screen_capture },
+    { "tile-cache-reload", do_tile_cache_reload },
+    { "lighting-update", do_lighting_update },
+    { "property-toggle", do_property_toggle },
+    { "property-assign", do_property_assign },
+    { "property-adjust", do_property_adjust },
+    { "property-multiply", do_property_multiply },
+    { "property-swap", do_property_swap },
+    { "property-scale", do_property_scale },
+    { 0, 0 }			// zero-terminated
 };