diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-06-13 23:05:00 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-06-13 23:05:00 +0200 |
commit | 8f88a3e417d6eff7666571eccf0b6ad453c88ccd (patch) | |
tree | f67918bcb3feaa3356d45932abcd6c599db03028 /run.py | |
parent | 1df30f075c186c4c3d41d5f6014817b1b6b7b1ae (diff) | |
download | MusicSampler-8f88a3e417d6eff7666571eccf0b6ad453c88ccd.tar.gz MusicSampler-8f88a3e417d6eff7666571eccf0b6ad453c88ccd.tar.zst MusicSampler-8f88a3e417d6eff7666571eccf0b6ad453c88ccd.zip |
Add actions
Diffstat (limited to 'run.py')
-rw-r--r-- | run.py | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -1,7 +1,9 @@ | |||
1 | import pygame | 1 | import pygame |
2 | import pydub | ||
2 | import sys | 3 | import sys |
3 | import helpers | 4 | import helpers |
4 | 5 | ||
6 | pygame.mixer.pre_init(frequency = 44100) | ||
5 | pygame.init() | 7 | pygame.init() |
6 | 8 | ||
7 | size = width, height = 1024, 600 | 9 | size = width, height = 1024, 600 |
@@ -11,8 +13,10 @@ background = pygame.Surface(screen.get_size()) | |||
11 | background = background.convert() | 13 | background = background.convert() |
12 | background.fill((250, 250, 250)) | 14 | background.fill((250, 250, 250)) |
13 | 15 | ||
14 | for key_name in helpers.keys: | 16 | helpers.parse_config() |
15 | key = helpers.keys[key_name] | 17 | |
18 | for key_name in helpers.Mapping.KEYS: | ||
19 | key = helpers.Mapping.KEYS[key_name] | ||
16 | key.draw(background) | 20 | key.draw(background) |
17 | 21 | ||
18 | screen.blit(background, (0, 0)) | 22 | screen.blit(background, (0, 0)) |
@@ -34,12 +38,12 @@ while 1: | |||
34 | sys.exit() | 38 | sys.exit() |
35 | 39 | ||
36 | if context == 'normal': | 40 | if context == 'normal': |
37 | if event.type == pygame.KEYDOWN and event.key in helpers.keys: | 41 | if event.type == pygame.KEYDOWN and event.key in helpers.Mapping.KEYS: |
38 | helpers.keys[event.key].do_actions() | 42 | helpers.Mapping.KEYS[event.key].do_actions() |
39 | if event.type == pygame.MOUSEBUTTONUP: | 43 | if event.type == pygame.MOUSEBUTTONUP: |
40 | for key in helpers.keys: | 44 | for key in helpers.Mapping.KEYS: |
41 | if helpers.keys[key].collidepoint(pygame.mouse.get_pos()): | 45 | if helpers.Mapping.KEYS[key].collidepoint(pygame.mouse.get_pos()): |
42 | helpers.keys[key].do_actions() | 46 | helpers.Mapping.KEYS[key].do_actions() |
43 | 47 | ||
44 | pygame.display.flip() | 48 | pygame.display.flip() |
45 | 49 | ||