Initialize project on init

Author: einarf

demosys/context/base.py

@@ -23,7 +23,6 @@ def __init__(self):
         self.fbo = None
         self.sys_camera = None
         self.timer = None
-        self.resources = None
         self.timeline = None
 
         self.gl_version = GLVersion(

demosys/context/glfw.py

@@ -169,7 +169,7 @@ def key_event_callback(self, window, key, scancode, action, mods):
             screenshot.create()
 
         if key == glfw.KEY_R and action == glfw.PRESS:
-            self.resources.shaders.reload()
+            print("Shader reloading is disabled :(")
 
         # Forward the event to the timeline
         self.timeline.key_event(key, scancode, action, mods)

demosys/view/controller.py

@@ -4,11 +4,7 @@
 """
 import time
 
-from demosys import resources
 from demosys.conf import settings
-from demosys.effects.registry import Effect
-from demosys.opengl import texture
-from demosys.scene import camera
 from demosys.utils.module_loading import import_string
 
 
@@ -18,18 +14,21 @@ def run(project=None):
 
     :param manager: The effect manager to use
     """
+    from demosys.scene import camera
+    from demosys.opengl import texture
+    from demosys.effects.registry import Effect
+
     window = create_window()
-    timeline = import_string(settings.TIMELINE)()
-    window.timeline = timeline
 
     if not project:
         project = import_string(settings.PROJECT)()
 
+    timeline = import_string(settings.TIMELINE)(project)
+    window.timeline = timeline
+
     texture._init_texture2d_draw()
     texture._init_depth_texture_draw()
 
-    print("Loader started at", time.time())
-
     # Inject attributes into the base Effect class
     setattr(Effect, '_window', window)
     setattr(Effect, '_ctx', window.ctx)
@@ -39,9 +38,9 @@ def run(project=None):
     window.sys_camera = camera.SystemCamera(aspect=window.aspect_ratio, fov=60.0, near=1, far=1000)
     setattr(Effect, '_sys_camera', window.sys_camera)
 
-    # Window key events can reload shaders
-    window.resources = resources
-    resources.load()
+    print("Loading started at", time.time())
+
+    project.load()
 
     # Initialize timer
     timer_cls = import_string(settings.TIMER)