From 8a421d33328f7dd6d6bff38cc04f53cdf25de3a9 Mon Sep 17 00:00:00 2001 From: pin Date: Mon, 17 May 2010 15:51:28 +0000 Subject: [PATCH] =?utf8?q?impl=C3=A9mentation=20de=20tous=20les=20modes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@167 fe552daf-6dbe-4428-90eb-1537e0879342 --- src/app/config.py | 1 + src/app/widgets/home.py | 2 +- src/app/widgets/playingscreen.py | 130 +++++++++++++++++++++---------- 3 files changed, 90 insertions(+), 43 deletions(-) diff --git a/src/app/config.py b/src/app/config.py index d8bdd6c..f98238b 100755 --- a/src/app/config.py +++ b/src/app/config.py @@ -36,6 +36,7 @@ LYRICS_FONT = pygame.font.Font(None, 80) FONT_COLOR = (0,0,0) MIDI_VELOCITY_RANGE = (64, 127) MIDI_PAN_RANGE = (32, 96) +MIDI_VELOCITY_WRONG_NOTE_ATTN = 0.5 SONG_FILE_PATH = _computePath('../../chansons') diff --git a/src/app/widgets/home.py b/src/app/widgets/home.py index 44d96fe..afd84ec 100755 --- a/src/app/widgets/home.py +++ b/src/app/widgets/home.py @@ -56,7 +56,7 @@ class Home(Table) : # choix du niveau self.tr() self.td(self.createLabel("Niveau :")) - self.modeSelect = Select('EASY') + self.modeSelect = Select('NORMAL') for k, caption in PLAYING_MODES : self.modeSelect.add(self.createLabel(caption), k) self.td(self.modeSelect,colspan=3) diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py index 75f68fd..77a17a7 100755 --- a/src/app/widgets/playingscreen.py +++ b/src/app/widgets/playingscreen.py @@ -18,6 +18,7 @@ from config import FRAMERATE from config import FIRST_HUE from config import MIDI_VELOCITY_RANGE from config import MIDI_PAN_RANGE +from config import MIDI_VELOCITY_WRONG_NOTE_ATTN from globals import BACKGROUND_LAYER from globals import CURSOR_LAYER @@ -98,7 +99,7 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : @event_handler(pygame.KEYDOWN) def handleKeyDown(self, event) : - if event.key == pygame.K_q: + if event.key == pygame.K_q or event.unicode == u'q': self.stop() @event_handler(pygame.MOUSEBUTTONDOWN) @@ -107,33 +108,33 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : # parce qu'il s'agit du curseur for col in reversed(self.sprites()[:-1]) : if col.rect.collidepoint(*event.pos): - self.raiseColDown(col, event.pos) + self.raiseColDown(col, event) break @event_handler(pygame.MOUSEBUTTONUP) def onMouseUp(self, event) : for col in reversed(self.sprites()[:-1]) : if col.rect.collidepoint(*event.pos) : - self.raiseColUp(col, event.pos) + self.raiseColUp(col, event) break @event_handler(pygame.MOUSEMOTION) def onMouseMove(self, event) : for col in reversed(self.sprites()[:-1]) : if col.rect.collidepoint(*event.pos) : - self.raiseColOver(col, event.pos) + self.raiseColOver(col, event) break - def raiseColDown(self, col, pos) : - evt = pygame.event.Event(events.COLDOWN, column=col, pos=pos) + def raiseColDown(self, col, mouseEvent) : + evt = pygame.event.Event(events.COLDOWN, column=col, pos=mouseEvent.pos) pygame.event.post(evt) - def raiseColUp(self, col, pos) : - evt = pygame.event.Event(events.COLUP, column=col, pos=pos) + def raiseColUp(self, col, mouseEvent) : + evt = pygame.event.Event(events.COLUP, column=col, pos=mouseEvent.pos) pygame.event.post(evt) - def raiseColOver(self, col, pos) : - evt = pygame.event.Event(events.COLOVER, column=col, pos=pos) + def raiseColOver(self, col, mouseEvent) : + evt = pygame.event.Event(events.COLOVER, column=col, pos=mouseEvent.pos, mouseEvent=mouseEvent) pygame.event.post(evt) def getVelocity(self, pos) : @@ -145,7 +146,12 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : pan = float(index) / (self.keyboardLength -1) pan = int(pan * (MIDI_PAN_RANGE[1] - MIDI_PAN_RANGE[0])) + MIDI_PAN_RANGE[0] return pan - + + def playnote(self, col, pos, vel=None) : + pan = self.getPan(col.index) + self.synth.cc(0, 10, pan) + vel = vel or self.getVelocity(pos) + self.synth.noteon(0, col.tone.midi, vel) class PlayingScreen(PlayingScreenBase) : "fenêtre de jeu pour improvisation" @@ -173,20 +179,87 @@ class PlayingScreen(PlayingScreenBase) : class SongPlayingScreen(PlayingScreenBase) : - def __init__(self, synth, song, mode=PLAYING_MODES_DICT['EASY']) : + def __init__(self, synth, song, mode=PLAYING_MODES_DICT['NORMAL']) : super(SongPlayingScreen, self).__init__(synth, song.distinctNotes) self.song = song self.quarterNoteDuration = song.quarterNoteDuration self.currentColumn = None self.noteIterator = self.song.iterNotes() self.displayNext() - if mode == PLAYING_MODES_DICT['NORMAL'] : + self._plugListeners(mode) + + def _plugListeners(self, mode) : + "initialisation des gestionnaires d'événements en fonction du mode" + + if mode == PLAYING_MODES_DICT['EASY'] : + EventDispatcher.addEventListener(events.COLOVER, self.handleEasyColumnOver) + + elif mode == PLAYING_MODES_DICT['NORMAL'] : + EventDispatcher.addEventListener(events.COLOVER, self.handleNormalColumnOver) + EventDispatcher.addEventListener(events.COLDOWN, self.handleColumnDown) + EventDispatcher.addEventListener(events.COLUP, self.handleColumnUp) + + elif mode == PLAYING_MODES_DICT['ADVANCED'] : EventDispatcher.addEventListener(events.COLDOWN, self.handleColumnDown) EventDispatcher.addEventListener(events.COLUP, self.handleColumnUp) - elif mode == PLAYING_MODES_DICT['EASY'] : - EventDispatcher.addEventListener(events.COLOVER, self.handleColumnOver) + + elif mode == PLAYING_MODES_DICT['EXPERT'] : + EventDispatcher.addEventListener(events.COLDOWN, self.handleExpertColumnDown) + EventDispatcher.addEventListener(events.COLUP, self.handleExpertColumnUp) + + # --- HID listeners --- + def handleEasyColumnOver(self, event) : + col = event.column + if col.state and not self.currentNotePlayed : + self.playnote(col, event.pos) + SongPlayingScreen.setNoteTimeout( + int(self.currentNote.duration * \ + self.quarterNoteDuration) + ) + self.currentNotePlayed = True + def handleNormalColumnOver(self, event) : + col = event.column + if col.state and \ + any(event.mouseEvent.buttons) and \ + not self.currentNotePlayed : + self.playnote(col, event.pos) + self.currentNotePlayed = True + + def handleColumnDown(self, event) : + col = event.column + if col.state: + self.playnote(col, event.pos) + self.currentNotePlayed = True + + def handleExpertColumnDown(self, event) : + col = event.column + if col.state : + self.playnote(col, event.pos) + self.currentNotePlayed = True + else : + vel = self.getVelocity(event.pos) * MIDI_VELOCITY_WRONG_NOTE_ATTN + vel = int(vel) + self.playnote(col, event.pos, vel=vel) + self.alternateColumn = col + self.currentNotePlayed = False + + def handleColumnUp(self, event) : + if self.currentNotePlayed : + self.synth.noteoff(0, self.currentColumn.tone.midi) + self.displayNext() + + def handleExpertColumnUp(self, event) : + if self.currentNotePlayed : + self.synth.noteoff(0, self.currentColumn.tone.midi) + self.displayNext() + else : + self.synth.noteoff(0, self.alternateColumn.tone.midi) + + # --- End HID listeners --- + + def displayNext(self, event=None) : if self.currentColumn: self.currentColumn.update(False) @@ -198,33 +271,6 @@ class SongPlayingScreen(PlayingScreenBase) : self.currentNote = note self.currentNotePlayed = False - def handleColumnDown(self, event) : - col = event.column - if col.state: - pan = self.getPan(col.index) - self.synth.cc(0, 10, pan) - vel = self.getVelocity(event.pos) - self.synth.noteon(0, col.tone.midi, vel) - self.currentNotePlayed = True - - def handleColumnUp(self, event) : - if self.currentNotePlayed : - self.synth.noteoff(0, self.currentColumn.tone.midi) - self.displayNext() - - def handleColumnOver(self, event) : - col = event.column - if col.state and not self.currentNotePlayed : - pan = self.getPan(col.index) - self.synth.cc(0, 10, pan) - vel = self.getVelocity(event.pos) - self.synth.noteon(0, col.tone.midi, vel) - SongPlayingScreen.setNoteTimeout( - int(self.currentNote.duration * \ - self.quarterNoteDuration) - ) - self.currentNotePlayed = True - @event_handler(events.NOTEEND) def clearTimeOutAndDisplayNext(self, evt) : pygame.time.set_timer(evt.type, 0) -- 2.20.1