Changeset 2553 for code/branches/presentation/src/orxonox

Timestamp:

Dec 30, 2008, 8:02:21 PM (16 years ago)

Author:

rgrieder

Message:

Little performance optimisation.

File:

• code/branches/presentation/src/orxonox/gamestates/GSRoot.cc (modified) (2 diffs)

code/branches/presentation/src/orxonox/gamestates/GSRoot.cc

@@ -223 +223 @@
 
         // STATISTICS
-        statisticsTickInfo tickInfo = {timeAfterTick, timeAfterTick - timeBeforeTick};
+        uint32_t currentTickTime = timeAfterTick - timeBeforeTick;
+        statisticsTickInfo tickInfo = {timeAfterTick, currentTickTime};
         statisticsTickTimes_.push_back(tickInfo);
 
@@ -233 +234 @@
         if (timeAfterTick > statisticsStartTime_ + statisticsRefreshCycle_)
         {
-            while (statisticsTickTimes_.front().tickTime < timeAfterTick - statisticsAvgLength_)
+            std::list<statisticsTickInfo>::iterator it = this->statisticsTickTimes_.begin();
+            assert(it != this->statisticsTickTimes_.end());
+            uint64_t lastTime = timeAfterTick - statisticsAvgLength_;
+            if (it->tickTime < lastTime)
             {
-                this->periodTickTime_ -= this->statisticsTickTimes_.front().tickLength;
-                this->statisticsTickTimes_.pop_front();
+                do
+                {
+                    this->periodTickTime_ -= it->tickLength;
+                    ++it;
+                    assert(it != this->statisticsTickTimes_.end());
+                } while (it->tickTime < lastTime);
+                this->statisticsTickTimes_.erase(this->statisticsTickTimes_.begin(), --it);
             }
 
             uint32_t framesPerPeriod = this->statisticsTickTimes_.size();
-            this->avgFPS_ = (float)framesPerPeriod / (tickInfo.tickTime - this->statisticsTickTimes_.front().tickTime) * 1000000.0;
+            this->avgFPS_ = (float)framesPerPeriod / (currentTickTime - this->statisticsTickTimes_.front().tickTime) * 1000000.0;
             this->avgTickTime_ = (float)this->periodTickTime_ / framesPerPeriod / 1000.0;