Go back to using viewport attributes for screenshot

Author: einarf

demosys/view/controller.py

@@ -148,7 +148,7 @@ def key_event_callback(window, key, scancode, action, mods):
 
     # Screenshots
     if key == glfw.KEY_X and action == glfw.PRESS:
-        screenshot.create(WINDOW)
+        screenshot.create()
 
 
 def mouse_event_callback(window, x, y):

demosys/view/screenshot.py

@@ -5,7 +5,7 @@
 from demosys.conf import settings
 
 
-def create(window, format='png'):
+def create(format='png'):
     """
     Create a screenshot
     :param format: formats supported by PIL (png, jpeg etc)
@@ -20,15 +20,13 @@ def create(window, format='png'):
         else:
             print("SCREENSHOT_PATH {} does not exist. Using cwd as fallback".format(settings.SCREENSHOT_PATH))
 
-    # x, y, width, height = GL.glGetIntegerv(GL.GL_VIEWPORT)
-    # print("Screenshot viewport:", x, y, width, height)
-    # FIXME: Snap to viewport
-    print("Screenshot viewport:", window.buffer_width, window.buffer_height)
+    x, y, width, height = GL.glGetIntegerv(GL.GL_VIEWPORT)
+    print("Screenshot viewport:", x, y, width, height)
     GL.glPixelStorei(GL.GL_PACK_ALIGNMENT, 1)
 
-    data = GL.glReadPixels(0, 0, window.buffer_width, window.buffer_height, GL.GL_RGB, GL.GL_UNSIGNED_BYTE)
+    data = GL.glReadPixels(x, y, width, height, GL.GL_RGB, GL.GL_UNSIGNED_BYTE)
 
-    image = Image.frombytes("RGB", (window.buffer_width, window.buffer_height), data)
+    image = Image.frombytes("RGB", (width, height), data)
     image = image.transpose(Image.FLIP_TOP_BOTTOM)
     name = "{}.{}".format(datetime.now().strftime("%Y-%m-%d-%H-%M-%S"), format)
     image.save(os.path.join(dest, name), format=format)

demosys/view/window.py

@@ -74,7 +74,6 @@ def __init__(self):
         # This is important for some displays like Apple's Retina as reported window sizes are virtual
         self.buffer_width, self.buffer_height = glfw.get_framebuffer_size(self.window)
         print("Frame buffer size:", self.buffer_width, self.buffer_height)
-        # GL.glViewport(0, 0, self.buffer_width, self.buffer_height)
 
         w, h = glfw.get_window_size(self.window)
         print("Actual window size:", w, h)