fly/flightgear
1
0
Fork 0
Code Activity

Modified Files:

Browse source 
src/AIModel/AIBase.cxx src/Main/main.cxx src/Main/renderer.cxx
	Reflect last change in SimGear
This commit is contained in:
frohlich 2006-10-31 06:27:34 +00:00
parent f62fe07a48
commit 6b9d29194b
3 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/AIModel/AIBase.cxx
View file

@ -35,7 +35,6 @@
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/scene/model/location.hxx> #include <simgear/scene/model/location.hxx>
#include <simgear/scene/model/model.hxx> #include <simgear/scene/model/model.hxx>
#include <simgear/scene/model/personality.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
@ -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 // 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 // if not load it, otherwise, get the memory pointer and do something like
// SetModel as in ATC/AIEntity.cxx // SetModel as in ATC/AIEntity.cxx
osg::Group* personality_branch = new SGPersonalityBranch; osg::Group* personality_branch = new osg::Group;
model = manager->getModel(path); model = manager->getModel(path);
if (!(model)) { if (!(model)) {

1
src/Main/main.cxx
View file

@ -323,7 +323,6 @@ static void fgMainLoop( void ) {
} }
last_time_stamp = current_time_stamp; last_time_stamp = current_time_stamp;
globals->inc_sim_time_sec( delta_time_sec ); 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. // These are useful, especially for Nasal scripts.
fgSetDouble("/sim/time/delta-realtime-sec", real_delta_time_sec); fgSetDouble("/sim/time/delta-realtime-sec", real_delta_time_sec);

1
src/Main/renderer.cxx
View file

@ -404,7 +404,6 @@ FGRenderer::update( bool refresh_camera_settings ) {
// Keep resetting sim time while the sim is initializing // Keep resetting sim time while the sim is initializing
globals->set_sim_time_sec( 0.0 ); globals->set_sim_time_sec( 0.0 );
SGAnimation::set_sim_time_sec( 0.0 );
return; return;
} }