Improved Clock

Sources/nCine/Base/Clock.cpp

@@ -24,7 +24,7 @@ namespace nCine
 	}
 
 	Clock::Clock()
-		: frequency_(0UL), baseCount_(0ULL)
+		: frequency_(0UL)
 	{
 #if defined(DEATH_TARGET_WINDOWS)
 		LARGE_INTEGER li;
@@ -51,8 +51,6 @@ namespace nCine
 			frequency_ = 1.0e6L;
 		}
 #endif
-
-		baseCount_ = counter();
 	}
 
 	uint64_t Clock::counter() const

Sources/nCine/Base/Clock.h

@@ -8,9 +8,8 @@ namespace nCine
 	class Clock
 	{
 	public:
-		/// Returns elapsed time in ticks since base time
 		inline uint64_t now() const {
-			return counter() - baseCount_;
+			return counter();
 		}
 
 		/// Returns current value of the counter
@@ -20,10 +19,6 @@ namespace nCine
 		inline uint32_t frequency() const {
 			return frequency_;
 		}
-		/// Retruns the counter value at initialization time
-		inline uint64_t baseCount() const {
-			return baseCount_;
-		}
 
 	private:
 #if defined(DEATH_TARGET_WINDOWS)
@@ -34,8 +29,6 @@ namespace nCine
 
 		/// Counter frequency in counts per second
 		uint32_t frequency_;
-		/// Counter value at initialization time
-		uint64_t baseCount_;
 
 		/// Private constructor
 		Clock();

Sources/nCine/Base/FrameTimer.cpp

@@ -29,6 +29,12 @@ namespace nCine
 		timeMults_[1] = timeMultLast;
 
 		// Update the FPS average calculation every `avgInterval_` seconds
+		if (frameStart_ < lastAvgUpdate_ || frameStart_ < lastLogUpdate_) {
+			LOGW("Detected time discontinuity, resetting counters");
+			lastAvgUpdate_ = frameStart_;
+			lastLogUpdate_ = frameStart_;
+		}
+
 		const float secsSinceLastAvgUpdate = (frameStart_ - lastAvgUpdate_).seconds();
 		if (averageInterval_ > 0.0f && secsSinceLastAvgUpdate > averageInterval_) {
 			avgFps_ = static_cast<float>(avgNumFrames_) / secsSinceLastAvgUpdate;