Screenshot feature should use ModernGL

Author: einarf

demosys/opengl/fbo.py

@@ -77,9 +77,9 @@ def create(size, components=4, depth=False, dtype='f1', layers=1):
         instance = FBO()
 
         # Add N layers of color attachments
-        for layer in range(layers):
-            c = Texture2D.create(size, components, dtype=dtype)
-            instance.color_buffers.append(c)
+        for _ in range(layers):
+            tex = Texture2D.create(size, components, dtype=dtype)
+            instance.color_buffers.append(tex)
 
         # Set depth attachment is specified
         if depth:
@@ -92,6 +92,24 @@ def create(size, components=4, depth=False, dtype='f1', layers=1):
 
         return instance
 
+    def read(self, viewport=None, components=3, attachment=0, alignment=1, dtype='f1') -> bytes:
+        """
+        Read the content of the framebuffer.
+
+        :param viewport: (tuple) The viewport
+        :param components: The number of components to read.
+        :param attachment: The color attachment
+        :param alignment: The byte alignment of the pixels
+        :param dtype: (str) dtype
+        """
+        return self.fbo.read(
+            viewport=viewport,
+            components=components,
+            attachment=attachment,
+            alignment=alignment,
+            dtype=dtype,
+        )
+
     @property
     def size(self):
         """
@@ -102,7 +120,6 @@ def size(self):
 
         :return: (w, h) tuple representing the size in pixels
         """
-        # FIXME: How do we deal with attachments of different sizes?
         if self.color_buffers:
             return self.color_buffers[0].size
 

demosys/view/screenshot.py

@@ -1,17 +1,16 @@
-from datetime import datetime
 import os
+from datetime import datetime
 
-from OpenGL import GL
 from PIL import Image
 
 from demosys.conf import settings
 from demosys import context
 
 
-def create(format='png', name=None):
+def create(file_format='png', name=None):
     """
     Create a screenshot
-    :param format: formats supported by PIL (png, jpeg etc)
+    :param file_format: formats supported by PIL (png, jpeg etc)
     """
     dest = ""
     if settings.SCREENSHOT_PATH:
@@ -22,17 +21,12 @@ def create(format='png', name=None):
     else:
         print("SCREENSHOT_PATH not defined in settings. Using cwd as fallback.")
 
-    # x, y, width, height = GL.glGetIntegerv(GL.GL_VIEWPORT)
-    x, y, width, height = 0, 0, context.WINDOW.buffer_width, context.WINDOW.buffer_height
-
-    GL.glPixelStorei(GL.GL_PACK_ALIGNMENT, 1)
-
-    data = GL.glReadPixels(x, y, width, height, GL.GL_RGB, GL.GL_UNSIGNED_BYTE)
-
-    image = Image.frombytes("RGB", (width, height), data)
+    fbo = context.ctx().screen
+    image = Image.frombytes("RGB", (fbo.width, fbo.height), fbo.read())
     image = image.transpose(Image.FLIP_TOP_BOTTOM)
+
     if not name:
-        name = "{}.{}".format(datetime.now().strftime("%Y-%m-%d-%H-%M-%S"), format)
+        name = "{}.{}".format(datetime.now().strftime("%Y-%m-%d-%H-%M-%S-%f"), file_format)
 
     print("Creating screenshot:", name)
-    image.save(os.path.join(dest, name), format=format)
+    image.save(os.path.join(dest, name), format=file_format)