X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_commands.cxx;h=e86f7f849873674e86313d0dfc9699eecf3c8c24;hb=a4e81f4ff075e6a3c0c2ea1b5a29c0bcdfdbc671;hp=2f52e91de381e68d7cd35b5faf039e8bb497155a;hpb=a285ff5ea47e7951430e28a93b233a5ab59e49b2;p=flightgear.git diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx index 2f52e91de..e86f7f849 100644 --- a/src/Main/fg_commands.cxx +++ b/src/Main/fg_commands.cxx @@ -1,5 +1,7 @@ // fg_commands.cxx - internal FGFS commands. +#include // strcmp() + #include #include @@ -50,6 +52,7 @@ public: 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; } @@ -168,9 +171,10 @@ static bool 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; @@ -210,6 +214,28 @@ do_panel_load (const SGPropertyNode * arg, SGCommandState ** state) } +/** + * 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. * @@ -241,14 +267,15 @@ do_preferences_load (const SGPropertyNode * arg, SGCommandState ** state) static bool 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()); - if ( fgGetString("/sim/flight-model") == "ada" ) { + 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; } @@ -281,8 +308,10 @@ do_tile_cache_reload (const SGPropertyNode * arg, SGCommandState ** state) // 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")); + fgGetDouble("/position/latitude-deg"), + visibility_meters); } else { SG_LOG( SG_GENERAL, SG_ALERT, "Error in Tile Manager initialization!" ); @@ -361,6 +390,8 @@ do_property_assign (const SGPropertyNode * arg, SGCommandState ** state) * * property: the name of the property to 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; @@ -372,20 +403,40 @@ do_property_adjust (const SGPropertyNode * arg, SGCommandState ** state) { 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(); + } + + switch (prop->getType()) { case SGPropertyNode::BOOL: - if (step->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: { - int value = prop->getIntValue() + step->getIntValue(); + 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(); @@ -401,7 +452,11 @@ do_property_adjust (const SGPropertyNode * arg, SGCommandState ** state) return prop->setIntValue(value); } case SGPropertyNode::LONG: { - long value = prop->getLongValue() + step->getLongValue(); + 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(); @@ -417,7 +472,11 @@ do_property_adjust (const SGPropertyNode * arg, SGCommandState ** state) return prop->setLongValue(value); } case SGPropertyNode::FLOAT: { - float value = prop->getFloatValue() + step->getFloatValue(); + 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(); @@ -435,7 +494,11 @@ do_property_adjust (const SGPropertyNode * arg, SGCommandState ** state) case SGPropertyNode::DOUBLE: case SGPropertyNode::UNSPECIFIED: case SGPropertyNode::NONE: { - double value = prop->getDoubleValue() + step->getDoubleValue(); + 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(); @@ -516,7 +579,7 @@ do_property_swap (const SGPropertyNode * arg, SGCommandState ** state) // FIXME: inefficient const string & tmp = prop1->getStringValue(); return (prop1->setUnspecifiedValue(prop2->getStringValue()) && - prop2->setUnspecifiedValue(tmp)); + prop2->setUnspecifiedValue(tmp.c_str())); } @@ -543,9 +606,9 @@ do_property_scale (const SGPropertyNode * arg, SGCommandState ** state) bool squared = ((PropertyCommandState *)(*state))->getSquared()->getBoolValue(); - double result = (setting + offset) * factor; if (squared) - result = (result < 0 ? -1 : 1) * result * result; + setting = (setting < 0 ? -1 : 1) * setting * setting; + double result = (setting + offset) * factor; return prop->setDoubleValue(result); } @@ -572,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 }, @@ -603,4 +667,4 @@ fgInitCommands () } } -// end of fg_commands.hxx +// end of fg_commands.cxx