X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fglobals.cxx;h=1bcbbea678ea03b71e8fb53953e7ff8f04ae0b62;hb=988de9dbca8bc046fb0f1df4fef5bfe07355c3a6;hp=97777dcb27ef5a46983506df99492fa13e40f57d;hpb=079890e9554c276e261bc4b51cc658d0859112a7;p=flightgear.git diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx index 97777dcb2..1bcbbea67 100644 --- a/src/Main/globals.cxx +++ b/src/Main/globals.cxx @@ -2,7 +2,7 @@ // // Written by Curtis Olson, started July 2000. // -// Copyright (C) 2000 Curtis L. Olson - curt@flightgear.org +// Copyright (C) 2000 Curtis L. Olson - http://www.flightgear.org/~curt // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as @@ -16,16 +16,43 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // // $Id$ +#ifdef HAVE_CONFIG_H +# include +#endif #include #include #include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "globals.hxx" +#include "renderer.hxx" #include "viewmgr.hxx" #include "fg_props.hxx" @@ -42,46 +69,46 @@ FGGlobals *globals; // Constructor FGGlobals::FGGlobals() : + renderer( new FGRenderer ), subsystem_mgr( new SGSubsystemMgr ), event_mgr( new SGEventMgr ), sim_time_sec( 0.0 ), fg_root( "" ), - fg_scenery( "" ), -#if defined(FX) && defined(XMESA) - fullscreen( true ), -#endif warp( 0 ), warp_delta( 0 ), time_params( NULL ), ephem( NULL ), mag( NULL ), + matlib( NULL ), route_mgr( NULL ), current_panel( NULL ), soundmgr( NULL ), airports( NULL ), ATC_mgr( NULL ), - ATC_display( NULL ), AI_mgr( NULL ), controls( NULL ), viewmgr( NULL ), props( new SGPropertyNode ), initial_state( NULL ), locale( NULL ), - commands( new SGCommandMgr ), - model_lib( NULL ), + commands( SGCommandMgr::instance() ), acmodel( NULL ), model_mgr( NULL ), channel_options_list( NULL ), - initial_waypoints(0), + initial_waypoints( NULL ), scenery( NULL ), tile_mgr( NULL ), io( new FGIO ), + fontcache ( new FGFontCache ), navlist( NULL ), loclist( NULL ), gslist( NULL ), dmelist( NULL ), - mkrlist( NULL ), - fixlist( NULL ) + tacanlist( NULL ), + carrierlist( NULL ), + channellist( NULL ), + airwaynet( NULL ), + multiplayer_mgr( NULL ) { } @@ -89,67 +116,125 @@ FGGlobals::FGGlobals() : // Destructor FGGlobals::~FGGlobals() { - delete soundmgr; + delete renderer; +// The AIModels manager performs a number of actions upon + // Shutdown that implicitly assume that other subsystems + // are still operational (Due to the dynamic allocation and + // deallocation of AIModel objects. To ensure we can safely + // shut down all subsystems, make sure we take down the + // AIModels system first. + subsystem_mgr->get_group(SGSubsystemMgr::GENERAL)->remove_subsystem("ai_model"); delete subsystem_mgr; delete event_mgr; - delete initial_state; - delete props; - delete commands; + delete time_params; + delete ephem; + delete mag; + delete matlib; + delete route_mgr; + delete current_panel; + delete soundmgr; + delete airports; + + delete ATC_mgr; + delete AI_mgr; + delete controls; + delete viewmgr; + +// delete commands; + delete acmodel; + delete model_mgr; + delete channel_options_list; + delete initial_waypoints; + delete tile_mgr; + delete scenery; delete io; - - // make sure only to delete the initial waypoints list if it acually - // still exists. - if (initial_waypoints) - delete initial_waypoints; + delete fontcache; + + delete navlist; + delete loclist; + delete gslist; + delete dmelist; + delete tacanlist; + delete carrierlist; + delete channellist; + delete airwaynet; + delete multiplayer_mgr; } // set the fg_root path void FGGlobals::set_fg_root (const string &root) { fg_root = root; - + // append /data to root if it exists SGPath tmp( fg_root ); tmp.append( "data" ); tmp.append( "version" ); if ( ulFileExists( tmp.c_str() ) ) { fg_root += "/data"; - } + SG_LOG(SG_GENERAL, SG_WARN, "Warning: changing bad FG_ROOT/--fg-root to '" + << fg_root << '\''); + } + + // remove /sim/fg-root before writing to prevent hijacking + SGPropertyNode *n = fgGetNode("/sim", true); + n->removeChild("fg-root", 0, false); + n = n->getChild("fg-root", 0, true); + n->setStringValue(fg_root.c_str()); + n->setAttribute(SGPropertyNode::WRITE, false); } void FGGlobals::set_fg_scenery (const string &scenery) { - - if (scenery.empty()) - return; - - SGPath pt( scenery ), po( scenery ); - pt.append("Terrain"); - po.append("Objects"); - -cout << "pt: " << pt.str() << endl; -cout << "po: " << po.str() << endl; - ulDir *td = ulOpenDir(pt.c_str()); - ulDir *od = ulOpenDir(po.c_str()); - - if (td == NULL) { - if (od == NULL) { - fg_scenery = scenery; - } else { - fg_scenery = po.str(); - ulCloseDir(od); - } - } else { - if (od != NULL) { - pt.add(po.str()); - ulCloseDir(od); + SGPath s; + if (scenery.empty()) { + s.set( fg_root ); + s.append( "Scenery" ); + } else + s.set( scenery ); + + string_list path_list = sgPathSplit( s.str() ); + fg_scenery.clear(); + + for (unsigned i = 0; i < path_list.size(); i++) { + + ulDir *d = ulOpenDir( path_list[i].c_str() ); + if (d == NULL) + continue; + ulCloseDir( d ); + + SGPath pt( path_list[i] ), po( path_list[i] ); + pt.append("Terrain"); + po.append("Objects"); + + ulDir *td = ulOpenDir( pt.c_str() ); + ulDir *od = ulOpenDir( po.c_str() ); + + if (td == NULL && od == NULL) + fg_scenery.push_back( path_list[i] ); + else { + if (td != NULL) { + fg_scenery.push_back( pt.str() ); + ulCloseDir( td ); + } + if (od != NULL) { + fg_scenery.push_back( po.str() ); + ulCloseDir( od ); + } } - fg_scenery = pt.str(); - ulCloseDir(td); + // insert a marker for FGTileEntry::load(), so that + // FG_SCENERY=A:B becomes list ["A/Terrain", "A/Objects", "", + // "B/Terrain", "B/Objects", ""] + fg_scenery.push_back(""); } -cout << "fg_scenery: " << fg_scenery << endl; } +FGRenderer * +FGGlobals::get_renderer () const +{ + return renderer; +} + SGSubsystemMgr * FGGlobals::get_subsystem_mgr () const { @@ -183,7 +268,6 @@ FGGlobals::get_event_mgr () const void FGGlobals::saveInitialState () { - delete initial_state; initial_state = new SGPropertyNode(); if (!copyProperties(props, initial_state))