fly/flightgear
1
0
Fork 0
Code Activity

Add properties for raw axis and button values, for use

Browse source 
in joystick configuration function.  Also rationalize references to
/sim/fg-home into a global property.
This commit is contained in:
Stuart Buchanan 2012-08-23 21:52:30 +01:00
parent ced478cf95
commit cce186a57c
11 changed files with 42 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Airports/groundnetwork.cxx
View file

@ -272,7 +272,7 @@ FGGroundNetwork::~FGGroundNetwork()
bool saveData = false;
ofstream cachefile;
if (fgGetBool("/sim/ai/groundnet-cache")) {
SGPath cacheData(fgGetString("/sim/fg-home"));
SGPath cacheData(globals->get_fg_home());
cacheData.append("ai");
string airport = parent->getId();
@ -316,7 +316,7 @@ void FGGroundNetwork::saveElevationCache() {
bool saveData = false;
ofstream cachefile;
if (fgGetBool("/sim/ai/groundnet-cache")) {
SGPath cacheData(fgGetString("/sim/fg-home"));
SGPath cacheData(globals->get_fg_home());
cacheData.append("ai");
string airport = parent->getId();
@ -432,7 +432,7 @@ void FGGroundNetwork::init()
//cerr << "Done initializing ground network" << endl;
//exit(1);
if (fgGetBool("/sim/ai/groundnet-cache")) {
SGPath cacheData(fgGetString("/sim/fg-home"));
SGPath cacheData(globals->get_fg_home());
cacheData.append("ai");
string airport = parent->getId();

4
src/GUI/gui_funcs.cxx
View file

@ -483,7 +483,7 @@ namespace
if (_path.create_dir( 0755 )) {
SG_LOG(SG_GENERAL, SG_ALERT, "Cannot create screenshot directory '"
<< dir << "'. Trying home directory.");
dir = fgGetString("/sim/fg-home");
dir = globals->get_fg_home();
}
char filename[24];
@ -588,7 +588,7 @@ bool fgDumpSnapShot ()
if (path.create_dir( 0755 )) {
SG_LOG(SG_GENERAL, SG_ALERT, "Cannot create screenshot directory '"
<< dir << "'. Trying home directory.");
dir = fgGetString("/sim/fg-home");
dir = globals->get_fg_home();
}
char filename[24];

1
src/Input/FGDeviceConfigurationMap.cxx
View file

@ -39,6 +39,7 @@ FGDeviceConfigurationMap::FGDeviceConfigurationMap( const char * relative_path,
childname(aChildname)
{
int index = 1000;
scan_dir( SGPath(globals->get_fg_home(), relative_path), &index);
scan_dir( SGPath(globals->get_fg_root(), relative_path), &index);
PropertyList childNodes = base->getChildren(childname);

11
src/Input/FGJoystickInput.cxx
View file

@ -104,6 +104,7 @@ void FGJoystickInput::init()
jsInit();
SG_LOG(SG_INPUT, SG_DEBUG, "Initializing joystick bindings");
SGPropertyNode_ptr js_nodes = fgGetNode("/input/joysticks", true);
status_node = fgGetNode("/devices/status/joysticks", true);
FGDeviceConfigurationMap configMap("Input/Joysticks", js_nodes, "js-named");
@ -310,6 +311,16 @@ void FGJoystickInput::update( double dt )
js->read(&buttons, axis_values);
if (js->notWorking()) // If js is disconnected
continue;
// Update device status
SGPropertyNode_ptr status = status_node->getChild("joystick", i, true);
for (int j = 0; j < MAX_JOYSTICK_AXES; j++) {
status->getChild("axis", j, true)->setFloatValue(axis_values[j]);
}
for (int j = 0; j < MAX_JOYSTICK_BUTTONS; j++) {
status->getChild("button", j, true)->setBoolValue((buttons & (1u << j)) > 0 );
}
// Fire bindings for the axes.
for (int j = 0; j < bindings[i].naxes; j++) {

3
src/Input/FGJoystickInput.hxx
View file

@ -53,6 +53,7 @@ public:
private:
void _remove(bool all);
SGPropertyNode_ptr status_node;
/**
* Settings for a single joystick axis.
@ -83,7 +84,7 @@ private:
int nbuttons;
axis * axes;
FGButton * buttons;
bool predefined;
bool predefined;
};
joystick bindings[MAX_JOYSTICKS];

6
src/Main/fg_init.cxx
View file

@ -406,6 +406,8 @@ bool fgInitConfig ( int argc, char **argv )
const char *fg_home = getenv("FG_HOME");
if (fg_home)
dataPath = fg_home;
globals->set_fg_home(dataPath.c_str());
simgear::Dir exportDir(simgear::Dir(dataPath).file("Export"));
if (!exportDir.exists()) {
@ -588,8 +590,8 @@ static bool fgSetPosFromAirportIDandParkpos( const string& id, const string& par
string fltType;
string acOperator;
SGPath acData;
try {
acData = fgGetString("/sim/fg-home");
try {
acData = globals->get_fg_home();
acData.append("aircraft-data");
string acfile = fgGetString("/sim/aircraft") + string(".xml");
acData.append(acfile);

10
src/Main/globals.cxx
View file

@ -128,6 +128,7 @@ FGGlobals::FGGlobals() :
event_mgr( new SGEventMgr ),
sim_time_sec( 0.0 ),
fg_root( "" ),
fg_home( "" ),
time_params( NULL ),
ephem( NULL ),
mag( NULL ),
@ -214,7 +215,6 @@ FGGlobals::~FGGlobals()
locale = NULL;
}
// set the fg_root path
void FGGlobals::set_fg_root (const string &root) {
SGPath tmp(root);
@ -242,6 +242,12 @@ void FGGlobals::set_fg_root (const string &root) {
simgear::ResourceManager::PRIORITY_DEFAULT);
}
// set the fg_home path
void FGGlobals::set_fg_home (const string &home) {
SGPath tmp(home);
fg_home = tmp.realpath();
}
void FGGlobals::append_fg_scenery (const string &paths)
{
// fg_scenery.clear();
@ -483,7 +489,7 @@ FGGlobals::saveUserSettings()
// don't save settings more than once on shutdown
haveUserSettings = false;
SGPath autosaveFile(fgGetString("/sim/fg-home"));
SGPath autosaveFile(globals->get_fg_home());
autosaveFile.append( "autosave.xml" );
autosaveFile.create_dir( 0700 );
SG_LOG(SG_IO, SG_INFO, "Saving user settings to " << autosaveFile.str());

6
src/Main/globals.hxx
View file

@ -98,6 +98,9 @@ private:
// Root of FlightGear data tree
std::string fg_root;
// Users home directory for data
std::string fg_home;
// Roots of FlightGear scenery tree
string_list fg_scenery;
@ -192,6 +195,9 @@ public:
inline const std::string &get_fg_root () const { return fg_root; }
void set_fg_root (const std::string &root);
inline const std::string &get_fg_home () const { return fg_home; }
void set_fg_home (const std::string &home);
inline const string_list &get_fg_scenery () const { return fg_scenery; }
void append_fg_scenery (const std::string &scenery);

4
src/Main/options.cxx
View file

@ -1182,7 +1182,7 @@ fgOptVersion( const char *arg )
cerr << "Revision: " << REVISION << endl;
cerr << "Build-Id: " << HUDSON_BUILD_ID << endl;
cerr << "FG_ROOT=" << globals->get_fg_root() << endl;
cerr << "FG_HOME=" << fgGetString("/sim/fg-home") << endl;
cerr << "FG_HOME=" << globals->get_fg_home() << endl;
cerr << "FG_SCENERY=";
int didsome = 0;
@ -2031,7 +2031,7 @@ void Options::processOptions()
if (fgGetBool("/sim/terrasync/enabled")) {
string terrasyncDir = fgGetString("/sim/terrasync/scenery-dir");
if (terrasyncDir.empty()) {
SGPath p(fgGetString("/sim/fg-home"));
SGPath p(globals->get_fg_home());
p.append("TerraSync");
if (!p.exists()) {
simgear::Dir dd(p);

2
src/Radio/antenna.cxx
View file

@ -73,7 +73,7 @@ double FGRadioAntenna::calculate_gain(double bearing, double angle) {
void FGRadioAntenna::load_NEC_antenna_pattern(string type) {
//SGPath pattern_file(fgGetString("/sim/fg-home"));
//SGPath pattern_file(globals->get_fg_home());
SGPath pattern_file(globals->get_fg_root());
pattern_file.append("Navaids/Antennas");
pattern_file.append(type + ".txt");

4
src/Traffic/TrafficMgr.cxx
View file

@ -99,7 +99,7 @@ void FGTrafficManager::shutdown()
bool saveData = false;
ofstream cachefile;
if (fgGetBool("/sim/traffic-manager/heuristics")) {
SGPath cacheData(fgGetString("/sim/fg-home"));
SGPath cacheData(globals->get_fg_home());
cacheData.append("ai");
string airport = fgGetString("/sim/presets/airport-id");
@ -223,7 +223,7 @@ void FGTrafficManager::loadHeuristics()
HeuristicMap heurMap;
//cerr << "Processing Heuristics" << endl;
// Load the heuristics data
SGPath cacheData(fgGetString("/sim/fg-home"));
SGPath cacheData(globals->get_fg_home());
cacheData.append("ai");
string airport = fgGetString("/sim/presets/airport-id");
if ((airport) != "") {