EffectController: pre/post load + resp for creating instances

Author: einarf

demosys/effects/effect.py

@@ -19,9 +19,6 @@ class Effect:
     window_aspect = 0
     sys_camera = None
 
-    def __init__(self, name=name):
-        self.name = name
-
     # Methods to override
     def draw(self, time, target):
         raise NotImplemented

demosys/effects/managers.py

@@ -7,12 +7,12 @@ class ManagerError(Exception):
 
 class BaseEffectManger:
     """Base effect manager"""
-    def __init__(self, *args, **kwargs):
-        pass
-
-    def init_effects(self):
+    def pre_load(self):
         """Init after context creations"""
-        pass
+        return True
+
+    def post_load(self):
+        return True
 
     def draw(self, time, target):
         """Draw efffect(s)"""
@@ -24,11 +24,10 @@ class SingleEffectManager(BaseEffectManger):
     def __init__(self, effect_module=None):
         self.active_effect = None
         self.effect_module = effect_module
-        super().__init__()
 
-    def init_effects(self):
+    def pre_load(self):
         """Init after context creations"""
-        effect_list = [cls for cls in effects.get_effects()]
+        effect_list = [cfg.cls() for name, cfg in effects.effects.items()]
         for effect in effect_list:
             effect.init()
             if effect.name == self.effect_module:
@@ -41,6 +40,9 @@ def init_effects(self):
             return False
         return True
 
+    def post_load(self):
+        return True
+
     def draw(self, time, target):
         self.active_effect.draw(time, target)
 

demosys/effects/registry.py

@@ -23,11 +23,6 @@ class Effects:
     def __init__(self):
         self.effects = {}
 
-    def get_effects(self):
-        """Get all effect classes"""
-        for name, config in self.effects.items():
-            yield config.cls(name=name.replace(f".{EFFECT_MODULE}", ''))
-
     def get_dirs(self):
         """Get all effect directories"""
         for k, v in self.effects.items():
@@ -40,14 +35,15 @@ def polulate(self, effect_list):
         for effect in effect_list:
             module = importlib.import_module(f'{effect}.{EFFECT_MODULE}')
             # Find the Effect class in the module
-            for name, obj in inspect.getmembers(module):
-                if inspect.isclass(obj):
-                    if obj == Effect:
+            for name, cls in inspect.getmembers(module):
+                if inspect.isclass(cls):
+                    if cls == Effect:
                         continue
                     # Use MRO to figure out if this is really an effect
-                    mro = inspect.getmro(obj)
-                    if obj in mro and Effect in mro:
-                        self.effects[module.__name__] = EffectConfig(module=module, cls=obj)
+                    mro = inspect.getmro(cls)
+                    if cls in mro and Effect in mro:
+                        cls.name = effect
+                        self.effects[module.__name__] = EffectConfig(module=module, cls=cls)
 
 
 effects = Effects()

demosys/view/controller.py

@@ -37,15 +37,19 @@ def run(manager=None):
     CAMERA = camera.Camera(aspect=Effect.window_aspect, fov=60.0, near=1, far=1000)
     Effect.sys_camera = CAMERA
 
-    # Tell EffectManager to initialize effects
-    if not manager.init_effects():
+    # Initialize Effects
+    if not manager.pre_load():
         return
 
     # Load resources
     num_resources = resources.count()
     print(f"Loading {num_resources } resources")
     resources.load()
 
+    # Post-Load actions for effects
+    if not manager.post_load():
+        return
+
     glfw.set_key_callback(WINDOW.window, key_event_callback)
     glfw.set_cursor_pos_callback(WINDOW.window, mouse_event_callback)
     glfw.set_window_size_callback(WINDOW.window, window_resize_callback)