#include <simgear/compiler.h>
-#include STL_STRING
-#include STL_FSTREAM
+#include <string>
+#include <fstream>
#include <simgear/sg_inlines.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/math/sg_random.h>
#include <simgear/scene/material/mat.hxx>
+#include <simgear/scene/material/matlib.hxx>
#include <simgear/structure/exception.hxx>
#include <simgear/structure/commands.hxx>
#include <simgear/props/props.hxx>
+#include <simgear/structure/event_mgr.hxx>
+#include <simgear/sound/soundmgr_openal.hxx>
#include <Cockpit/panel.hxx>
#include <Cockpit/panel_io.hxx>
#include <Scenery/tilemgr.hxx>
#include <Scenery/scenery.hxx>
#include <Scripting/NasalSys.hxx>
-#include <Sound/fg_fx.hxx>
+#include <Sound/sample_queue.hxx>
#include <Time/sunsolver.hxx>
#include <Time/tmp.hxx>
#include "fg_init.hxx"
#include "fg_io.hxx"
+#include "fg_os.hxx"
#include "fg_commands.hxx"
#include "fg_props.hxx"
#include "globals.hxx"
#include "util.hxx"
#include "viewmgr.hxx"
#include "main.hxx"
+#include <Main/viewer.hxx>
-SG_USING_STD(string);
-SG_USING_STD(ifstream);
-SG_USING_STD(ofstream);
+using std::string;
+using std::ifstream;
+using std::ofstream;
\f
compare_values (SGPropertyNode * value1, SGPropertyNode * value2)
{
switch (value1->getType()) {
- case SGPropertyNode::BOOL:
+ case simgear::props::BOOL:
return (value1->getBoolValue() == value2->getBoolValue());
- case SGPropertyNode::INT:
+ case simgear::props::INT:
return (value1->getIntValue() == value2->getIntValue());
- case SGPropertyNode::LONG:
+ case simgear::props::LONG:
return (value1->getLongValue() == value2->getLongValue());
- case SGPropertyNode::FLOAT:
+ case simgear::props::FLOAT:
return (value1->getFloatValue() == value2->getFloatValue());
- case SGPropertyNode::DOUBLE:
+ case simgear::props::DOUBLE:
return (value1->getDoubleValue() == value2->getDoubleValue());
default:
return !strcmp(value1->getStringValue(), value2->getStringValue());
fgSetBool("/sim/signals/exit", true);
if (fgGetBool("/sim/startup/save-on-exit")) {
-#ifdef _MSC_VER
+#ifdef _WIN32
char* envp = ::getenv( "APPDATA" );
if ( envp != NULL ) {
SGPath config( envp );
static bool
do_load (const SGPropertyNode * arg)
{
- const string &file = arg->getStringValue("file", "fgfs.sav");
- ifstream input(file.c_str());
- if (input.good() && fgLoadFlight(input)) {
- input.close();
- SG_LOG(SG_INPUT, SG_INFO, "Restored flight from " << file);
- return true;
- } else {
- SG_LOG(SG_INPUT, SG_WARN, "Cannot load flight from " << file);
- return false;
- }
+ string file = arg->getStringValue("file", "fgfs.sav");
+ if (file.size() < 4 || file.substr(file.size() - 4) != ".sav")
+ file += ".sav";
+
+ if (!fgValidatePath(file.c_str(), false)) {
+ SG_LOG(SG_IO, SG_ALERT, "load: reading '" << file << "' denied "
+ "(unauthorized access)");
+ return false;
+ }
+
+ ifstream input(file.c_str());
+ if (input.good() && fgLoadFlight(input)) {
+ input.close();
+ SG_LOG(SG_INPUT, SG_INFO, "Restored flight from " << file);
+ return true;
+ } else {
+ SG_LOG(SG_INPUT, SG_WARN, "Cannot load flight from " << file);
+ return false;
+ }
}
static bool
do_save (const SGPropertyNode * arg)
{
- 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, write_all)) {
- output.close();
- SG_LOG(SG_INPUT, SG_INFO, "Saved flight to " << file);
- return true;
- } else {
- SG_LOG(SG_INPUT, SG_ALERT, "Cannot save flight to " << file);
- return false;
- }
+ string file = arg->getStringValue("file", "fgfs.sav");
+ if (file.size() < 4 || file.substr(file.size() - 4) != ".sav")
+ file += ".sav";
+
+ if (!fgValidatePath(file.c_str(), false)) {
+ SG_LOG(SG_IO, SG_ALERT, "save: writing '" << file << "' denied "
+ "(unauthorized access)");
+ return false;
+ }
+
+ 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, write_all)) {
+ output.close();
+ SG_LOG(SG_INPUT, SG_INFO, "Saved flight to " << file);
+ return true;
+ } else {
+ SG_LOG(SG_INPUT, SG_ALERT, "Cannot save flight to " << file);
+ return false;
+ }
}
return fgDumpSnapShot();
}
+static bool
+do_reload_shaders (const SGPropertyNode*)
+{
+ simgear::reload_shaders();
+ return true;
+}
+
static bool
do_dump_scene_graph (const SGPropertyNode*)
{
}
+/**
+ * Adds model to the scenery. The path to the added branch (/models/model[*])
+ * is returned in property "property".
+ */
+static bool
+do_add_model (const SGPropertyNode * arg)
+{
+ SGPropertyNode * model = fgGetNode("models", true);
+ for (int i = 0;; i++) {
+ if (i < 0)
+ return false;
+ if (!model->getChild("model", i, false)) {
+ model = model->getChild("model", i, true);
+ break;
+ }
+ }
+ copyProperties(arg, model);
+ if (model->hasValue("elevation-m"))
+ model->setDoubleValue("elevation-ft", model->getDoubleValue("elevation-m")
+ * SG_METER_TO_FEET);
+ model->getNode("load", true);
+ model->removeChildren("load");
+ const_cast<SGPropertyNode *>(arg)->setStringValue("property", model->getPath());
+ return true;
+}
+
+
/**
* Set mouse cursor coordinates and cursor shape.
*/
}
SGPropertyNode *cursor = const_cast<SGPropertyNode *>(arg)->getNode("cursor", true);
- if (cursor->getType() != SGPropertyNode::NONE)
+ if (cursor->getType() != simgear::props::NONE)
fgSetMouseCursor(cursor->getIntValue());
cursor->setIntValue(fgGetMouseCursor());
static bool
do_play_audio_sample (const SGPropertyNode * arg)
{
- FGFX *fx = (FGFX *)globals->get_subsystem("fx");
string path = arg->getStringValue("path");
string file = arg->getStringValue("file");
- double volume = arg->getDoubleValue("volume");
+ float volume = arg->getFloatValue("volume");
// cout << "playing " << path << " / " << file << endl;
try {
- fx->play_message( path, file, volume );
+ static FGSampleQueue *queue = 0;
+ if ( !queue ) {
+ SGSoundMgr *smgr = globals->get_soundmgr();
+ queue = new FGSampleQueue(smgr, "chatter");
+ queue->tie_to_listener();
+ }
+
+ SGSoundSample *msg = new SGSoundSample(path.c_str(), file.c_str());
+ msg->set_volume( volume );
+ queue->add( msg );
+
return true;
- } catch (const sg_io_exception& e) {
+ } catch (const sg_io_exception&) {
SG_LOG(SG_GENERAL, SG_ALERT, "play-audio-sample: "
"failed to load" << path << '/' << file);
return false;
if (file.extension() != "xml")
file.concat(".xml");
+ if (!fgValidatePath(file.c_str(), false)) {
+ SG_LOG(SG_IO, SG_ALERT, "loadxml: reading '" << file.str() << "' denied "
+ "(unauthorized access)");
+ return false;
+ }
+
SGPropertyNode *targetnode;
if (arg->hasValue("targetnode"))
targetnode = fgGetNode(arg->getStringValue("targetnode"), true);
return false;
}
- return true;
+ return true;
}
if (file.extension() != "xml")
file.concat(".xml");
+ if (!fgValidatePath(file.c_str(), true)) {
+ SG_LOG(SG_IO, SG_ALERT, "savexml: writing to '" << file.str() << "' denied "
+ "(unauthorized access)");
+ return false;
+ }
+
SGPropertyNode *sourcenode;
if (arg->hasValue("sourcenode"))
sourcenode = fgGetNode(arg->getStringValue("sourcenode"), true);
{ "dialog-update", do_dialog_update },
{ "dialog-apply", do_dialog_apply },
{ "gui-redraw", do_gui_redraw },
+ { "add-model", do_add_model },
{ "set-cursor", do_set_cursor },
{ "play-audio-sample", do_play_audio_sample },
{ "presets-commit", do_presets_commit },
{ "release-cockpit-button", do_release_cockpit_button },
{ "dump-scenegraph", do_dump_scene_graph },
{ "dump-terrainbranch", do_dump_terrain_branch },
+ { "reload-shaders", do_reload_shaders },
{ 0, 0 } // zero-terminated
};
projects / flightgear.git / blobdiff