Test effect templates

Author: einarf

demosys/core/finders.py

@@ -23,7 +23,6 @@ def __init__(self):
                 "This is required when using a FileSystemFinder.".format(self.settings_attr)
             )
         self.paths = getattr(settings, self.settings_attr)
-        self._cached_paths = {}
 
     def find(self, path: Path):
         """
@@ -35,7 +34,7 @@ def find(self, path: Path):
         """
         # Update paths from settings to make them editable runtime
         # This is only possible for FileSystemFinders
-        if self.settings_attr:
+        if getattr(self, 'settings_attr', None):
             self.paths = getattr(settings, self.settings_attr)
 
         path_found = None
@@ -53,13 +52,17 @@ class BaseEffectDirectoriesFinder(BaseFileSystemFinder):
     directory = None
 
     def __init__(self):
-        from demosys.effects.registry import effects
-        self.paths = list(effects.get_dirs())
+        pass
 
     def find(self, path: Path):
         path = Path(self.directory) / Path(path)
         return super().find(path)
 
+    @property
+    def paths(self):
+        from demosys.effects.registry import effects
+        return list(effects.get_dirs())
+
 
 @functools.lru_cache(maxsize=None)
 def get_finder(import_path):

demosys/effect_templates/raymarching_simple/effect.py

@@ -14,7 +14,6 @@ def __init__(self):
         # create plane to fit whole screen
         self.plane = geometry.plane.plane_xz(size=(self.window_width, self.window_height), resolution=(10, 10))
 
-    @effect.bind_target
     def draw(self, time, frametime, target):
         self.ctx.enable(moderngl.DEPTH_TEST)
 

demosys/resources/base.py

@@ -30,7 +30,7 @@ def load_pool(self):
         Loads all the data files using the configured finders.
         """
         for path, data_file in self.file_map.items():
-            if self.file_map[path] is None:
+            if data_file is None:
                 self._load(self.file_meta[path])
 
     def delete(self, obj, destroy=False):
@@ -42,6 +42,7 @@ def delete(self, obj, destroy=False):
             if data == obj:
                 del self.file_map[path]
                 del self.file_meta[path]
+
                 if destroy:
                     self._destroy(obj)
                 break

demosys/resources/data.py

@@ -107,7 +107,7 @@ def load_deferred(self, path: str, cls=Data, mode='binary', **kwargs):
 
     def _load(self, meta) -> Data:
         """Internal loader"""
-        found_path = self._find_last_of(meta.path, list(get_finders()))
+        found_path = self._find_last_of(meta.path, get_finders())
 
         if not found_path:
             raise ImproperlyConfigured("Cannot find data file {}".format(meta.path))

demosys/resources/scenes.py

@@ -72,7 +72,7 @@ def load_deferred(self, path: Union[str, Path], **kwargs) -> SceneMeta:
         return meta
 
     def _load(self, meta) -> Scene:
-        found_path = self._find_last_of(meta.path, list(get_finders()))
+        found_path = self._find_last_of(meta.path, get_finders())
 
         if not found_path:
             raise ImproperlyConfigured("Cannot find scene file {}".format(meta.path))

demosys/resources/shaders.py

@@ -56,7 +56,7 @@ def load_deferred(self, path: Union[str, Path], **kwargs) -> ShaderMeta:
         return meta
 
     def _load(self, meta, reload=False):
-        found_path = self._find_last_of(meta.path, list(get_finders()))
+        found_path = self._find_last_of(meta.path, get_finders())
 
         if not found_path:
             raise ImproperlyConfigured("Cannot find shader {}".format(meta.path))

demosys/resources/textures.py

@@ -63,7 +63,7 @@ def _load(self, meta):
         """
         Loads all the textures using the configured finders.
         """
-        found_path = self._find_last_of(meta.path, list(get_finders()))
+        found_path = self._find_last_of(meta.path, get_finders())
 
         if not found_path:
             raise ImproperlyConfigured("Cannot find texture {}".format(meta.path))

tests/test_effect_templates.py

@@ -0,0 +1,36 @@
+import os
+
+from demosys.test import DemosysTestCase
+from demosys.effects.registry import effects
+from demosys.effects import Effect
+from demosys.scene import camera
+
+
+class EffectTemplateTestCase(DemosysTestCase):
+
+    def test_templates(self):
+        templates = self.list_effect_templates()
+        effects.polulate(templates)
+
+        Effect.ctx = self.ctx
+        Effect.window_aspect = 16 / 9
+        Effect.window_width = self.window.width
+        Effect.window_height = self.window.height
+        Effect.sys_camera = camera.SystemCamera()
+
+        for name, config in effects.effects.items():
+            effect = config.cls()
+            effect.post_load()
+            effect.draw(0.0, 1 / 60, self.window.fbo)
+
+            self.window.fbo.clear()
+
+    def list_effect_templates(self):
+        dirs = os.listdir(
+            os.path.join(
+                os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+                'demosys',
+                'effect_templates'
+            )
+        )
+        return ["demosys.effect_templates.{}".format(d) for d in dirs]

tests/test_resources.py

@@ -9,7 +9,8 @@
 class ResourceTestCase(DemosysTestCase):
 
     def test_datafiles(self):
-        """Loading data files"""
+        resources.data.flush(destroy=True)        
+
         # string and binary data file
         data_str = resources.data.load('data.txt', mode="text")
         data_bin = resources.data.load('data.bin', mode="binary")
@@ -34,6 +35,8 @@ def test_datafiles(self):
             resources.data.load('notfound.bin')
 
     def test_scene(self):
+        resources.scenes.flush(destroy=True)
+
         scene_obj = resources.scenes.load('cube.obj')
         self.assertEqual(len(scene_obj.nodes), 0)
         self.assertEqual(len(scene_obj.root_nodes), 1)
@@ -61,6 +64,7 @@ def test_scene(self):
 
     def test_shaders(self):
         resources.shaders.flush(destroy=True)
+
         shader1 = resources.shaders.load('vf_pos.glsl')
         shader2 = resources.shaders.load('vgf_quads.glsl')
         self.assertEqual(resources.shaders.count, 2)
@@ -85,6 +89,8 @@ def test_shaders(self):
             resources.shaders.load('notfound.glsl')
 
     def test_textures(self):
+        resources.textures.flush(destroy=True)
+
         texture1 = resources.textures.load('wood.jpg')
         texture2 = resources.textures.load('crate.jpg')
         self.assertEqual(resources.textures.count, 2)