Improved rocket support

Author: einarf

demosys/conf/default_settings.py

@@ -3,8 +3,8 @@
 """
 
 # What attributes should be used when generating a settings file
-__ORDER__ = ('DEBUG', 'SCREENSHOT_PATH', 'OPENGL', 'WINDOW', 'MUSIC', 'TIMER', 'EFFECTS', 'EFFECT_MANAGER',
-             'SHADER_DIRS', 'SHADER_FINDERS', 'TEXTURE_DIRS', 'TEXTURE_FINDERS')
+__ORDER__ = ('DEBUG', 'SCREENSHOT_PATH', 'OPENGL', 'WINDOW', 'MUSIC', 'TIMER', 'ROCKET_MODE', 'EFFECTS',
+             'EFFECT_MANAGER', 'SHADER_DIRS', 'SHADER_FINDERS', 'TEXTURE_DIRS', 'TEXTURE_FINDERS')
 
 DEBUG = False
 
@@ -34,6 +34,12 @@
 
 TIMER = 'demosys.timers.Timer'
 
+ROCKET = {
+    'mode': 'editor',
+    'project_file': None,
+    'files': None,
+}
+
 # Empty effects tuple
 EFFECTS = ()
 

demosys/timers/rocket.py

@@ -1,14 +1,27 @@
-from rocket.controller import TimeController
-from rocket.rocket import Rocket
+from rocket.controllers import TimeController
+from rocket import Rocket
 from demosys.resources import tracks
 
 
 class RocketTimer:
     """Basic rocket timer"""
-    def __init__(self):
+    def __init__(self, config):
+        if config is None:
+            config = {}
+
+        self.mode = config.get('mode') or 'editor'
+        self.files = config.get('files') or './tracks'
+        self.project = config.get('project') or 'project.xml'
+
         self.controller = TimeController(24)
-        self.rocket = Rocket(self.controller, track_path="./data")
-        self.rocket.start()
+        if self.mode == 'editor':
+            self.rocket = Rocket.from_socket(self.controller, track_path=self.files)
+        elif self.mode == 'project':
+            self.rocket = Rocket.from_project_file(self.controller, self.project)
+        elif self.mode == 'files':
+            self.rocket = Rocket.from_files(self.controller, self.files)
+        else:
+            raise ValueError("Unknown rocket mode: '{}'".format(self.mode))
 
         # Register tracks in the editor
         # Ninja in pre-created track objects
@@ -19,8 +32,10 @@ def __init__(self):
         for track in tracks.tacks:
             self.rocket.track(track.name)
 
+        self.rocket.update()
+
     def start(self):
-        pass
+        self.rocket.start()
 
     def get_time(self):
         self.rocket.update()

demosys/view/controller.py

@@ -57,7 +57,7 @@ def run(manager=None):
     # Initialize timer
     global TIMER
     timer_cls = module_loading.import_string(settings.TIMER)
-    TIMER = timer_cls()
+    TIMER = timer_cls(getattr(settings, 'ROCKET'))
     TIMER.start()
 
     frames, ft = 0, 0

requirements.txt

@@ -2,7 +2,7 @@ PyOpenGL==3.1.0
 glfw==1.4.0
 pyrr==0.8.2
 Pillow==4.0.0
-pyrocket==0.1.3
+pyrocket==0.2.3
 
 # Optional
 pygame==1.9.3

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="demosys-py",
-    version="0.3.0",
+    version="0.3.2",
     description="Modern OpenGL 4.1+ Prototype Framework inspired by Django",
     long_description=open('README.rst').read(),
     url="https://github.com/Contraz/demosys-py",
@@ -29,7 +29,7 @@
         'glfw==1.4.0',
         'pyrr==0.8.2',
         'Pillow==4.0.0',
-        'pyrocket==0.1.3',
+        'pyrocket==0.2.3',
         'pygame==1.9.3',
     ],
     entry_points={'console_scripts': [