Clean up default fbo handling

Author: einarf

demosys/context/base.py

@@ -3,8 +3,6 @@
 
 import moderngl
 from demosys.conf import settings
-from demosys.opengl.fbo import WindowFBO
-from demosys import context
 
 GLVersion = namedtuple('GLVersion', ['major', 'minor'])
 
@@ -38,39 +36,41 @@ def __init__(self):
         self.vsync = settings.WINDOW.get('vsync')
         self.cursor = settings.WINDOW.get('cursor')
 
-        self._calc_viewport()
+        self.clear_color = (0.0, 0.0, 0.0, 0.0)
+        self.clear_depth = (1.0)
 
         # ModernGL context
         self.ctx = None
 
-        WindowFBO.window = self
-        self.fbo = WindowFBO
-        context.WINDOW = self
-
     def draw(self, current_time, frame_time):
-        self.manager.draw(current_time, frame_time, WindowFBO)
+        self.set_default_viewport()
+        self.manager.draw(current_time, frame_time, self.fbo)
 
     def clear(self):
         """Clear the scren"""
-        self.ctx.clear(
-            red=0.0, blue=0.0, green=0.0, alpha=0.0, depth=1.0,
-            viewport=self._viewport,
+        self.ctx.screen.clear(
+            red=self.clear_color[0],
+            green=self.clear_color[1],
+            blue=self.clear_color[2],
+            alpha=self.clear_color[3],
+            depth=self.clear_depth,
         )
 
+    def clear_values(self, red=0.0, green=0.0, blue=0.0, alpha=0.0, depth=1.0):
+        self.clear_color = (red, green, blue, alpha)
+        self.clear_depth = depth
+
     def use(self):
         """Render to this window"""
         raise NotImplementedError()
 
-    def viewport(self):
-        self.ctx.viewport = self._viewport
-
     def swap_buffers(self):
         """Swap frame buffer"""
         raise NotImplementedError()
 
     def resize(self, width, height):
         """Resize window"""
-        self._calc_viewport()
+        self.set_default_viewport()
 
     def close(self):
         """Set the close state"""
@@ -85,8 +85,7 @@ def terminate(self):
         raise NotImplementedError()
 
     def mgl_fbo(self):
-        """Returns the ModernGL fbo used by this window"""
-        raise NotImplementedError()
+        return self.ctx.screen
 
     def print_context_info(self):
         """Prints out context info"""
@@ -99,11 +98,11 @@ def print_context_info(self):
         print('platform:', sys.platform)
         print('code:', self.ctx.version_code)
 
-    def _calc_viewport(self):
+    def set_default_viewport(self):
         """Calculate viewport with correct aspect ratio"""
         # The expected height with the current viewport width
         expected_height = int(self.buffer_width / self.aspect_ratio)
 
         # How much positive or negative y padding
         blank_space = self.buffer_height - expected_height
-        self._viewport = (0, blank_space // 2, self.buffer_width, expected_height)
+        self.ctx.screen.viewport = (0, blank_space // 2, self.buffer_width, expected_height)

demosys/context/glfw.py

@@ -3,7 +3,8 @@
 import moderngl
 from demosys.scene import camera
 from demosys.view import screenshot
-
+from demosys.opengl import FBO
+from demosys import context
 from .base import Window
 
 
@@ -50,7 +51,6 @@ def __init__(self):
         self.buffer_width, self.buffer_height = glfw.get_framebuffer_size(self.window)
         print("Frame buffer size:", self.buffer_width, self.buffer_height)
         print("Actual window size:", glfw.get_window_size(self.window))
-        self._calc_viewport()
 
         glfw.make_context_current(self.window)
 
@@ -65,6 +65,11 @@ def __init__(self):
 
         # Create mederngl context from existing context
         self.ctx = moderngl.create_context()
+        self.fbo = FBO()
+        self.fbo.fbo = self.ctx.screen
+        self.fbo.default_framebuffer = True
+        context.WINDOW = self
+        self.set_default_viewport()
 
     def use(self):
         self.ctx.screen.use()
@@ -90,9 +95,6 @@ def resize(self, width, height):
     def terminate(self):
         glfw.terminate()
 
-    def mgl_fbo(self):
-        return self.ctx.screen
-
     def poll_events(self):
         """Poll events from glfw"""
         glfw.poll_events()
@@ -106,7 +108,7 @@ def check_glfw_version(self):
     def key_event_callback(self, window, key, scancode, action, mods):
         """
         Key event callback for glfw
-    s
+
         :param window: Window event origin
         :param key: The keyboard key that was pressed or released.
         :param scancode: The system-specific scancode of the key.

demosys/opengl/fbo.py

@@ -4,40 +4,16 @@
 from demosys.opengl import DepthTexture, Texture2D
 
 
-class WindowFBO:
-    window = None
-
-    @classmethod
-    def use(cls):
-        """Sets the viewport back to the buffer size of the screen/window"""
-        cls.window.use()
-        cls.window.viewport()
-
-    @classmethod
-    def release(cls):
-        """Dummy release method"""
-        pass
-
-    @classmethod
-    def clear(cls, red=0.0, green=0.0, blue=0.0, depth=1.0, viewport=None):
-        """Dummy clear method"""
-        cls.window.clear()
-
-    @property
-    @classmethod
-    def mglo(cls):
-        """Internal ModernGL fbo"""
-        return cls.window.mgl_fbo()
-
-
 class FBO:
     """Frame buffer object"""
     _stack = []
 
     def __init__(self):
+        self._window = context.window()
         self.color_buffers = []
         self.depth_buffer = None
         self.fbo = None
+        self.default_framebuffer = False
 
     @staticmethod
     def create_from_textures(color_buffers: List[Texture2D], depth_buffer: DepthTexture = None) -> 'FBO':
@@ -157,7 +133,8 @@ def use(self, stack=True):
         if not stack:
             return
 
-        FBO._stack.append(self)
+        if not self.default_framebuffer:
+            FBO._stack.append(self)
 
         if len(FBO._stack) > 8:
             raise FBOError("FBO stack overflow. You probably forgot to release a bind somewhere.")
@@ -168,8 +145,11 @@ def release(self, stack=True):
 
         :param stack: (bool) If the bind should be popped form the FBO stack.
         """
+        if self.default_framebuffer:
+            return
+
         if not stack:
-            WindowFBO.use()
+            self._window.fbo.use()
             return
 
         # Are we trying to release an FBO that is not bound?
@@ -186,7 +166,7 @@ def release(self, stack=True):
         if FBO._stack:
             parent = FBO._stack[-1]
         else:
-            parent = WindowFBO
+            parent = self._window.fbo
 
         # Bind the parent FBO
         if parent:

demosys/view/controller.py

@@ -74,7 +74,6 @@ def run(manager=None):
         current_time = window.timer.get_time()
 
         window.use()
-        window.viewport()
         window.clear()
         window.draw(current_time, frame_time)
         window.swap_buffers()