Include frame time in draw()

Author: einarf

demosys/effects/effect.py

@@ -5,9 +5,9 @@
 def bind_target(func):
     """Decorator auto binding and releasing the incoming FBO"""
     def func_wrapper(*args, **kwargs):
-        args[2].bind()
+        args[3].bind()
         func(*args, **kwargs)
-        args[2].release()
+        args[3].release()
     return func_wrapper
 
 
@@ -20,7 +20,7 @@ class Effect:
     sys_camera = None
 
     # Methods to override
-    def draw(self, time, target):
+    def draw(self, time, frametime, target):
         raise NotImplemented
 
     # Utility Stuff

demosys/effects/managers.py

@@ -14,7 +14,7 @@ def pre_load(self):
     def post_load(self):
         return True
 
-    def draw(self, time, target):
+    def draw(self, time, frametime, target):
         """Draw efffect(s)"""
         pass
 
@@ -43,8 +43,8 @@ def pre_load(self):
     def post_load(self):
         return True
 
-    def draw(self, time, target):
-        self.active_effect.draw(time, target)
+    def draw(self, time, frametime, target):
+        self.active_effect.draw(time, frametime, target)
 
 
 class TrackerEffectManager(BaseEffectManger):

demosys/view/controller.py

@@ -62,18 +62,21 @@ def run(manager=None):
         TIMER = timers.Timer()
     TIMER.start()
 
-    frames = 0
+    frames, ft = 0, 0
+    prev_time = TIMER.get_time()
     while not WINDOW.should_close():
         t = TIMER.get_time()
         GL.glViewport(0, 0, WINDOW.buffer_width, WINDOW.buffer_height)
         GL.glClearColor(0.0, 0.0, 0.0, 0.0)
         GL.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT | GL.GL_STENCIL_BUFFER_BIT)
 
-        manager.draw(t, WINDOW_FBO)
+        manager.draw(t, ft, WINDOW_FBO)
 
         WINDOW.swap_buffers()
         WINDOW.poll_events()
         frames += 1
+        ft = t - prev_time
+        prev_time = t
 
     duration = TIMER.stop()
     if duration > 0:

demosys_test/cube/effect.py

@@ -21,7 +21,7 @@ def init(self):
         self.fbo = FBO.create(512, 512, depth=True)
 
     @effect.bind_target
-    def draw(self, time, target):
+    def draw(self, time, frametime, target):
         GL.glEnable(GL.GL_DEPTH_TEST)
         GL.glEnable(GL.GL_CULL_FACE)