fly/flightgear
1
0
Fork 0
Code Activity

A couple minor tweaks to the replay subsystem to allow "pausing" the replay.

Browse source
This commit is contained in:
curt 2005-01-05 05:45:38 +00:00
parent 632f5993f7
commit 9f531ff901
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Main/fg_commands.cxx
View file

@ -1153,7 +1153,7 @@ static bool
do_replay (const SGPropertyNode * arg) do_replay (const SGPropertyNode * arg)
{ {
// freeze the master fdm // freeze the master fdm
fgSetBool( "/sim/freeze/replay", true ); fgSetInt( "/sim/freeze/replay-state", 1 );
FGReplay *r = (FGReplay *)(globals->get_subsystem( "replay" )); FGReplay *r = (FGReplay *)(globals->get_subsystem( "replay" ));

22
src/Main/main.cxx
View file

@ -127,8 +127,8 @@ extern int _bootstrap_OSInit;
void fgUpdateTimeDepCalcs() { void fgUpdateTimeDepCalcs() {
static bool inited = false; static bool inited = false;
static const SGPropertyNode *replay_master static const SGPropertyNode *replay_state
= fgGetNode( "/sim/freeze/replay", true ); = fgGetNode( "/sim/freeze/replay-state", true );
static SGPropertyNode *replay_time static SGPropertyNode *replay_time
= fgGetNode( "/sim/replay/time", true ); = fgGetNode( "/sim/replay/time", true );
// static const SGPropertyNode *replay_end_time // static const SGPropertyNode *replay_end_time
@ -162,15 +162,21 @@ void fgUpdateTimeDepCalcs() {
inited = true; inited = true;
} }
if ( ! replay_master->getBoolValue() ) { if ( replay_state->getIntValue() == 0 ) {
// replay off, run fdm
cur_fdm_state->update( delta_time_sec ); cur_fdm_state->update( delta_time_sec );
} else { } else {
FGReplay *r = (FGReplay *)(globals->get_subsystem( "replay" )); FGReplay *r = (FGReplay *)(globals->get_subsystem( "replay" ));
r->replay( replay_time->getDoubleValue() ); r->replay( replay_time->getDoubleValue() );
replay_time->setDoubleValue( replay_time->getDoubleValue() if ( replay_state->getIntValue() == 1 ) {
+ ( delta_time_sec // normal playback
* fgGetInt("/sim/speed-up") ) ); replay_time->setDoubleValue( replay_time->getDoubleValue()
} + ( delta_time_sec
* fgGetInt("/sim/speed-up") ) );
} else if ( replay_state->getIntValue() == 2 ) {
// paused playback (don't advance replay time)
}
}
} else { } else {
// do nothing, fdm isn't inited yet // do nothing, fdm isn't inited yet
} }
@ -213,8 +219,6 @@ static void fgMainLoop( void ) {
= fgGetNode("/sim/freeze/clock", true); = fgGetNode("/sim/freeze/clock", true);
static const SGPropertyNode *cur_time_override static const SGPropertyNode *cur_time_override
= fgGetNode("/sim/time/cur-time-override", true); = fgGetNode("/sim/time/cur-time-override", true);
// static const SGPropertyNode *replay_master
// = fgGetNode("/sim/freeze/replay", true);
SGCloudLayer::enable_bump_mapping = fgGetBool("/sim/rendering/bump-mapping"); SGCloudLayer::enable_bump_mapping = fgGetBool("/sim/rendering/bump-mapping");