Basic support for EffectManagers

Author: einarf

demosys/conf/default_settings.py

@@ -3,7 +3,7 @@
 """
 
 # What attributes should be used when generating a settings file
-__ORDER__ = ('DEBUG', 'SCREENSHOT_PATH', 'OPENGL', 'WINDOW', 'EFFECTS', 'MUSIC',
+__ORDER__ = ('DEBUG', 'SCREENSHOT_PATH', 'OPENGL', 'WINDOW', 'EFFECTS', 'EFFECT_MANAGER', 'MUSIC',
              'SHADER_DIRS', 'SHADER_FINDERS', 'TEXTURE_DIRS', 'TEXTURE_FINDERS')
 
 DEBUG = False
@@ -33,6 +33,8 @@
 # Empty effects tuple
 EFFECTS = ()
 
+EFFECT_MANAGER = 'demosys.effects.managers.single.SingleEffectManager'
+
 MUSIC = None
 
 # Additional directories shaders can be found

demosys/core/management/commands/runeffect.py

@@ -3,6 +3,7 @@
 """
 import demosys
 from demosys.core.management.base import CreateCommand
+from demosys.effects.managers import SingleEffectManager
 
 
 class Command(CreateCommand):
@@ -13,4 +14,5 @@ def add_arguments(self, parser):
 
     def handle(self, *args, **options):
         demosys.setup()
-        demosys.run(runeffect=options['name'])
+        manager = SingleEffectManager(effect_module=options['name'])
+        demosys.run(manager=manager)

demosys/effects/managers.py

@@ -0,0 +1,50 @@
+from demosys.effects.registry import effects
+
+
+class ManagerError(Exception):
+    pass
+
+
+class BaseEffectManger:
+    """Base effect manager"""
+    def __init__(self, *args, **kwargs):
+        pass
+
+    def init_effects(self):
+        """Init after context creations"""
+        pass
+
+    def draw(self, time, target):
+        """Draw efffect(s)"""
+        pass
+
+
+class SingleEffectManager(BaseEffectManger):
+    """Run a single effect"""
+    def __init__(self, effect_module=None):
+        self.active_effect = None
+        self.effect_module = effect_module
+        super().__init__()
+
+    def init_effects(self):
+        """Init after context creations"""
+        effect_list = [cls for cls in effects.get_effects()]
+        for effect in effect_list:
+            effect.init()
+            if effect.name == self.effect_module:
+                self.active_effect = effect
+
+        if not self.active_effect:
+            print("Cannot find effect '{}'".format(self.active_effect))
+            print("Available effects:")
+            print("\n".join(e.name for e in effect_list))
+            return False
+        return True
+
+    def draw(self, time, target):
+        self.active_effect.draw(time, target)
+
+
+class TrackerEffectManager(BaseEffectManger):
+    """Effect manager handling tracker data"""
+    pass

demosys/view/controller.py

@@ -5,7 +5,7 @@
 from OpenGL import GL
 import glfw
 from demosys.view.window import Window
-from demosys.effects.registry import effects, Effect
+from demosys.effects.registry import Effect
 from demosys.opengl import fbo
 from demosys.opengl.fbo import WINDOW_FBO
 from demosys import resources
@@ -19,13 +19,14 @@
 CAMERA = None
 
 
-def run(runeffect=None):
+def run(manager=None):
     """Initialize, load and run"""
     global WINDOW
     WINDOW = Window()
     fbo.WINDOW = WINDOW
 
     print("Loader started at", glfw.get_time())
+
     # Inject attributes into the base Effect class
     Effect.window_width = WINDOW.buffer_width
     Effect.window_height = WINDOW.buffer_height
@@ -36,18 +37,8 @@ def run(runeffect=None):
     CAMERA = camera.Camera(aspect=Effect.window_aspect, fov=60.0, near=1, far=1000)
     Effect.sys_camera = CAMERA
 
-    # Initialize effects first so resources are registered
-    effect_list = [cls for cls in effects.get_effects()]
-    active_effect = None
-    for effect in effect_list:
-        effect.init()
-        if effect.name == runeffect:
-            active_effect = effect
-
-    if not active_effect:
-        print(f"Cannot find effect '{runeffect}'")
-        print("Available effects:")
-        print("\n".join(e.name for e in effect_list))
+    # Tell EffectManager to initialize effects
+    if not manager.init_effects():
         return
 
     # Load resources
@@ -74,7 +65,7 @@ def run(runeffect=None):
         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)
 
-        active_effect.draw(t, WINDOW_FBO)
+        manager.draw(t, WINDOW_FBO)
 
         WINDOW.swap_buffers()
         WINDOW.poll_events()