update ofFpsCounter

Author: dimitre

libs/openFrameworks/utils/ofFpsCounter.cpp

@@ -2,7 +2,7 @@
 
 ofFpsCounter::ofFpsCounter()
 :nFrameCount(0)
-,then(ofGetCurrentTime())
+,then(steady_clock::now())
 ,fps(0)
 ,lastFrameTime(0)
 ,filteredTime(0)
@@ -12,40 +12,43 @@ ofFpsCounter::ofFpsCounter()
 
 ofFpsCounter::ofFpsCounter(double targetFPS)
 :nFrameCount(0)
-,then(ofGetCurrentTime())
+,then(steady_clock::now())
 ,fps(targetFPS)
 ,lastFrameTime(0)
 ,filteredTime(0)
 ,filterAlpha(0.9){}
 
 void ofFpsCounter::newFrame(){
-	auto now = ofGetCurrentTime();
-	update(now.getAsSeconds());
-	timestamps.push(now.getAsSeconds());
+	now = steady_clock::now();
+
+//	auto now = ofGetCurrentTime();
+	update(now);
+	timestamps.push(now);
 
 	lastFrameTime = now - then;
-	uint64_t filtered = filteredTime.count() * filterAlpha + lastFrameTime.count() * (1-filterAlpha);
-	filteredTime = std::chrono::nanoseconds(filtered);
+//	auto filtered =
+//	filteredTime * filterAlpha + lastFrameTime * (1-filterAlpha);
+//	filteredTime = filteredTime * filterAlpha + lastFrameTime * (1-filterAlpha);
 	then = now;
 	nFrameCount++;
 }
 
 void ofFpsCounter::update(){
-	auto now = ofGetCurrentTime();
-	update(now.getAsSeconds());
+	now = steady_clock::now();
+	update(now);
 }
 
-void ofFpsCounter::update(double now){
-	while(!timestamps.empty() && timestamps.front() + 2 < now){
+void ofFpsCounter::update(time_point<steady_clock> now){
+	while(!timestamps.empty() && timestamps.front() + 2s < now){
 		timestamps.pop();
 	}
 
-	auto diff = 0.0;
-	if(!timestamps.empty() && timestamps.front() + 0.5 < now){
+	space diff;
+	if(!timestamps.empty() && timestamps.front() + 0.5s < now){
 		diff = now - timestamps.front();
 	}
-	if(diff>0.0){
-		fps = timestamps.size() / diff;
+	if(diff > 0.0s){
+		fps = (double)timestamps.size() / std::chrono::duration<double>(diff).count();
 	}else{
 		fps = timestamps.size();
 	}

libs/openFrameworks/utils/ofFpsCounter.h

@@ -4,6 +4,17 @@
 #include "ofUtils.h"
 #include <queue>
 
+#include <chrono>
+#include <ctime>
+#include <iostream>
+#include <thread>
+
+using namespace std::chrono;
+using namespace std::chrono_literals;
+
+using std::cout;
+using std::endl;
+
 class ofFpsCounter {
 public:
 	ofFpsCounter();
@@ -25,12 +36,17 @@ class ofFpsCounter {
 	void setFilterAlpha(float alpha);
 
 private:
-	void update(double now);
+	void update(time_point<steady_clock> now);
 	uint64_t nFrameCount;
-	ofTime then;
+//	ofTime then;
+	
+	time_point<steady_clock> now;
+	time_point<steady_clock> then;
 	double fps;
-	std::chrono::nanoseconds lastFrameTime;
-	std::chrono::nanoseconds filteredTime;
+	
+	using space = std::chrono::duration<long long, std::nano>;
+	space lastFrameTime;
+	space filteredTime;
 	double filterAlpha;
-	std::queue<double> timestamps;
+	std::queue<time_point<steady_clock>> timestamps;
 };

libs/openFrameworks/utils/ofTimerFps.cpp

@@ -9,6 +9,7 @@ ofTimerFps::ofTimerFps(){
 };
 
 void ofTimerFps::setFps(int fps) {
+//	interval = std::ratio<1s, fps>;
    interval = duration_cast<microseconds>(1s) / fps;
 }