X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/a4026ac6cb2afe5804ca826f7e8fa04254d36d46..3349512a69489bc7679799d05f21fb11abaec90d:/src/app/widgets/playingscreen.py diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py index 2fad9c2..67039e7 100755 --- a/src/app/widgets/playingscreen.py +++ b/src/app/widgets/playingscreen.py @@ -15,22 +15,22 @@ import types from musicxml import Tone from config import FRAMERATE -from config import BORDER from config import FIRST_HUE -from config import DEFAULT_MIDI_VELOCITY +from config import MIDI_VELOCITY_RANGE +from config import MIDI_PAN_RANGE from globals import BACKGROUND_LAYER from globals import CURSOR_LAYER from globals import PLAYING_MODES_DICT -class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : +class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : def __init__(self, synth, distinctNotes=[]) : """ distinctNotes : notes disctinctes présentes dans la chanson triées du plus grave au plus aigu. """ - super(_PlayingScreenBase, self).__init__() + super(PlayingScreenBase, self).__init__() self.synth = synth self.distinctNotes = distinctNotes self.keyboardLength = 0 @@ -47,24 +47,18 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : """ création des espaces réservés pour afficher les colonnes. """ - #ambitus = self.distinctNotes[-1].midi - self.distinctNotes[0].midi - #if ambitus <= 12 : - # self.keyboardLength = 8 - #else : - # self.keyboardLength = 11 self.keyboardLength = len(self.distinctNotes) screen = pygame.display.get_surface() - # taille de la zone d'affichage utile (bordure autour) - dispWidth = screen.get_width() - 2 * BORDER - dispHeight = screen.get_height() - 2 * BORDER + self.dispWidth = dispWidth = screen.get_width() + self.dispHeight = dispHeight = screen.get_height() columnWidth = int(round(float(dispWidth) / self.keyboardLength)) rects = [] for i in range(self.keyboardLength) : - upperLeftCorner = (i*columnWidth + BORDER, BORDER) + upperLeftCorner = (i*columnWidth, 0) rect = pygame.Rect(upperLeftCorner, (columnWidth, dispHeight)) rects.append(rect) @@ -76,7 +70,7 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : for i, rect in enumerate(self.keyboardRects) : hue = FIRST_HUE - hueStep * i tone = self.distinctNotes[i] - c = Column(self, hue, rect, tone) + c = Column(self, i, hue, rect, tone) self.add(c, layer=BACKGROUND_LAYER) self.columns[tone.midi] = c @@ -94,7 +88,7 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : EventDispatcher.dispatchEvents() dirty = self.draw(pygame.display.get_surface()) pygame.display.update(dirty) - clock.tick(FRAMERATE) + clock.tick() def stop(self) : self._running = False @@ -113,37 +107,47 @@ 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) + self.raiseColDown(col, event.pos) 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) + self.raiseColUp(col, event.pos) 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) + self.raiseColOver(col, event.pos) break - def raiseColDown(self, col) : - evt = pygame.event.Event(events.COLDOWN, column=col) + def raiseColDown(self, col, pos) : + evt = pygame.event.Event(events.COLDOWN, column=col, pos=pos) pygame.event.post(evt) - def raiseColUp(self, col) : - evt = pygame.event.Event(events.COLUP, column=col) + def raiseColUp(self, col, pos) : + evt = pygame.event.Event(events.COLUP, column=col, pos=pos) pygame.event.post(evt) - def raiseColOver(self, col) : - evt = pygame.event.Event(events.COLOVER, column=col) + def raiseColOver(self, col, pos) : + evt = pygame.event.Event(events.COLOVER, column=col, pos=pos) pygame.event.post(evt) + + def getVelocity(self, pos) : + vel = (float(self.dispWidth) - pos[1]) / self.dispWidth + vel = int(vel * (MIDI_VELOCITY_RANGE[1] - MIDI_VELOCITY_RANGE[0])) + MIDI_VELOCITY_RANGE[0] + return vel + + def getPan(self, index) : + pan = float(index) / (self.keyboardLength -1) + pan = int(pan * (MIDI_PAN_RANGE[1] - MIDI_PAN_RANGE[0])) + MIDI_PAN_RANGE[0] + return pan -class PlayingScreen(_PlayingScreenBase) : +class PlayingScreen(PlayingScreenBase) : "fenêtre de jeu pour improvisation" scale = [55, 57, 59, 60, 62, 64, 65, 67, 69, 71, 72] @@ -159,7 +163,7 @@ class PlayingScreen(_PlayingScreenBase) : @event_handler(events.NOTEON) def noteon(self, evt) : tone = evt.tone - self.synth.noteon(0, tone.midi, DEFAULT_MIDI_VELOCITY) + self.synth.noteon(0, tone.midi, 96) @event_handler(events.NOTEOFF) def noteoff(self, evt) : @@ -167,7 +171,7 @@ class PlayingScreen(_PlayingScreenBase) : self.synth.noteoff(0, tone.midi) -class SongPlayingScreen(_PlayingScreenBase) : +class SongPlayingScreen(PlayingScreenBase) : def __init__(self, synth, song, mode=PLAYING_MODES_DICT['EASY']) : super(SongPlayingScreen, self).__init__(synth, song.distinctNotes) @@ -197,7 +201,10 @@ class SongPlayingScreen(_PlayingScreenBase) : def handleColumnDown(self, event) : col = event.column if col.state: - self.synth.noteon(0, col.tone.midi, DEFAULT_MIDI_VELOCITY) + 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) : @@ -208,7 +215,10 @@ class SongPlayingScreen(_PlayingScreenBase) : def handleColumnOver(self, event) : col = event.column if col.state and not self.currentNotePlayed : - self.synth.noteon(0, col.tone.midi, DEFAULT_MIDI_VELOCITY) + 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) @@ -228,4 +238,5 @@ class SongPlayingScreen(_PlayingScreenBase) : def stop(self) : pygame.time.set_timer(events.NOTEEND, 0) super(SongPlayingScreen, self).stop() - + + \ No newline at end of file