From 7ec9d036d6120a4b659d906c1e4bac5bcc6c17e1 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Mon, 28 Mar 2011 00:30:23 +0200 Subject: [PATCH] Renaming / more consistent naming. --- src/Time/TimeManager.cxx | 14 +++++++------- src/Time/TimeManager.hxx | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Time/TimeManager.cxx b/src/Time/TimeManager.cxx index 7d4ed5607..4c4b28a76 100644 --- a/src/Time/TimeManager.cxx +++ b/src/Time/TimeManager.cxx @@ -88,11 +88,11 @@ void TimeManager::init() _warp->getIntValue()); globals->set_time_params(_impl); - // frame-rate / worst-case delay / update-rate counters + // frame-rate / worst-case latency / update-rate counters _frameRate = fgGetNode("/sim/frame-rate", true); - _frameDelayMax = fgGetNode("/sim/frame-delay-max-ms", true); + _frameLatency = fgGetNode("/sim/frame-latency-max-ms", true); _lastFrameTime = 0; - _wcFrameDelayMax = 0.0; + _frameLatencyMax = 0.0; _frameCount = 0; } @@ -162,8 +162,8 @@ void TimeManager::computeTimeDeltas(double& simDt, double& realDt) SGTimeStamp currentStamp; currentStamp.stamp(); double dt = (currentStamp - _lastStamp).toSecs(); - if (dt > _wcFrameDelayMax) - _wcFrameDelayMax = dt; + if (dt > _frameLatencyMax) + _frameLatencyMax = dt; // Limit the time we need to spend in simulation loops // That means, if the /sim/max-simtime-per-frame value is strictly positive @@ -255,9 +255,9 @@ void TimeManager::computeFrameRate() // Calculate frame rate average if ((_impl->get_cur_time() != _lastFrameTime)) { _frameRate->setIntValue(_frameCount); - _frameDelayMax->setDoubleValue(_wcFrameDelayMax*1000); + _frameLatency->setDoubleValue(_frameLatencyMax*1000); _frameCount = 0; - _wcFrameDelayMax = 0.0; + _frameLatencyMax = 0.0; } _lastFrameTime = _impl->get_cur_time(); diff --git a/src/Time/TimeManager.hxx b/src/Time/TimeManager.hxx index edf498013..53dffd51b 100644 --- a/src/Time/TimeManager.hxx +++ b/src/Time/TimeManager.hxx @@ -78,11 +78,11 @@ private: SGPropertyNode_ptr _longitudeDeg; SGPropertyNode_ptr _latitudeDeg; - // frame-rate / worst-case delay / update-rate counters + // frame-rate / worst-case latency / update-rate counters SGPropertyNode_ptr _frameRate; - SGPropertyNode_ptr _frameDelayMax; + SGPropertyNode_ptr _frameLatency; time_t _lastFrameTime; - double _wcFrameDelayMax; + double _frameLatencyMax; int _frameCount; }; -- 2.39.5