X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_commands.cxx;h=e86f7f849873674e86313d0dfc9699eecf3c8c24;hb=a4e81f4ff075e6a3c0c2ea1b5a29c0bcdfdbc671;hp=9ae0129f5faeca87c3eb54ba4793bf47d4bc3741;hpb=aa5ad5ad6e4794bd540eff4f8bb503b383177ea5;p=flightgear.git diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx index 9ae0129f5..e86f7f849 100644 --- a/src/Main/fg_commands.cxx +++ b/src/Main/fg_commands.cxx @@ -1,6 +1,9 @@ // fg_commands.cxx - internal FGFS commands. +#include // strcmp() + #include +#include #include STL_STRING #include STL_FSTREAM @@ -26,13 +29,97 @@ 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 bool hasStep () const { return _step != 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 * getSquared () const + { return _squared ? _squared : &_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 * _squared; + 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")), + _squared(arg->getNode("squared")), + _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; } @@ -44,7 +131,7 @@ do_null (const SGPropertyNode * arg) * TODO: show a confirm dialog. */ static bool -do_exit (const SGPropertyNode * arg) +do_exit (const SGPropertyNode * arg, SGCommandState ** state) { SG_LOG(SG_INPUT, SG_ALERT, "Program exit requested."); ConfirmExitDialog(); @@ -59,7 +146,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()); @@ -81,12 +168,13 @@ 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"); + bool write_all = arg->getBoolValue("write-all", false); SG_LOG(SG_INPUT, SG_INFO, "Saving flight"); ofstream output(file.c_str()); - if (output.good() && fgSaveFlight(output)) { + if (output.good() && fgSaveFlight(output, write_all)) { output.close(); SG_LOG(SG_INPUT, SG_INFO, "Saved flight to " << file); return true; @@ -105,7 +193,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", @@ -126,6 +214,28 @@ do_panel_load (const SGPropertyNode * arg) } +/** + * Built-in command: pass a mouse click to the panel. + * + * button: the mouse button number, zero-based. + * is-down: true if the button is down, false if it is up. + * x-pos: the x position of the mouse click. + * y-pos: the y position of the mouse click. + */ +static bool +do_panel_mouse_click (const SGPropertyNode * arg, SGCommandState ** state) +{ + if (current_panel != 0) + return current_panel + ->doMouseAction(arg->getIntValue("button"), + arg->getBoolValue("is-down") ? PU_DOWN : PU_UP, + arg->getIntValue("x-pos"), + arg->getIntValue("y-pos")); + else + return false; +} + + /** * Built-in command: (re)load preferences. * @@ -133,20 +243,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; } @@ -154,10 +265,17 @@ 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()); + globals->get_current_view()->setHeadingOffset_deg(0.0); + globals->get_viewmgr()->next_view(); + if ( !strcmp(fgGetString("/sim/flight-model"), "ada") ) { + globals->get_props()->setBoolValue( "/sim/hud/visibility", true ); + if ( globals->get_viewmgr()->get_current() == 1 ) { + globals->get_props()->setBoolValue( "/sim/hud/visibility", false ); + } + } + global_tile_mgr.refresh_view_timestamps(); // fgReshape(fgGetInt("/sim/startup/xsize"), fgGetInt("/sim/startup/ysize")); return true; } @@ -167,7 +285,7 @@ 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; @@ -178,26 +296,32 @@ do_screen_capture (const SGPropertyNode * arg) * Reload the tile cache. */ static bool -do_tile_cache_reload (const SGPropertyNode * arg) +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"), - fgGetDouble("/position/latitude")); - } else { - SG_LOG( SG_GENERAL, SG_ALERT, - "Error in Tile Manager initialization!" ); - exit(-1); - } - BusyCursor(1); - if ( !freeze ) - globals->set_freeze( false ); - return true; + static const SGPropertyNode *master_freeze + = fgGetNode("/sim/freeze/master"); + bool freeze = master_freeze->getBoolValue(); + SG_LOG(SG_INPUT, SG_INFO, "ReIniting TileCache"); + if ( !freeze ) { + fgSetBool("/sim/freeze/master", true); + } + // BusyCursor(0); + if ( global_tile_mgr.init() ) { + // Load the local scenery data + double visibility_meters = fgGetDouble("/environment/visibility-m"); + global_tile_mgr.update(fgGetDouble("/position/longitude-deg"), + fgGetDouble("/position/latitude-deg"), + visibility_meters); + } else { + SG_LOG( SG_GENERAL, SG_ALERT, + "Error in Tile Manager initialization!" ); + exit(-1); + } + // BusyCursor(1); + if ( !freeze ) { + fgSetBool("/sim/freeze/master", false); + } + return true; } @@ -205,7 +329,7 @@ do_tile_cache_reload (const SGPropertyNode * arg) * Update the lighting manually. */ static bool -do_lighting_update (const SGPropertyNode * arg) +do_lighting_update (const SGPropertyNode * arg, SGCommandState ** state) { fgUpdateSkyAndLightingParams(); return true; @@ -218,14 +342,12 @@ do_lighting_update (const SGPropertyNode * arg) * 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()); } @@ -236,29 +358,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); + if (*state == 0) + *state = new PropertyCommandState(arg); + SGPropertyNode * prop = ((PropertyCommandState *)(*state))->getProp(); + const SGPropertyNode * value = + ((PropertyCommandState *)(*state))->getValue(); - switch (node->getType()) { + switch (prop->getType()) { case SGPropertyNode::BOOL: - return node->setBoolValue(arg->getBoolValue("value")); + return prop->setBoolValue(value->getBoolValue()); case SGPropertyNode::INT: - return node->setIntValue(arg->getIntValue("value")); + return prop->setIntValue(value->getIntValue()); case SGPropertyNode::LONG: - return node->setLongValue(arg->getLongValue("value")); + return prop->setLongValue(value->getLongValue()); case SGPropertyNode::FLOAT: - return node->setFloatValue(arg->getFloatValue("value")); + return prop->setFloatValue(value->getFloatValue()); case SGPropertyNode::DOUBLE: - return node->setDoubleValue(arg->getDoubleValue("value")); + return prop->setDoubleValue(value->getDoubleValue()); case SGPropertyNode::STRING: - return node->setStringValue(arg->getStringValue("value")); + return prop->setStringValue(value->getStringValue()); default: - return node->setUnknownValue(arg->getStringValue("value")); + return prop->setUnspecifiedValue(value->getStringValue()); } } @@ -267,37 +389,135 @@ 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). + * offset: a normalized amount to offset by (if step is not present). + * factor: the amount by which to multiply the offset (if step is not present). + * 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 == "") - return false; + if (*state == 0) + *state = new PropertyCommandState(arg); + bool hasStep = ((PropertyCommandState *)(*state))->hasStep(); + SGPropertyNode * prop = ((PropertyCommandState *)(*state))->getProp(); + const SGPropertyNode * step = ((PropertyCommandState *)(*state))->getStep(); + const SGPropertyNode * offset = + ((PropertyCommandState *)(*state))->getOffset(); + const SGPropertyNode * factor = + ((PropertyCommandState *)(*state))->getFactor(); + const SGPropertyNode * min = ((PropertyCommandState *)(*state))->getMin(); + const SGPropertyNode * max = ((PropertyCommandState *)(*state))->getMax(); + bool wrap = ((PropertyCommandState *)(*state))->getWrap()->getBoolValue(); + + double amount = 0; + if (!hasStep) { + amount = offset->getDoubleValue() * factor->getDoubleValue(); + } - SGPropertyNode * node = fgGetNode(propname, true); - switch (node->getType()) { + switch (prop->getType()) { case SGPropertyNode::BOOL: - if (arg->getBoolValue("step")) - return node->setBoolValue(!node->getBoolValue()); + bool value; + if (hasStep) + value = step->getBoolValue(); + else + value = (0.0 != amount); + if (value) + return prop->setBoolValue(!prop->getBoolValue()); else return true; - case SGPropertyNode::INT: - return node->setIntValue(node->getIntValue() - + arg->getIntValue("step")); - case SGPropertyNode::LONG: - return node->setLongValue(node->getLongValue() - + arg->getLongValue("step")); - case SGPropertyNode::FLOAT: - return node->setFloatValue(node->getFloatValue() - + arg->getFloatValue("step")); + case SGPropertyNode::INT: { + int value; + if (hasStep) + value = prop->getIntValue() + step->getIntValue(); + else + value = prop->getIntValue() + int(amount); + 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; + if (hasStep) + value = prop->getLongValue() + step->getLongValue(); + else + value = prop->getLongValue() + long(amount); + 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; + if (hasStep) + value = prop->getFloatValue() + step->getFloatValue(); + else + value = prop->getFloatValue() + float(amount); + 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::UNKNOWN: - return node->setDoubleValue(node->getDoubleValue() - + arg->getDoubleValue("step")); - default: // doesn't make sense with strings + case SGPropertyNode::UNSPECIFIED: + case SGPropertyNode::NONE: { + double value; + if (hasStep) + value = prop->getDoubleValue() + step->getDoubleValue(); + else + value = prop->getDoubleValue() + amount; + 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; } } @@ -310,31 +530,32 @@ do_property_adjust (const SGPropertyNode * arg) * factor: the amount by which to multiply. */ static bool -do_property_multiply (const SGPropertyNode * arg) +do_property_multiply (const SGPropertyNode * arg, SGCommandState ** state) { - const string & propname = arg->getStringValue("property", ""); - if (propname == "") - return false; + if (*state == 0) + *state = new PropertyCommandState(arg); + SGPropertyNode * prop = ((PropertyCommandState *)(*state))->getProp(); + const SGPropertyNode * factor = + ((PropertyCommandState *)(*state))->getFactor(); - SGPropertyNode * node = fgGetNode(propname, true); - - switch (node->getType()) { + switch (prop->getType()) { case SGPropertyNode::BOOL: - return node->setBoolValue(node->getBoolValue() && - arg->getBoolValue("factor")); + return prop->setBoolValue(prop->getBoolValue() && + factor->getBoolValue()); case SGPropertyNode::INT: - return node->setIntValue(int(node->getIntValue() - * arg->getDoubleValue("factor"))); + return prop->setIntValue(int(prop->getIntValue() + * factor->getDoubleValue())); case SGPropertyNode::LONG: - return node->setLongValue(long(node->getLongValue() - * arg->getDoubleValue("factor"))); + return prop->setLongValue(long(prop->getLongValue() + * factor->getDoubleValue())); case SGPropertyNode::FLOAT: - return node->setFloatValue(float(node->getFloatValue() - * arg->getDoubleValue("factor"))); + return prop->setFloatValue(float(prop->getFloatValue() + * factor->getDoubleValue())); case SGPropertyNode::DOUBLE: - case SGPropertyNode::UNKNOWN: - return node->setDoubleValue(node->getDoubleValue() - * arg->getDoubleValue("factor")); + case SGPropertyNode::UNSPECIFIED: + case SGPropertyNode::NONE: + return prop->setDoubleValue(prop->getDoubleValue() + * factor->getDoubleValue()); default: // doesn't make sense with strings return false; } @@ -348,18 +569,17 @@ do_property_multiply (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.c_str())); } @@ -372,17 +592,34 @@ 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(); + bool squared = + ((PropertyCommandState *)(*state))->getSquared()->getBoolValue(); + + if (squared) + setting = (setting < 0 ? -1 : 1) * setting * setting; + double result = (setting + offset) * factor; + + return prop->setDoubleValue(result); } +//////////////////////////////////////////////////////////////////////// +// Command setup. +//////////////////////////////////////////////////////////////////////// + + /** * Table of built-in commands. * @@ -398,6 +635,7 @@ static struct { { "load", do_load }, { "save", do_save }, { "panel-load", do_panel_load }, + { "panel-mouse-click", do_panel_mouse_click }, { "preferences-load", do_preferences_load }, { "view-cycle", do_view_cycle }, { "screen-capture", do_screen_capture }, @@ -429,4 +667,4 @@ fgInitCommands () } } -// end of fg_commands.hxx +// end of fg_commands.cxx