diff --git a/src/ATCDCL/AIEntity.cxx b/src/ATCDCL/AIEntity.cxx index 3f0f1f7ea..aa741e359 100644 --- a/src/ATCDCL/AIEntity.cxx +++ b/src/ATCDCL/AIEntity.cxx @@ -53,8 +53,7 @@ FGAIEntity::~FGAIEntity() { } void FGAIEntity::SetModel(osg::Node* model) { - _model = model; - _aip.init(_model.get()); + _aip.init(model); _aip.setVisible(false); globals->get_scenery()->get_scene_graph()->addChild(_aip.getSceneGraph()); diff --git a/src/ATCDCL/AIEntity.hxx b/src/ATCDCL/AIEntity.hxx index 2822e0184..f85dae217 100644 --- a/src/ATCDCL/AIEntity.hxx +++ b/src/ATCDCL/AIEntity.hxx @@ -61,8 +61,6 @@ protected: double _roll; //degrees double _pitch; //degrees - char* _model_path; //Path to the 3D model - osg::ref_ptr _model; // Pointer to the model SGModelPlacement _aip; double _ground_elevation_m; diff --git a/src/ATCDCL/AIGAVFRTraffic.hxx b/src/ATCDCL/AIGAVFRTraffic.hxx index 771aa8f9d..ce3870dcf 100644 --- a/src/ATCDCL/AIGAVFRTraffic.hxx +++ b/src/ATCDCL/AIGAVFRTraffic.hxx @@ -111,8 +111,6 @@ private: bool _entering; bool _turning; - //ssgBranch* _model; - int GetQuadrangleAltitude(int dir, int des_alt); Point3D GetPatternApproachPos(); diff --git a/src/ATCDCL/AILocalTraffic.cxx b/src/ATCDCL/AILocalTraffic.cxx index 091709e61..51399a286 100644 --- a/src/ATCDCL/AILocalTraffic.cxx +++ b/src/ATCDCL/AILocalTraffic.cxx @@ -53,16 +53,6 @@ using std::string; #include "AIMgr.hxx" FGAILocalTraffic::FGAILocalTraffic() { - /*ssgBranch *model = sgLoad3DModel( globals->get_fg_root(), - planepath.c_str(), - globals->get_props(), - globals->get_sim_time_sec() ); - *//* - _model = model; - _aip.init(_model); - */ - //SetModel(model); - ATC = globals->get_ATC_mgr(); // TODO - unhardwire this