Petit hack pour afficher la vidéo de la kinect dans l'écran de jeu.

[minwii.git] / src / minwii / widgets / playingscreen.py

diff --git a/src/minwii/widgets/playingscreen.py b/src/minwii/widgets/playingscreen.py
index b1dbe80..5829a4e 100755 (executable)
--- a/src/minwii/widgets/playingscreen.py
+++ b/src/minwii/widgets/playingscreen.py
@@ -9,6 +9,8 @@ $URL$
 import pygame
 import types
 
 import pygame
 import types
 

+import kinect.pygamedisplay as kinect
+

 import minwii.events as events
 from minwii.log import eventLogger
 from minwii.eventutils import event_handler, EventDispatcher, EventHandlerMixin
 import minwii.events as events
 from minwii.log import eventLogger
 from minwii.eventutils import event_handler, EventDispatcher, EventHandlerMixin


@@ -27,7 +29,7 @@ from column import Column
 
 class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
 
 class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 

-    def __init__(self, synth, distinctNotes=[]) :
+    def __init__(self, synth, distinctNotes=[], displayNotes=True) :

         """
         distinctNotes : notes disctinctes présentes dans la chanson
         triées du plus grave au plus aigu.
         """
         distinctNotes : notes disctinctes présentes dans la chanson
         triées du plus grave au plus aigu.


@@ -35,6 +37,7 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         super(PlayingScreenBase, self).__init__()
         self.synth = synth
         self.distinctNotes = distinctNotes
         super(PlayingScreenBase, self).__init__()
         self.synth = synth
         self.distinctNotes = distinctNotes

+        self.displayNotes = displayNotes

         self.keyboardLength = 0
         self.keyboardRects = []
         self.cursor = None
         self.keyboardLength = 0
         self.keyboardRects = []
         self.cursor = None


@@ -43,7 +46,10 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         self._initColumns()
         self._running = False
         self.draw(pygame.display.get_surface())
         self._initColumns()
         self._running = False
         self.draw(pygame.display.get_surface())

-        self._initCursor()    
+        self._initCursor()
+        
+        self.kinectRgb = kinect.RGB()
+        self.kinectRgbSur = pygame.Surface((640, 480))

     
     def _initRects(self) :
         """ création des espaces réservés pour
     
     def _initRects(self) :
         """ création des espaces réservés pour


@@ -77,7 +83,7 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
             tone = self.distinctNotes[i]
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
             tone = self.distinctNotes[i]

-            c = Column(self, i, hue, rect, tone)
+            c = Column(self, i, hue, rect, tone, displayNote=self.displayNotes)

             self.add(c, layer=BACKGROUND_LAYER)
             self.columns[tone.midi] = c
         
             self.add(c, layer=BACKGROUND_LAYER)
             self.columns[tone.midi] = c
         


@@ -95,6 +101,14 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
             EventDispatcher.dispatchEvents()
             dirty = self.draw(pygame.display.get_surface())
             pygame.display.update(dirty)
             EventDispatcher.dispatchEvents()
             dirty = self.draw(pygame.display.get_surface())
             pygame.display.update(dirty)

+            
+            self.kinectRgb.update()
+            rgbImg = self.kinectRgb.capture()
+            self.kinectRgbSur.blit(rgbImg, (0, 0))
+            screen = pygame.display.get_surface()
+            screen.blit(pygame.transform.flip(self.kinectRgbSur, True, False), (0, 0))
+            pygame.display.flip()
+            

             clock.tick(FRAMERATE)
     
     def stop(self) :
             clock.tick(FRAMERATE)
     
     def stop(self) :


@@ -105,9 +119,8 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :

-        if event.key == pygame.K_q or \
-            event.unicode == u'q' or \
-            pygame.K_ESCAPE:
+        if event.key in (pygame.K_q, pygame.K_ESCAPE) or \
+            event.unicode == u'q' :

             self.stop()
     
     @event_handler(pygame.MOUSEBUTTONDOWN)
             self.stop()
     
     @event_handler(pygame.MOUSEBUTTONDOWN)


@@ -166,14 +179,14 @@ class PlayingScreen(PlayingScreenBase) :
     
     scale = [55, 57, 59, 60, 62, 64, 65, 67, 69, 71, 72]
 
     
     scale = [55, 57, 59, 60, 62, 64, 65, 67, 69, 71, 72]
 

-    def __init__(self, synth) :
+    def __init__(self, synth, displayNotes=True) :

         distinctNotes = []
         self.currentColumn = None
         for midi in self.scale :
             tone = Tone(midi)
             distinctNotes.append(tone)
         
         distinctNotes = []
         self.currentColumn = None
         for midi in self.scale :
             tone = Tone(midi)
             distinctNotes.append(tone)
         

-        super(PlayingScreen, self).__init__(synth, distinctNotes)
+        super(PlayingScreen, self).__init__(synth, distinctNotes, displayNotes=displayNotes)

             
     @event_handler(events.COLDOWN)
     def noteon(self, event) :
             
     @event_handler(events.COLDOWN)
     def noteon(self, event) :


@@ -191,8 +204,8 @@ class PlayingScreen(PlayingScreenBase) :
 
 class SongPlayingScreen(PlayingScreenBase) :
     
 
 class SongPlayingScreen(PlayingScreenBase) :
     

-    def __init__(self, synth, song, mode=PLAYING_MODES_DICT['NORMAL'], tempoTrim=0) :
-        super(SongPlayingScreen, self).__init__(synth, song.distinctNotes)
+    def __init__(self, synth, song, mode=PLAYING_MODES_DICT['NORMAL'], displayNotes=True, tempoTrim=0) :
+        super(SongPlayingScreen, self).__init__(synth, song.distinctNotes, displayNotes=displayNotes)

         self.song = song
         self.quarterNoteDuration = song.quarterNoteDuration
         self.tempoTrim = tempoTrim
         self.song = song
         self.quarterNoteDuration = song.quarterNoteDuration
         self.tempoTrim = tempoTrim


@@ -322,6 +335,9 @@ class SongPlayingScreen(PlayingScreenBase) :
     def setNoteTimeout(self) :
         delay = self.currentNote.duration * self.quarterNoteDuration
         delay = delay + delay * self.tempoTrim
     def setNoteTimeout(self) :
         delay = self.currentNote.duration * self.quarterNoteDuration
         delay = delay + delay * self.tempoTrim

+        delay = int(delay)
+        if delay < 1 :
+            delay = 1 # durée minimale, car 0 désactiverait le timer.

         pygame.time.set_timer(events.NOTEEND, delay)
     
     def tempoTrimUp(self, step=0.1) :
         pygame.time.set_timer(events.NOTEEND, delay)
     
     def tempoTrimUp(self, step=0.1) :