fly/flightgear
1
0
Fork 0
Code Activity

Changes to track updates to SimGear.

Browse source
This commit is contained in:
curt 2003-05-15 21:35:51 +00:00
parent 55ff4577d3
commit 6200c3cb62
6 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Main/globals.cxx
View file

@ -69,7 +69,7 @@ FGGlobals::FGGlobals() :
initial_state( NULL ),
locale( NULL ),
commands( new SGCommandMgr ),
model_loader( NULL ),
model_lib( NULL ),
acmodel( NULL ),
model_mgr( NULL ),
channel_options_list( NULL ),

10
src/Main/globals.hxx
View file

@ -53,7 +53,7 @@ class SGEphemeris;
class SGCommandMgr;
class SGMagVar;
class SGMaterialLib;
class SGModelLoader;
class SGModelLib;
class SGPropertyNode;
class SGRoute;
class SGTime;
@ -163,7 +163,7 @@ private:
SGCommandMgr *commands;
SGModelLoader * model_loader;
SGModelLib *model_lib;
FGAircraftModel *acmodel;
@ -282,10 +282,10 @@ public:
inline SGCommandMgr *get_commands () { return commands; }
inline SGModelLoader * get_model_loader () { return model_loader; }
inline SGModelLib * get_model_lib () { return model_lib; }
inline void set_model_loader (SGModelLoader * loader) {
model_loader = loader;
inline void set_model_lib (SGModelLib *m) {
model_lib = m;
}
inline FGAircraftModel *get_aircraft_model () { return acmodel; }

6
src/Main/main.cxx
View file

@ -79,9 +79,9 @@ SG_USING_STD(endl);
#include <simgear/misc/sg_path.hxx>
#include <simgear/scene/material/matlib.hxx>
#include <simgear/scene/model/animation.hxx>
#include <simgear/scene/model/loader.hxx>
#include <simgear/scene/model/location.hxx>
#include <simgear/scene/model/model.hxx>
#include <simgear/scene/model/modellib.hxx>
#ifdef FG_USE_CLOUDS_3D
# include <simgear/sky/clouds3d/SkySceneLoader.hpp>
# include <simgear/sky/clouds3d/SkyUtil.hpp>
@ -1698,7 +1698,7 @@ static bool fgMainInit( int argc, char **argv ) {
// Initialize the general model subsystem.
////////////////////////////////////////////////////////////////////
globals->set_model_loader(new SGModelLoader);
globals->set_model_lib(new SGModelLib);
globals->set_model_mgr(new FGModelMgr);
globals->get_model_mgr()->init();
globals->get_model_mgr()->bind();
@ -1934,7 +1934,7 @@ void fgLoadDCS(void) {
if ( strcmp(obj_filename,"repeat") != 0) {
ship_obj =
globals->get_model_loader()->load_model( globals->get_fg_root(), obj_filename, globals->get_props(), globals->get_sim_time_sec() );
globals->get_model_lib()->load_model( globals->get_fg_root(), obj_filename, globals->get_props(), globals->get_sim_time_sec() );
}
if ( ship_obj != NULL ) {

6
src/MultiPlayer/mpplayer.cxx
View file

@ -52,7 +52,7 @@
#include <plib/netSocket.h>
#include <plib/sg.h>
#include <simgear/scene/model/loader.hxx>
#include <simgear/scene/model/modellib.hxx>
#include <Main/globals.hxx>
#include <Scenery/scenery.hxx>
@ -141,7 +141,7 @@ void MPPlayer::Close(void) {
// Flush the model loader so that it erases the model from its list of
// models.
globals->get_model_loader()->flush();
globals->get_model_lib()->flush1();
// Assume that plib/ssg deletes the model and transform as their
// refcounts should be zero.
@ -247,7 +247,7 @@ void MPPlayer::LoadModel(void) {
m_ModelTrans = new ssgTransform;
// Load the model
m_Model = globals->get_model_loader()->load_model( globals->get_fg_root(),
m_Model = globals->get_model_lib()->load_model( globals->get_fg_root(),
m_sModelName,
globals->get_props(),
globals->get_sim_time_sec() );

2
src/Objects/userdata.cxx
View file

@ -102,7 +102,7 @@ void TriUserData::add_object_to_triangle (SGMatModel * object)
ssgTransform * pos = new ssgTransform;
pos->setTransform(mat);
pos->addKid( object->get_random_model( globals->get_model_loader(),
pos->addKid( object->get_random_model( globals->get_model_lib(),
globals->get_fg_root(),
globals->get_props(),
globals->get_sim_time_sec() ) );

4
src/Scenery/tilemgr.cxx
View file

@ -34,7 +34,7 @@
#include <simgear/math/sg_geodesy.hxx>
#include <simgear/math/vector.hxx>
#include <simgear/misc/exception.hxx>
#include <simgear/scene/model/loader.hxx>
#include <simgear/scene/model/modellib.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
@ -281,7 +281,7 @@ void FGTileMgr::update_queues()
try
{
ssgEntity *obj_model =
globals->get_model_loader()->load_model( globals->get_fg_root(),
globals->get_model_lib()->load_model( globals->get_fg_root(),
dm->get_model_path(),
globals->get_props(),
globals->get_sim_time_sec() );