Changeset 2558 for code/branches/presentation/src

Timestamp:

Dec 31, 2008, 11:44:41 AM (16 years ago)

Author:

scheusso

Message:

Fixed that problems with statistical info of tick time/fps

Location:

code/branches/presentation/src/orxonox/gamestates

Files:

• GSRoot.cc (modified) (5 diffs)
• GSRoot.h (modified) (2 diffs)

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

@@ -104 +104 @@
 
         // reset frame counter
-        this->frameCount_ = 0;
         this->statisticsStartTime_ = 0;
         this->statisticsTickTimes_.clear();
@@ -223 +222 @@
 
         // STATISTICS
+        assert(timeAfterTick - timeBeforeTick >= 0 );
         statisticsTickInfo tickInfo = {timeAfterTick, timeAfterTick - timeBeforeTick};
         statisticsTickTimes_.push_back(tickInfo);
+        assert(statisticsTickTimes_.back().tickLength==tickInfo.tickLength);
 
         // Ticks GSGraphics or GSDedicated
@@ -230 +231 @@
 
         // Note: tickInfo.tickLength is modified by GSGraphics or GSDedicated!
-        this->periodTickTime_ += statisticsTickTimes_.back().tickLength;
+        this->periodTickTime_ += tickInfo.tickLength;
         if (timeAfterTick > statisticsStartTime_ + statisticsRefreshCycle_)
         {
@@ -240 +241 @@
                 do
                 {
+                    assert(this->periodTickTime_ > it->tickLength);
                     this->periodTickTime_ -= it->tickLength;
                     ++it;
@@ -254 +256 @@
         }
 
-        ++this->frameCount_;
     }
 

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

@@ -67 +67 @@
 
         inline void addTickTime(uint32_t length)
-            { assert(!this->statisticsTickTimes_.empty()); this->statisticsTickTimes_.back().tickLength += length; }
+            { assert(!this->statisticsTickTimes_.empty()); this->statisticsTickTimes_.back().tickLength += length;
+              this->periodTickTime_+=length; }
 
     private:
@@ -87 +88 @@
 
         // variables for time statistics
-        uint32_t              frameCount_;
         uint64_t              statisticsStartTime_;
         std::list<statisticsTickInfo>