Working tests

Author: einarf

demosys/test/testcase.py

@@ -21,22 +21,21 @@ def create_shader(self, source=None, path=None):
         """
         Create a shader from source or file
         """
-        program = ShaderProgram(name="test", path=path)
-
         if source:
+            program = ShaderProgram(name="test", path=path)
             program.set_source(source)
             program.prepare()
 
         if path:
-            resources.shaders.load_shader(program)
+            program = resources.shaders.load(path)
 
         return program
 
     def get_texture(self, path):
-        return resources.textures.get(path, create=True)
+        return resources.textures.load(path, create=True)
 
     def get_texture_array(self, path, layers=0):
-        return resources.textures.get(path, create=True, cls=TextureArray, layers=layers)
+        return resources.textures.load(path, create=True, cls=TextureArray, layers=layers)
 
     def get_track(self, name):
         return resources.tracks.get(name)

demosys/text/renderer2d.py

@@ -7,13 +7,6 @@
 from .writer2d import TextWriter2D
 
 
-def on_load():
-    resources.shaders.get('demosys/text/view_renderer_texture.glsl', create=True)
-
-
-resources.on_load(on_load, priority=100)
-
-
 class TextRenderer2D(TextWriter2D):
 
     def __init__(self, area, text_lines=None, texture_height=64):
@@ -22,17 +15,14 @@ def __init__(self, area, text_lines=None, texture_height=64):
         :param size: Text size
         :param text: Initial text
         """
+        super().__init__(area, text_lines=text_lines)
         self._texture_height = texture_height
         self._texture_width = 0
 
         self._quad = self._create_vao()
-        self._quad_shader = resources.shaders.get('demosys/text/view_renderer_texture.glsl', create=True)
+        self._quad_shader = resources.shaders.load('demosys/text/view_renderer_texture.glsl', create=True)
         self._fbo = None
-        super().__init__(area, text_lines=text_lines)
 
-    def _post_load(self):
-        print("TextRenderer2D._post_load")
-        super()._post_load()
         self._texture_width = int(
             round(self._meta.char_aspect_wh * self._texture_height * self.area[0] / self.area[1], 0)
         )

demosys/text/writer2d.py

@@ -8,15 +8,6 @@
 from .base import BaseText, Meta
 
 
-def on_load():
-    resources.textures.get('demosys/text/VeraMono.png', cls=TextureArray, layers=190, create=True)
-    resources.shaders.get('demosys/text/textwriter2d.glsl', create=True)
-    resources.data.get('demosys/text/meta.json', create=True)
-
-
-resources.on_load(on_load, priority=100)
-
-
 class TextWriter2D(BaseText):
 
     def __init__(self, area, text_lines=None, aspect_ratio=1.0):
@@ -34,16 +25,12 @@ def __init__(self, area, text_lines=None, aspect_ratio=1.0):
         self.aspect_ratio = aspect_ratio
 
         self._vao = None
-        self._texture = resources.textures.get('demosys/text/VeraMono.png', cls=TextureArray, layers=190, create=True)
-        self._shader = resources.shaders.get('demosys/text/textwriter2d.glsl', create=True)
-        self._config = resources.data.get('demosys/text/meta.json', create=True)
+        self._texture = resources.textures.load('demosys/text/VeraMono.png', cls=TextureArray, layers=190)
+        self._shader = resources.shaders.load('demosys/text/textwriter2d.glsl')
+        self._config = resources.data.load('demosys/text/meta.json')
 
         self._string_buffer = None
 
-        resources.on_loaded(self._post_load, priority=99)
-
-    def _post_load(self):
-        """Parse font metadata after resources are loaded"""
         self._init(Meta(self._config.data))
 
         self._string_buffer = self.ctx.buffer(reserve=self.area[0] * 4 * self.area[1])

docs/source/reference/effect.rst

@@ -20,16 +20,7 @@ Resource Methods
 .. automethod:: Effect.get_track(name, local=False) -> Track
 .. automethod:: Effect.get_scene(path, local=False, **kwargs) -> Scene
 .. automethod:: Effect.get_data(path, local=False, **kwargs) -> Data
-
-Callbacks
----------
-
 .. automethod:: Effect.post_load()
-.. automethod:: Effect.on_resouces_loaded(func)
-.. automethod:: Effect.on_textures_loaded(func)
-.. automethod:: Effect.on_data_loaded(func)
-.. automethod:: Effect.on_shaders_loaded(func)
-.. automethod:: Effect.on_scenes_loaded(func)
 
 Utility Methods
 ---------------

docs/source/reference/shaderprogram.rst

@@ -17,6 +17,7 @@ Source Methods
 .. automethod:: ShaderProgram.set_vertex_source(source:str)
 .. automethod:: ShaderProgram.set_geometry_source(source:str)
 .. automethod:: ShaderProgram.set_fragment_source(source:str)
+.. automethod:: ShaderProgram.release()
 
 Attributes
 ----------

docs/source/reference/vao.rst

@@ -12,6 +12,7 @@ Methods
 .. automethod:: VAO.buffer(buffer, buffer_format:str, attribute_names, per_instance=False)
 .. automethod:: VAO.index_buffer(buffer, index_element_size=4)
 .. automethod:: VAO.subroutines(shader, routines:tuple)
+.. automethod:: VAO.release()
 
 Draw Methods
 ------------

tests/test_shader.py

@@ -46,4 +46,4 @@ def assertAttributes(self, shader):
         assert shader.attribute_key
         assert len(shader.attribute_list) == 1
         assert len(shader.attribute_map) == 1
-        assert shader.path in str(shader)
+        assert str(shader.path) in str(shader)

tests/test_text.py

@@ -0,0 +1,20 @@
+from demosys.test import DemosysTestCase
+from demosys.text import TextWriter2D, TextRenderer2D
+
+
+class TextTestCase(DemosysTestCase):
+
+    def test_writer(self):
+        writer = TextWriter2D(
+            (4, 4),
+            text_lines=[
+                "ABCD",
+                "!@#$",
+                "abcd",
+                "1234",
+            ]
+        )
+        writer.draw((0, 0), size=1.0)
+
+    def test_renderer(self):
+        pass