Skip to content

Commit 547287a

Browse files
committed
Basic rocket support
1 parent 5a8c99f commit 547287a

File tree

5 files changed

+41
-4
lines changed

5 files changed

+41
-4
lines changed

demosys/effects/effect.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def get_texture(self, path):
3232
return resources.textures.get(path, create=True)
3333

3434
def get_track(self, name):
35-
resources.tracks.get(name)
35+
return resources.tracks.get(name)
3636

3737
# Utility methods for matrices
3838

demosys/timers/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
from .base import Timer # noqa
22
from .music import MusicTimer # noqa
3+
from .rocket import RocketTimer # noqa

demosys/timers/rocket.py

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
from rocket.controller import TimeController
2+
from rocket.rocket import Rocket
3+
from demosys.resources import tracks
4+
5+
6+
class RocketTimer:
7+
"""Basic rocket timer"""
8+
def __init__(self):
9+
self.controller = TimeController(24)
10+
self.rocket = Rocket(self.controller, track_path="./data")
11+
self.rocket.start()
12+
13+
# Register tracks in the editor
14+
# Ninja in pre-created track objects
15+
for track in tracks.tacks:
16+
self.rocket.tracks.add(track)
17+
18+
# Tell the editor about these tracks
19+
for track in tracks.tacks:
20+
self.rocket.track(track.name)
21+
22+
def start(self):
23+
pass
24+
25+
def get_time(self):
26+
self.rocket.update()
27+
return self.rocket.time
28+
29+
def pause(self):
30+
self.controller.playing = False
31+
32+
def toggle_pause(self):
33+
self.controller.playing = not self.controller.playing
34+
35+
def stop(self):
36+
return self.rocket.time

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PyOpenGL==3.1.0
22
glfw==1.4.0
33
pyrr==0.8.2
44
Pillow==4.0.0
5-
pyrocket==0.1.2
5+
pyrocket==0.1.3
66

77
# Optional
88
pygame==1.9.3

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setup(
44
name="demosys-py",
5-
version="0.2.3",
5+
version="0.3.0",
66
description="Modern OpenGL 4.1+ Prototype Framework inspired by Django",
77
long_description=open('README.rst').read(),
88
url="https://github.com/Contraz/demosys-py",
@@ -29,7 +29,7 @@
2929
'glfw==1.4.0',
3030
'pyrr==0.8.2',
3131
'Pillow==4.0.0',
32-
'pyrocket==0.1.2',
32+
'pyrocket==0.1.3',
3333
'pygame==1.9.3',
3434
],
3535
entry_points={'console_scripts': [

0 commit comments

Comments
 (0)