File tree Expand file tree Collapse file tree 5 files changed +41
-4
lines changed Expand file tree Collapse file tree 5 files changed +41
-4
lines changed Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ def get_texture(self, path):
32
32
return resources .textures .get (path , create = True )
33
33
34
34
def get_track (self , name ):
35
- resources .tracks .get (name )
35
+ return resources .tracks .get (name )
36
36
37
37
# Utility methods for matrices
38
38
Original file line number Diff line number Diff line change 1
1
from .base import Timer # noqa
2
2
from .music import MusicTimer # noqa
3
+ from .rocket import RocketTimer # noqa
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ PyOpenGL==3.1.0
2
2
glfw == 1.4.0
3
3
pyrr == 0.8.2
4
4
Pillow == 4.0.0
5
- pyrocket == 0.1.2
5
+ pyrocket == 0.1.3
6
6
7
7
# Optional
8
8
pygame == 1.9.3
Original file line number Diff line number Diff line change 2
2
3
3
setup (
4
4
name = "demosys-py" ,
5
- version = "0.2.3 " ,
5
+ version = "0.3.0 " ,
6
6
description = "Modern OpenGL 4.1+ Prototype Framework inspired by Django" ,
7
7
long_description = open ('README.rst' ).read (),
8
8
url = "https://github.com/Contraz/demosys-py" ,
29
29
'glfw==1.4.0' ,
30
30
'pyrr==0.8.2' ,
31
31
'Pillow==4.0.0' ,
32
- 'pyrocket==0.1.2 ' ,
32
+ 'pyrocket==0.1.3 ' ,
33
33
'pygame==1.9.3' ,
34
34
],
35
35
entry_points = {'console_scripts' : [
You can’t perform that action at this time.
0 commit comments