framerate updates (pxscene#671) (pxscene#692)

mfiess · web-flow · commit 9484401d61e3 · 2017-11-20T09:07:54.000-05:00
diff --git a/src/wayland_egl/pxWindowNative.cpp b/src/wayland_egl/pxWindowNative.cpp
@@ -8,6 +8,7 @@
 #include "../pxTimer.h"
 #include "../pxWindowUtil.h"
 #include "../pxKeycodes.h"
+#include "../rtLog.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -381,6 +382,12 @@ void displayRef::cleanupWaylandDisplay()
 
 bool exitFlag = false;
 
+pxWindowNative::pxWindowNative(): mTimerFPS(0), mLastWidth(-1), mLastHeight(-1),
+    mResizeFlag(false), mLastAnimationTime(0.0), mVisible(false),
+    mWaylandSurface(NULL), mWaylandBuffer(), waylandBufferIndex(0)
+{
+}
+
 pxWindowNative::~pxWindowNative()
 {
     cleanupWaylandData();
@@ -549,27 +556,52 @@ void pxWindowNative::runEventLoop()
     waylandDisplay* display = dRef.getDisplay();
     std::vector<pxWindowNative*> windowVector = pxWindowNative::getNativeWindows();
 
+    int framerate = WAYLAND_PX_CORE_FPS;
+
+    char const *s = getenv("PXCORE_FRAMERATE");
+    if (s)
+    {
+      int fps = atoi(s);
+      if (fps > 0)
+      {
+        framerate = fps;
+      }
+    }
+
+    rtLogInfo("pxcore framerate: %d", framerate);
+
+    uint64_t* offsets = new  uint64_t[ framerate ];
+    for( int i = 0; i < framerate; ++i )
+        offsets[ i ] = (i*1000000+framerate-1)/framerate;
+
+    int frameNo = 1;
+    double wakeUpBase = pxMicroseconds();
+    int count = 0, lastCount = -1;
     while(!exitFlag)
     {
-        double startMilliseconds = pxMilliseconds();
+        count++;
         std::vector<pxWindowNative*>::iterator i;
         for (i = windowVector.begin(); i < windowVector.end(); i++)
         {
            pxWindowNative* w = (*i);
            w->animateAndRender();
         }
         wl_display_dispatch_pending(display->display);
-        int processTime = (int)pxMilliseconds() - (int)startMilliseconds;
-        if (processTime < 0)
-        {
-          processTime = 0;
-        }
-        if (processTime < 32)
-        {
-          usleep((32-processTime)*1000);
+        double delay = pxMicroseconds();
+        double nextWakeUp = wakeUpBase + offsets[ frameNo ];
+        while( delay > nextWakeUp ) {
+            frameNo++;
+            if( frameNo >= framerate ) {
+                count = 0;
+                wakeUpBase += 1000000;
+                frameNo = 0;
+            }
+            nextWakeUp = wakeUpBase + offsets[ frameNo ];
         }
-        //pxSleepMS(1000); // Breath
+        delay = nextWakeUp - delay;
+        usleep( delay );
     }
+    delete [] offsets;
 }
 
 
@@ -791,28 +823,16 @@ waylandBuffer* pxWindowNative::nextBuffer()
 
 void pxWindowNative::animateAndRender()
 {
-    static double lastAnimationTime = pxMilliseconds();
-    double currentAnimationTime = pxMilliseconds();
     drawFrame(); 
 
-    double animationDelta = currentAnimationTime-lastAnimationTime;
     if (mResizeFlag)
     {
         mResizeFlag = false;
         onSize(mLastWidth, mLastHeight);
         invalidateRectInternal(NULL);
     }
 
-    if (mTimerFPS)
-    {
-        animationDelta = currentAnimationTime - getLastAnimationTime();
-
-        if (animationDelta > (1000/mTimerFPS))
-        {
-            onAnimationTimerInternal();
-            setLastAnimationTime(currentAnimationTime);
-        }
-    }
+    onAnimationTimerInternal();
 }
 
 void pxWindowNative::setLastAnimationTime(double time)
@@ -881,7 +901,7 @@ void pxWindowNative::initializeEgl()
 
     waylandDisplay* display = mDisplayRef.getDisplay();
 
-    display->egl.dpy = eglGetDisplay(display->display);
+    display->egl.dpy = eglGetDisplay((EGLNativeDisplayType)display->display);
     assert(display->egl.dpy);
 
     ret = eglInitialize(display->egl.dpy, &major, &minor);
diff --git a/src/wayland_egl/pxWindowNative.h b/src/wayland_egl/pxWindowNative.h
@@ -87,10 +87,7 @@ class displayRef
 class pxWindowNative
 {
 public:
-pxWindowNative(): mTimerFPS(0), mLastWidth(-1), mLastHeight(-1),
-    mResizeFlag(false), mLastAnimationTime(0.0), mVisible(false),
-    mWaylandSurface(NULL), mWaylandBuffer(), waylandBufferIndex(0)
-    { }
+    pxWindowNative();
     virtual ~pxWindowNative();
 
     // Contract between pxEventLoopNative and this class
