Working examples

Author: einarf

demosys/effects/registry.py

@@ -52,12 +52,18 @@ def add_package(self, name):
 
         :param name: (str) The effect package to add
         """
+        if name in self.package_map:
+            return
+
         package = EffectPackage(name)
         package.load()
 
         self.packages.append(package)
         self.package_map[package.path] = package
 
+        # Load effect package dependencies
+        self.polulate(package.effect_packages)
+
     def get_package(self, name) -> 'EffectPackage':
         """
         Get a package by python path
@@ -154,20 +160,16 @@ def load_effects_classes(self):
 
     def load_resource_module(self):
         """Fetch the resource list"""
-        # Do we have a resources folder?
-        if not os.path.exists(os.path.join(self.path, 'resources')):
-            return
-
         # Attempt to load the dependencies module
         try:
             name = '{}.{}'.format(self.name, 'dependencies')
             self.dependencies_module = importlib.import_module(name)
-        except ModuleNotFoundError:
+        except ModuleNotFoundError as err:
             raise EffectError(
                 (
-                    "Effect package '{}' has no 'dependencies' module. "
-                    "This is required when the resources directory is present."
-                ).format(self.name))
+                    "Effect package '{}' has no 'dependencies' module or the module has errors. "
+                    "Forwarded error from importlib: {}"
+                ).format(self.name, err))
 
         # Fetch the resource descriptions
         try:

demosys/effects/text/resources/descriptions.py renamed to demosys/effects/text/dependencies.py

@@ -1,5 +1,6 @@
 from demosys.resources.meta import TextureDescription, ProgramDescription, DataDescription
 
+effect_packages = []
 
 resources = [
     # Font meta and texture

demosys/effects/text/effects/writer_2d.py

@@ -24,13 +24,13 @@ def __init__(self, area, text_lines=None, aspect_ratio=1.0):
         self.aspect_ratio = aspect_ratio
 
         self._vao = None
+        self._config = self.get_data('demosys.program.font_meta')
         self._texture = self.get_texture('demosys.text.font_texture')
         self._program = self.get_program('demosys.text.program_writer_2d')
-        self._config = self.get_data('demosys.text.textwriter2d.glsl')
 
         self._string_buffer = None
 
-        self._init(FontMeta(self._config.data))
+        self._init(FontMeta(self._config))
 
         self._string_buffer = self.ctx.buffer(reserve=self.area[0] * 4 * self.area[1])
         self._string_buffer.clear(chunk=b'\32')

demosys/loaders/texture/array.py

@@ -6,7 +6,7 @@ class Loader(PillowLoader):
 
     def __init__(self, meta):
         super().__init__(meta)
-        self.layers = self.meta.get('layers')
+        self.layers = self.meta.kwargs.get('layers')
 
         if self.layers is None:
             raise ValueError("TextureArray requires layers parameter")
@@ -25,7 +25,7 @@ def load(self):
         )
 
         if self.meta.mipmap:
-            self.build_mipmaps()
+            texture.build_mipmaps()
 
         self._close_image()
 

examples/geocubes/effect.py renamed to examples/geocubes/effects.py

@@ -0,0 +1,6 @@
+
+effect_packages = [
+    'demosys.effects.text',
+]
+
+resources = []

examples/minecraft/effect.py renamed to examples/minecraft/effects.py

@@ -2,7 +2,7 @@
 import os
 
 from demosys.effects import effect
-from demosys.text import TextRenderer2D
+from demosys.effects.text.effects import TextRenderer2D
 
 
 class TextRendererEffect(effect.Effect):