From: frohlich Date: Tue, 31 Oct 2006 06:27:34 +0000 (+0000) Subject: Modified Files: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6b9d29194b4f8e3c36ca9b4b1a0fb95576744b61;p=flightgear.git Modified Files: src/AIModel/AIBase.cxx src/Main/main.cxx src/Main/renderer.cxx Reflect last change in SimGear --- diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx index 11a3877d2..b50f93983 100644 --- a/src/AIModel/AIBase.cxx +++ b/src/AIModel/AIBase.cxx @@ -35,7 +35,6 @@ #include #include #include -#include #include #include @@ -164,7 +163,7 @@ FGAIBase::load3DModel(const string& fg_root, // some more code here to check whether a model with this name has already been loaded // if not load it, otherwise, get the memory pointer and do something like // SetModel as in ATC/AIEntity.cxx - osg::Group* personality_branch = new SGPersonalityBranch; + osg::Group* personality_branch = new osg::Group; model = manager->getModel(path); if (!(model)) { diff --git a/src/Main/main.cxx b/src/Main/main.cxx index 6f82ad883..66963c2b5 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -323,7 +323,6 @@ static void fgMainLoop( void ) { } last_time_stamp = current_time_stamp; globals->inc_sim_time_sec( delta_time_sec ); - SGAnimation::set_sim_time_sec( globals->get_sim_time_sec() ); // These are useful, especially for Nasal scripts. fgSetDouble("/sim/time/delta-realtime-sec", real_delta_time_sec); diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx index 21c66f260..8e0cfb55d 100644 --- a/src/Main/renderer.cxx +++ b/src/Main/renderer.cxx @@ -404,7 +404,6 @@ FGRenderer::update( bool refresh_camera_settings ) { // Keep resetting sim time while the sim is initializing globals->set_sim_time_sec( 0.0 ); - SGAnimation::set_sim_time_sec( 0.0 ); return; }