From 1cf341496d20276fac099450942112f2bec269ce Mon Sep 17 00:00:00 2001
From: jules <jules@okfoc.us>
Date: Tue, 17 Dec 2013 12:05:46 -0500
Subject: avg, show fps

---
 shader-gif.html | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'shader-gif.html')

diff --git a/shader-gif.html b/shader-gif.html
index 59d2add..b05894c 100644
--- a/shader-gif.html
+++ b/shader-gif.html
@@ -60,14 +60,14 @@ div { display: inline-block; padding: 10px;}
   <button id="demo">demo</button>
   <button id="dither-demo">dither</button>
   <br>
+  <span id="status"></span>
+  <button id="save" disabled>save</button>
+  <br>
 </div>
 
 <div id="workspace"></div>
 
 <div id="rendered">
-  <span id="status"></span>
-  <button id="save" disabled>save</button>
-  <br>
 </div>
 
 <div id="instructions"><iframe src="instructions.html"></iframe><button class="close">x</button></div>
@@ -166,18 +166,24 @@ function step_forward(){
 }
 var timeout, raf_id, start_t = 0, old_t = 0, pause_t = 0
 var paused = false, dragging = false, rendering = false, scrolling = false;
+var fps = 30;
 function animate(t){
   raf_id = requestAnimationFrame(animate);
+
+  var step_t = t - old_t
+  old_t = t
+  
   if (paused || dragging || rendering || scrolling) {
-    pause_t += t - old_t
-    old_t = t
+    pause_t += step_t
     scrolling = false
     return
   }
-  else {
-    old_t = t
-  }
+
+  var timing = +(new Date())
   draw(t)
+  timing -= +(new Date())
+  fps = avg(fps, -1000/timing, 4)
+  status(~~(fps) + " fps")
 }
 function draw(t) {
   t -= start_t
-- 
cgit v1.2.3-70-g09d2