Move scene loaders into loaders

Author: einarf

CHANGELOG.md

@@ -5,3 +5,7 @@
 * The FBO class is gone. Use ``moderngl.Framebuffer`` or ``moderngl.RenderBuffer`` directly instead.
 * Effect no longer have ``window_width`` and ``window_height`` properties. Use ``Effect.window.<property>`` instead.
 * The effect ``bind_target`` decorator no longer exists
+* All loaders moved to ``demosys.loaders``
+
+Expand on:
+* Texture and FBO draw functions

demosys/__init__.py

@@ -15,5 +15,20 @@ def setup(settings_override=None):
 
 def run(*args, **kwargs):
     """Run"""
+    window = create_window()
+    kwargs['window'] = window
+
     from demosys import view
     view.run(*args, **kwargs)
+
+
+def create_window():
+    from demosys.conf import settings
+    from demosys.utils import module_loading
+
+    window_cls_name = settings.WINDOW.get('class', 'demosys.context.glfw.GLFW_Window')
+    print("window class", window_cls_name)
+    window_cls = module_loading.import_string(window_cls_name)
+    window = window_cls()
+    window.print_context_info()
+    return window

demosys/scene/loaders/__init__.py renamed to demosys/loaders/scene/__init__.py

@@ -12,22 +12,12 @@
 from demosys.opengl.texture import helper
 
 
-def create_window():
-    window_cls_name = settings.WINDOW.get('class', 'demosys.context.glfw.GLFW_Window')
-    print("window class", window_cls_name)
-    window_cls = module_loading.import_string(window_cls_name)
-    window = window_cls()
-    window.print_context_info()
-    return window
-
-
-def run(manager=None):
+def run(manager=None, window=None):
     """
     Initialize, load and run
 
     :param manager: The effect manager to use
     """
-    window = create_window()
     window.manager = manager
 
     helper._init_texture2d_draw()

demosys/scene/loaders/base.py renamed to demosys/loaders/scene/base.py

@@ -63,6 +63,6 @@
 )
 
 SCENE_LOADERS = (
-    "demosys.scene.loaders.gltf.GLTF2",
-    "demosys.scene.loaders.wavefront.ObjLoader",
+    "demosys.loaders.scene.gltf.GLTF2",
+    "demosys.loaders.scene.wavefront.ObjLoader",
 )