33Thins needs to be improved once more pieces fall in place.
44"""
55import glfw
6+ import OpenGL
7+
68from demosys .context .glfw import GLTFWindow
79from demosys .effects .registry import Effect
810from demosys .opengl import fbo
911from demosys import resources
1012from demosys .conf import settings
1113from demosys .scene import camera
1214from demosys .utils import module_loading
13- from . import screenshot
1415from demosys import context
16+ from . import screenshot
1517
1618# We still use PyOpenGL for samplers and don't want it to halt on errors
17- import OpenGL
1819OpenGL .ERROR_CHECKING = False
1920
2021TIMER = None
@@ -72,12 +73,12 @@ def run(manager=None):
7273 TIMER .start ()
7374
7475 # Main loop
75- frames , ft = 0 , 60.0 / 1000.0
76+ frames , frame_time = 0 , 60.0 / 1000.0
7677 prev_time = TIMER .get_time ()
7778 time_start = glfw .get_time ()
7879 while not context .WINDOW .should_close ():
7980 # Immediately get control of the current time
80- t = TIMER .get_time ()
81+ current_time = TIMER .get_time ()
8182
8283 # Set the viewport as FBOs will change the values
8384 context .ctx ().viewport = (0 , 0 , context .WINDOW .buffer_width , context .WINDOW .buffer_height )
@@ -89,14 +90,14 @@ def run(manager=None):
8990 )
9091
9192 # Tell the manager to draw stuff
92- manager .draw (t , ft , fbo .WINDOW_FBO )
93+ manager .draw (current_time , frame_time , fbo .WINDOW_FBO )
9394
9495 # Swap buffers and deal with events and statistics
9596 context .WINDOW .swap_buffers ()
9697 context .WINDOW .poll_events ()
9798 frames += 1
98- ft = t - prev_time
99- prev_time = t
99+ frame_time = current_time - prev_time
100+ prev_time = current_time
100101
101102 duration_timer = TIMER .stop ()
102103 duration = glfw .get_time () - time_start
@@ -181,15 +182,15 @@ def key_event_callback(window, key, scancode, action, mods):
181182 MANAGER .key_event (key , scancode , action , mods )
182183
183184
184- def mouse_event_callback (window , x , y ):
185+ def mouse_event_callback (window , xpos , ypos ):
185186 """
186187 Mouse event callback from glfw
187188
188189 :param window: The window
189- :param x : viewport x pos
190- :param y : viewport y pos
190+ :param xpos : viewport x pos
191+ :param ypos : viewport y pos
191192 """
192- CAMERA .rot_state (x , y )
193+ CAMERA .rot_state (xpos , ypos )
193194
194195
195196def window_resize_callback (window , width , height ):
0 commit comments