Improved timer and rocket support

Author: einarf

demosys/conf/default_settings.py

@@ -36,6 +36,7 @@
 
 ROCKET = {
     'mode': 'editor',
+    'rps': 24,
     'project_file': None,
     'files': None,
 }

demosys/timers/__init__.py

@@ -1,3 +1,4 @@
-from .base import Timer  # noqa
+from .time import Timer  # noqa
 from .music import MusicTimer  # noqa
 from .rocket import RocketTimer  # noqa
+from .rocketmusic import RocketMusicTimer  # noqa

demosys/timers/base.py

@@ -1,44 +1,26 @@
-import glfw
 
 
-class Timer:
+class BaseTimer:
     """Timer based on glfw time"""
     def __init__(self, **kwargs):
-        self.start_time = None
-        self.stop_time = None
-        self.pause_time = None
-        self.offset = 0
+        pass
 
     def start(self):
-        # Initial start?
-        if self.start_time is None:
-            self.start_time = glfw.get_time()
-        # Play after pause
-        else:
-            # Add the duration of the paused interval to the total offset
-            pause_duration = glfw.get_time() - self.pause_time
-            self.offset += pause_duration
-            # print("pause duration", pause_duration, "offset", self.offset)
-            # Exit the paused state
-            self.pause_time = None
+        """Start the timer"""
+        raise NotImplemented
 
     def pause(self):
-        self.pause_time = glfw.get_time()
+        """Pause the timer"""
+        raise NotImplemented
 
     def toggle_pause(self):
-        if self.pause_time:
-            self.start()
-        else:
-            self.pause()
+        """Toggle pause"""
+        raise NotImplemented
 
     def stop(self):
-        self.stop_time = glfw.get_time()
-        return self.stop_time - self.start_time - self.offset
+        """Stop the timer"""
+        raise NotImplemented
 
     def get_time(self):
-        if self.pause_time is not None:
-            time = self.pause_time - self.offset - self.start_time
-            return time
-
-        time = glfw.get_time()
-        return time - self.start_time - self.offset
+        """Get the current time in seconds (float)"""
+        raise NotImplemented

demosys/timers/music.py

@@ -1,10 +1,10 @@
 import glfw
 from pygame import mixer
-from .base import Timer
 from demosys.conf import settings
+from .base import BaseTimer
 
 
-class MusicTimer(Timer):
+class MusicTimer(BaseTimer):
     """Timer based on music"""
     def __init__(self, **kwargs):
         mixer.init()
@@ -14,6 +14,7 @@ def __init__(self, **kwargs):
         self.pause_time = 0
         self.initialized = False
         self._upt = 0  # hack fixing jaggy unpause
+        super().__init__(**kwargs)
 
     def start(self):
         if self.initialized:

demosys/timers/rocket.py

@@ -1,19 +1,22 @@
 from rocket.controllers import TimeController
 from rocket import Rocket
 from demosys.resources import tracks
+from demosys.conf import settings
+from .base import BaseTimer
 
 
-class RocketTimer:
+class RocketTimer(BaseTimer):
     """Basic rocket timer"""
-    def __init__(self, config):
+    def __init__(self, **kwargs):
+        config = getattr(settings, 'ROCKET', None)
         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.controller = TimeController(config.get('rps', 24))
         if self.mode == 'editor':
             self.rocket = Rocket.from_socket(self.controller, track_path=self.files)
         elif self.mode == 'project':
@@ -33,6 +36,7 @@ def __init__(self, config):
             self.rocket.track(track.name)
 
         self.rocket.update()
+        super().__init__(**kwargs)
 
     def start(self):
         self.rocket.start()

demosys/timers/rocketmusic.py

@@ -0,0 +1,8 @@
+from .rocket import RocketTimer
+from .music import MusicTimer
+
+
+class RocketMusicTimer(RocketTimer):
+    def __init__(self, **kwargs):
+        self.music = MusicTimer()
+        super().__init__(**kwargs)

demosys/timers/time.py

@@ -0,0 +1,46 @@
+import glfw
+from .base import BaseTimer
+
+
+class Timer(BaseTimer):
+    """Timer based on glfw time"""
+    def __init__(self, **kwargs):
+        self.start_time = None
+        self.stop_time = None
+        self.pause_time = None
+        self.offset = 0
+        super().__init__(**kwargs)
+
+    def start(self):
+        # Initial start?
+        if self.start_time is None:
+            self.start_time = glfw.get_time()
+        # Play after pause
+        else:
+            # Add the duration of the paused interval to the total offset
+            pause_duration = glfw.get_time() - self.pause_time
+            self.offset += pause_duration
+            # print("pause duration", pause_duration, "offset", self.offset)
+            # Exit the paused state
+            self.pause_time = None
+
+    def pause(self):
+        self.pause_time = glfw.get_time()
+
+    def toggle_pause(self):
+        if self.pause_time:
+            self.start()
+        else:
+            self.pause()
+
+    def stop(self):
+        self.stop_time = glfw.get_time()
+        return self.stop_time - self.start_time - self.offset
+
+    def get_time(self):
+        if self.pause_time is not None:
+            time = self.pause_time - self.offset - self.start_time
+            return time
+
+        time = glfw.get_time()
+        return time - self.start_time - self.offset

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(getattr(settings, 'ROCKET'))
+    TIMER = timer_cls()
     TIMER.start()
 
     frames, ft = 0, 0

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="demosys-py",
-    version="0.3.2",
+    version="0.3.3",
     description="Modern OpenGL 4.1+ Prototype Framework inspired by Django",
     long_description=open('README.rst').read(),
     url="https://github.com/Contraz/demosys-py",