#include <string.h> // strcmp()
#include <algorithm>
-#include STL_STRING
+#include <iostream>
+#include <string>
#include <plib/ul.h>
#include <simgear/math/sg_random.h>
+#include <simgear/props/props_io.hxx>
#include <simgear/misc/sgstream.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/scene/material/mat.hxx>
#include "viewmgr.hxx"
-SG_USING_STD(string);
-SG_USING_STD(sort);
-SG_USING_NAMESPACE(std);
+using std::string;
+using std::sort;
+using std::cout;
+using std::cerr;
+using std::endl;
#ifndef VERSION
#define VERSION "CVS "__DATE__
static double
atof( const string& str )
{
-
-#ifdef __MWERKS__
- // -dw- if ::atof is called, then we get an infinite loop
- return std::atof( str.c_str() );
-#else
return ::atof( str.c_str() );
-#endif
}
static int
atoi( const string& str )
{
-#ifdef __MWERKS__
- // -dw- if ::atoi is called, then we get an infinite loop
- return std::atoi( str.c_str() );
-#else
return ::atoi( str.c_str() );
-#endif
}
/**
while ( true ) {
string line;
-
-#if defined( macintosh )
- getline( in, line, '\r' );
-#else
getline( in, line, '\n' );
-#endif
+
// catch extraneous (DOS) line ending character
if ( line[line.length() - 1] < 32 )
line = line.substr( 0, line.length()-1 );
return FG_OPTIONS_OK;
}
+static int
+fgOptWeather( const char *arg )
+{
+ if (arg[0])
+ fgSetString("/environment/weather-scenario", arg);
+ fgSetBool("/environment/params/real-world-weather-fetch", !strcmp(arg, "METAR"));
+ return FG_OPTIONS_OK;
+}
+
static void
clearLocation ()
{
value set to the property if has_param is false
func : function called if type==OPTION_FUNC. if has_param is true,
the value is passed to the function as a string, otherwise,
- 0 is passed.
+ s_param is passed.
For OPTION_DOUBLE and OPTION_INT, the parameter value is converted into a
double or an integer and set to the property.
enum OptionType { OPTION_BOOL, OPTION_STRING, OPTION_DOUBLE, OPTION_INT, OPTION_CHANNEL, OPTION_FUNC };
struct OptionDesc {
- char *option;
+ const char *option;
bool has_param;
enum OptionType type;
- char *property;
+ const char *property;
bool b_param;
- char *s_param;
+ const char *s_param;
int (*func)( const char * );
} fgOptionArray[] = {
{"enable-mouse-pointer", false, OPTION_STRING, "/sim/startup/mouse-pointer", false, "enabled", 0 },
{"disable-random-objects", false, OPTION_BOOL, "/sim/rendering/random-objects", false, "", 0 },
{"enable-random-objects", false, OPTION_BOOL, "/sim/rendering/random-objects", true, "", 0 },
- {"disable-real-weather-fetch", false, OPTION_BOOL, "/environment/params/real-world-weather-fetch", false, "", 0 },
- {"enable-real-weather-fetch", false, OPTION_BOOL, "/environment/params/real-world-weather-fetch", true, "", 0 },
+ {"disable-real-weather-fetch", false, OPTION_FUNC, "", false, "", fgOptWeather },
+ {"enable-real-weather-fetch", false, OPTION_FUNC, "", false, "METAR", fgOptWeather },
{"disable-ai-models", false, OPTION_BOOL, "/sim/ai/enabled", false, "", 0 },
{"enable-ai-models", false, OPTION_BOOL, "/sim/ai/enabled", true, "", 0 },
{"disable-freeze", false, OPTION_BOOL, "/sim/freeze/master", false, "", 0 },
{"carrier", true, OPTION_FUNC, "", false, "", fgOptCarrier },
{"parkpos", true, OPTION_FUNC, "", false, "", fgOptParkpos },
{"fix", true, OPTION_FUNC, "", false, "", fgOptFIX },
- {"offset-distance", true, OPTION_DOUBLE, "/sim/presets/offset-distance", false, "", 0 },
- {"offset-azimuth", true, OPTION_DOUBLE, "/sim/presets/offset-azimuth", false, "", 0 },
+ {"offset-distance", true, OPTION_DOUBLE, "/sim/presets/offset-distance-nm", false, "", 0 },
+ {"offset-azimuth", true, OPTION_DOUBLE, "/sim/presets/offset-azimuth-deg", false, "", 0 },
{"lon", true, OPTION_FUNC, "", false, "", fgOptLon },
{"lat", true, OPTION_FUNC, "", false, "", fgOptLat },
{"altitude", true, OPTION_FUNC, "", false, "", fgOptAltitude },
}
SGPropertyNode *n = fgGetNode(name.c_str(), true);
+ bool writable = n->getAttribute(SGPropertyNode::WRITE);
+ if (!writable)
+ n->setAttribute(SGPropertyNode::WRITE, true);
+
+ bool ret = false;
if (type.empty())
- return n->setUnspecifiedValue(value.c_str());
+ ret = n->setUnspecifiedValue(value.c_str());
else if (type == "s" || type == "string")
- return n->setStringValue(value.c_str());
+ ret = n->setStringValue(value.c_str());
else if (type == "d" || type == "double")
- return n->setDoubleValue(strtod(value.c_str(), 0));
+ ret = n->setDoubleValue(strtod(value.c_str(), 0));
else if (type == "f" || type == "float")
- return n->setFloatValue(atof(value.c_str()));
+ ret = n->setFloatValue(atof(value.c_str()));
else if (type == "l" || type == "long")
- return n->setLongValue(strtol(value.c_str(), 0, 0));
+ ret = n->setLongValue(strtol(value.c_str(), 0, 0));
else if (type == "i" || type == "int")
- return n->setIntValue(atoi(value.c_str()));
+ ret = n->setIntValue(atoi(value.c_str()));
else if (type == "b" || type == "bool")
- return n->setBoolValue(value == "true" || atoi(value.c_str()) != 0);
+ ret = n->setBoolValue(value == "true" || atoi(value.c_str()) != 0);
- return false;
+ if (!writable)
+ n->setAttribute(SGPropertyNode::WRITE, false);
+ return ret;
}
} else {
arg_name = arg.substr( 2, pos - 2 );
arg_value = arg.substr( pos + 1);
- cerr << "KEY=" << arg_name << " VAL=" << arg_value << endl;
}
map<string,size_t>::iterator it = fgOptionMap.find( arg_name );
if ( it != fgOptionMap.end() ) {
if ( pt->has_param && !arg_value.empty() ) {
return pt->func( arg_value.c_str() );
} else if ( !pt->has_param && arg_value.empty() ) {
- return pt->func( 0 );
+ return pt->func( pt->s_param );
} else if ( pt->has_param ) {
SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' needs a parameter" );
return FG_OPTIONS_ERROR;
SG_LOG( SG_GENERAL, SG_INFO, "Processing config file: " << path );
in >> skipcomment;
-#ifndef __MWERKS__
while ( ! in.eof() ) {
-#else
- char c = '\0';
- while ( in.get(c) && c != '\0' ) {
- in.putback(c);
-#endif
string line;
-
-#if defined( macintosh )
- getline( in, line, '\r' );
-#else
getline( in, line, '\n' );
-#endif
// catch extraneous (DOS) line ending character
int i;
projects / flightgear.git / blobdiff