#include <string.h> // strcmp()
#include <simgear/compiler.h>
-#include <simgear/misc/exception.hxx>
#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/structure/exception.hxx>
+#include <simgear/structure/commands.hxx>
#include <simgear/props/props.hxx>
#include <Cockpit/panel.hxx>
#include <Cockpit/panel_io.hxx>
+#include <Environment/environment.hxx>
#include <FDM/flight.hxx>
#include <GUI/gui.h>
#include <GUI/new_gui.hxx>
#if defined(HAVE_PLIB_PSL)
# include <Scripting/scriptmgr.hxx>
#endif
+#include <Scripting/NasalSys.hxx>
#include <Time/sunsolver.hxx>
#include <Time/tmp.hxx>
#include "fg_init.hxx"
+#include "fg_io.hxx"
#include "fg_commands.hxx"
#include "fg_props.hxx"
+#include "globals.hxx"
+#include "logger.cxx"
+#include "util.hxx"
+#include "viewmgr.hxx"
SG_USING_STD(string);
SG_USING_STD(ifstream);
SG_USING_STD(ofstream);
-#include "fg_props.hxx"
-#include "fg_io.hxx"
-#include "globals.hxx"
-#include "util.hxx"
-#include "viewmgr.hxx"
-
\f
////////////////////////////////////////////////////////////////////////
}
#endif // HAVE_PLIB_PSL
+/**
+ * Built-in command: run a Nasal script.
+ */
+static bool
+do_nasal (const SGPropertyNode * arg)
+{
+ return ((FGNasalSys*)globals->get_subsystem("nasal"))->handleCommand(arg);
+}
/**
* Built-in command: exit FlightGear.
} else {
for ( unsigned int i = 0; i < subsystems.size(); i++ ) {
const char * name = subsystems[i]->getStringValue();
- FGSubsystem * subsystem = globals->get_subsystem(name);
+ SGSubsystem * subsystem = globals->get_subsystem(name);
if (subsystem == 0) {
result = false;
SG_LOG( SG_GENERAL, SG_ALERT,
}
}
+ globals->get_event_mgr()->reinit();
+
return result;
}
vector<SGPropertyNode_ptr> subsystems = arg->getChildren("subsystem");
for ( unsigned int i = 0; i < subsystems.size(); i++ ) {
const char * name = subsystems[i]->getStringValue();
- FGSubsystem * subsystem = globals->get_subsystem(name);
+ SGSubsystem * subsystem = globals->get_subsystem(name);
if (subsystem == 0) {
result = false;
SG_LOG(SG_GENERAL, SG_ALERT, "Subsystem " << name << "not found");
vector<SGPropertyNode_ptr> subsystems = arg->getChildren("subsystem");
for ( unsigned int i = 0; i < subsystems.size(); i++ ) {
const char * name = subsystems[i]->getStringValue();
- FGSubsystem * subsystem = globals->get_subsystem(name);
+ SGSubsystem * subsystem = globals->get_subsystem(name);
if (subsystem == 0) {
result = false;
SG_LOG(SG_GENERAL, SG_ALERT, "Subsystem " << name << "not found");
/**
- * Update the lighting manually.
+ * Set the outside air temperature at the "current" altitude by first
+ * calculating the corresponding sea level temp, and assigning that to
+ * all boundary and aloft environment layers.
*/
static bool
-do_lighting_update (const SGPropertyNode * arg)
+do_set_oat_degc (const SGPropertyNode * arg)
{
- fgUpdateSkyAndLightingParams();
- return true;
-}
+ const string &temp_str = arg->getStringValue("temp-degc", "15.0");
+
+ static const SGPropertyNode *altitude_ft
+ = fgGetNode("/position/altitude-ft");
+
+ FGEnvironment dummy; // instantiate a dummy so we can leech a method
+ dummy.set_elevation_ft( altitude_ft->getDoubleValue() );
+ dummy.set_temperature_degc( atof( temp_str.c_str() ) );
+ double temp_sea_level_degc = dummy.get_temperature_sea_level_degc();
+
+ cout << "Altitude = " << altitude_ft->getDoubleValue() << endl;
+ cout << "Temp at alt (C) = " << atof( temp_str.c_str() ) << endl;
+ cout << "Temp sea level (C) = " << temp_sea_level_degc << endl;
+
+ SGPropertyNode *node, *child;
+
+ // boundary layers
+ node = fgGetNode( "/environment/config/boundary" );
+ if ( node != NULL ) {
+ int i = 0;
+ while ( ( child = node->getNode( "entry", i ) ) != NULL ) {
+ child->setDoubleValue( "temperature-sea-level-degc",
+ temp_sea_level_degc );
+ ++i;
+ }
+ }
+
+ // aloft layers
+ node = fgGetNode( "/environment/config/aloft" );
+ if ( node != NULL ) {
+ int i = 0;
+ while ( ( child = node->getNode( "entry", i ) ) != NULL ) {
+ child->setDoubleValue( "temperature-sea-level-degc",
+ temp_sea_level_degc );
+ ++i;
+ }
+ }
+ return true;
+}
/**
* Update the lighting manually.
int warp = 0;
if ( offset_type == "real" ) {
- warp = 0;
+ warp = -orig_warp;
} else if ( offset_type == "dawn" ) {
warp = fgTimeSecondsUntilSunAngle( cur_time,
longitude->getDoubleValue()
cur_time_override->getLongValue(),
globals->get_warp() );
- fgUpdateSkyAndLightingParams();
-
return true;
}
}
+/**
+ * Built-in command: reinit the data logging system based on the
+ * current contents of the /logger tree.
+ */
+static bool
+do_data_logging_commit (const SGPropertyNode * arg)
+{
+ FGLogger *log = (FGLogger *)globals->get_subsystem("logger");
+ log->reinit();
+ return true;
+}
+
+/**
+ * Built-in command: Add a dialog to the GUI system. Does *not*
+ * display the dialog. The property node should have the same format
+ * as a dialog XML configuration. It must include:
+ *
+ * name: the name of the GUI dialog for future reference.
+ */
+static bool
+do_dialog_new (const SGPropertyNode * arg)
+{
+ NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
+
+ // Note the casting away of const: this is *real*. Doing a
+ // "dialog-apply" command later on will mutate this property node.
+ // I'm not convinced that this isn't the Right Thing though; it
+ // allows client to create a node, pass it to dialog-new, and get
+ // the values back from the dialog by reading the same node.
+ // Perhaps command arguments are not as "const" as they would
+ // seem?
+ gui->newDialog((SGPropertyNode*)arg);
+ return true;
+}
+
/**
* Built-in command: Show an XML-configured dialog.
*
do_dialog_close (const SGPropertyNode * arg)
{
NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
+ if(arg->hasValue("dialog-name"))
+ return gui->closeDialog(arg->getStringValue("dialog-name"));
return gui->closeActiveDialog();
}
#if defined(HAVE_PLIB_PSL)
{ "script", do_script },
#endif // HAVE_PLIB_PSL
+ { "nasal", do_nasal },
{ "exit", do_exit },
{ "reinit", do_reinit },
{ "suspend", do_reinit },
{ "view-cycle", do_view_cycle },
{ "screen-capture", do_screen_capture },
{ "tile-cache-reload", do_tile_cache_reload },
- { "lighting-update", do_lighting_update },
+ { "set-outside-air-temp-degc", do_set_oat_degc },
{ "timeofday", do_timeofday },
{ "property-toggle", do_property_toggle },
{ "property-assign", do_property_assign },
{ "property-scale", do_property_scale },
{ "property-cycle", do_property_cycle },
{ "property-randomize", do_property_randomize },
+ { "data-logging-commit", do_data_logging_commit },
+ { "dialog-new", do_dialog_new },
{ "dialog-show", do_dialog_show },
{ "dialog-close", do_dialog_close },
{ "dialog-show", do_dialog_show },