Merge branch 'master' into samplers

Author: einarf

demosys/geometry/quad.py

@@ -21,32 +21,32 @@ def quad_2d(width, height, xpos=0.0, ypos=0.0) -> VAO:
     :param xpos: Center position x
     :param ypos: Center position y
     """
-    pos = context.ctx().buffer(numpy.array([
+    pos = numpy.array([
         xpos - width / 2.0, ypos + height / 2.0, 0.0,
         xpos - width / 2.0, ypos - height / 2.0, 0.0,
         xpos + width / 2.0, ypos - height / 2.0, 0.0,
         xpos - width / 2.0, ypos + height / 2.0, 0.0,
         xpos + width / 2.0, ypos - height / 2.0, 0.0,
         xpos + width / 2.0, ypos + height / 2.0, 0.0,
-    ], dtype=numpy.float32).tobytes())
+    ], dtype=numpy.float32)
 
-    normals = context.ctx().buffer(numpy.array([
+    normals = numpy.array([
         0.0, 0.0, 1.0,
         0.0, 0.0, 1.0,
         0.0, 0.0, 1.0,
         0.0, 0.0, 1.0,
         0.0, 0.0, 1.0,
         0.0, 0.0, 1.0,
-    ], dtype=numpy.float32).tobytes())
+    ], dtype=numpy.float32)
 
-    uvs = context.ctx().buffer(numpy.array([
+    uvs = numpy.array([
         0.0, 1.0,
         0.0, 0.0,
         1.0, 0.0,
         0.0, 1.0,
         1.0, 0.0,
         1.0, 1.0,
-    ], dtype=numpy.float32).tobytes())
+    ], dtype=numpy.float32)
 
     vao = VAO("geometry:quad", mode=moderngl.TRIANGLES)
     vao.buffer(pos, '3f', ["in_position"])

demosys/geometry/sphere.py

@@ -3,7 +3,6 @@
 import numpy
 
 import moderngl as mlg
-from demosys import context
 from demosys.opengl import VAO
 
 
@@ -58,10 +57,10 @@ def sphere(radius=0.5, sectors=32, rings=16) -> VAO:
             indices[i + 5] = (r + 1) * sectors + (s + 1)
             i += 6
 
-    vbo_vertices = context.ctx().buffer(numpy.array(vertices, dtype=numpy.float32).tobytes())
-    vbo_normals = context.ctx().buffer(numpy.array(normals, dtype=numpy.float32).tobytes())
-    vbo_uvs = context.ctx().buffer(numpy.array(uvs, dtype=numpy.float32).tobytes())
-    vbo_elements = context.ctx().buffer(numpy.array(indices, dtype=numpy.uint32).tobytes())
+    vbo_vertices = numpy.array(vertices, dtype=numpy.float32)
+    vbo_normals = numpy.array(normals, dtype=numpy.float32)
+    vbo_uvs = numpy.array(uvs, dtype=numpy.float32)
+    vbo_elements = numpy.array(indices, dtype=numpy.uint32)
 
     vao = VAO("sphere", mode=mlg.TRIANGLES)
     # VBOs

demosys/resources/__init__.py

@@ -5,8 +5,6 @@
 from .data import data
 from .data import Data  # noqa
 
-ON_LOAD_FUNCS = []
-
 __all__ = [
     'shaders',
     'textures',
@@ -16,24 +14,55 @@
     'Data',
     'load',
     'count',
+    'on_load',
     'on_loaded',
+    'loading_complete',
 ]
 
 
+class States:
+    on_loaded_funcs = []
+    on_load_funcs = []
+    loaded = False
+
+    @classmethod
+    def sort_callbacks(cls):
+        cls.on_load_funcs = sorted(cls.on_load_funcs, key=lambda x: x[0])
+        cls.on_loaded_funcs = sorted(cls.on_loaded_funcs, key=lambda x: x[0])
+
+
 def load():
+    States.sort_callbacks()
+
+    for func in reversed(States.on_load_funcs):
+        func[1]()
+
     scenes.load()
     shaders.load()
     textures.load()
     tracks.load()
     data.load()
 
-    for func in ON_LOAD_FUNCS:
-        func()
+    States.loaded = True
+    for func in reversed(States.on_loaded_funcs):
+        func[1]()
 
 
 def count():
     return shaders.count + textures.count
 
 
-def on_loaded(func):
-    ON_LOAD_FUNCS.append(func)
+def loading_complete():
+    return States.loaded
+
+
+def on_load(func, priority=0):
+    States.on_load_funcs.append((priority, func))
+
+
+def on_loaded(func, priority=0):
+    if loading_complete():
+        func()
+        return
+
+    States.on_loaded_funcs.append((priority, func))

demosys/resources/data.py

@@ -68,7 +68,7 @@ def get(self, name, create=False, cls=Data) -> Data:
         key = name.lower()
 
         data_file = self.file_map.get(key)
-        if not data_file:
+        if not data_file and create:
             data_file = cls(name)
             self.files.append(data_file)
             self.file_map[key] = data_file

demosys/text/base.py

@@ -55,3 +55,10 @@ def __init__(self, meta):
         self.character_width = self._meta['character_width']
         self.atlas_height = self._meta['atlas_height']
         self.atlas_width = self._meta['atlas_width']
+
+    @property
+    def char_aspect_wh(self):
+        return self.character_width / self.character_height
+
+    def char_aspect_hw(self):
+        return self.character_height / self.character_width

demosys/text/renderer2d.py

@@ -1,31 +1,72 @@
-from demosys.resources import shaders
-from .base import BaseText
+import numpy
 
+import moderngl
+from demosys.opengl import FBO, VAO
+from demosys import resources
 
-class TextRenderer2D(BaseText):
+from .writer2d import TextWriter2D
 
-    def __init__(self, area, size=0.1, text=""):
+
+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):
         """
         :param area: (x, y) Text area size (number of characters)
         :param size: Text size
         :param text: Initial text
         """
-        super().__init__(text)
-        self.area = area
-        self.size = size
-        self._text = text
+        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._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)
+        )
 
-        self.fbo = None
-        self.vao = None
-        self.shader = shaders.get('demosys/text/textwriter.glsl', create=True)
+        self.aspect_ratio = self._texture_width / self._texture_height
+        self._fbo = FBO.create((self._texture_width, self._texture_height))
 
     @property
-    def text(self):
-        return self._text
+    def texture(self):
+        return self._fbo.color_buffers[0]
+
+    def render(self):
+        self._fbo.clear()
+        with self._fbo:
+            super().draw((0.0, 0.0), size=2.0 / self.area[1])
+
+    def draw(self, pos, size=1.0):
+        self._fbo.color_buffers[0].use(location=0)
+        self._quad_shader.uniform("texture0", 0)
+        self._quad_shader.uniform("yscale", self._texture_height / self._texture_width)
+        self._quad_shader.uniform("pos", pos)
+        self._quad_shader.uniform("size", size)
+        self._quad.draw(self._quad_shader)
 
-    @text.setter
-    def text(self, value):
-        self._text = value
+    def _create_vao(self):
+        data = numpy.array([
+            0.0, -2.0, 0.0, 0.0, 0.0,
+            0.0, 0.0, 0.0, 0.0, 1.0,
+            2.0, 0.0, 0.0, 1.0, 1.0,
+            0.0, -2.0, 0.0, 0.0, 0.0,
+            2.0, 0.0, 0.0, 1.0, 1.0,
+            2.0, -2.0, 0.0, 1.0, 0.0,
+        ], dtype=numpy.float32)
 
-    def draw(self):
-        pass
+        vao = VAO("textrenderer", mode=moderngl.TRIANGLES)
+        vao.buffer(data, '3f 2f', ['in_position', 'in_uv'])
+        return vao

demosys/text/resources/shaders/demosys/text/view_renderer_texture.glsl

@@ -0,0 +1,34 @@
+#version 330
+
+#if defined VERTEX_SHADER
+
+in vec3 in_position;
+in vec2 in_uv;
+
+uniform vec2 pos;
+uniform float size;
+uniform float yscale;
+
+out vec2 uv;
+// 
+void main() {
+    vec3 p = vec3(
+        (in_position.x * size) - 1.0 + pos[0],
+        (in_position.y * size) * yscale * 2.0 + 1.0 + pos[1],
+        0.0
+    );
+    gl_Position = vec4(p, 1.0);
+    uv = in_uv;
+}
+
+#elif defined FRAGMENT_SHADER
+
+out vec4 fragColor;
+uniform sampler2D texture0;
+in vec2 uv;
+
+void main() {
+    fragColor = texture(texture0, uv);
+}
+
+#endif

demosys/text/writer2d.py

@@ -2,12 +2,21 @@
 
 import moderngl
 from demosys.opengl import VAO, TextureArray
-from demosys.resources import data, shaders, textures
+from demosys import resources
 from pyrr import matrix44
 
 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):
@@ -25,13 +34,13 @@ def __init__(self, area, text_lines=None, aspect_ratio=1.0):
         self.aspect_ratio = aspect_ratio
 
         self._vao = None
-        self._texture = textures.get('demosys/text/VeraMono.png', cls=TextureArray, layers=190, create=True)
-        self._shader = shaders.get('demosys/text/textwriter2d.glsl', create=True)
-        self._config = data.get('demosys/text/meta.json', create=True)
+        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._string_buffer = None
 
-        data.on_loaded(self._post_load)
+        resources.on_loaded(self._post_load, priority=99)
 
     def _post_load(self):
         """Parse font metadata after resources are loaded"""

examples/README.md

@@ -84,3 +84,16 @@ python manage.py runeffect examples.textwriter
 ```
 
 ![screenshot](https://raw.githubusercontent.com/Contraz/demosys-py/master/examples/images/textwriter.png)
+
+Text Renderer
+-------------
+
+Example loading a text file displaying it on the screen. The text is rendered to a texture at initialization.
+We simply display the texture each frame. We are limiting the texture height to 8k in this example.
+
+```bash
+python manage.py runeffect examples.textrenderer
+```
+
+![screenshot](https://raw.githubusercontent.com/Contraz/demosys-py/master/examples/images/textrenderer.png)
+