Création d'une classe Tone dont hérite Note.

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

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index cf4b0ae..f881433 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -13,19 +13,18 @@ from cursors import WarpingCursor
 from eventutils import event_handler, EventDispatcher, EventHandlerMixin
 from math import floor
 import types
 from eventutils import event_handler, EventDispatcher, EventHandlerMixin
 from math import floor
 import types

-# TODO : positionner cette constance en fonction de la résolution d'affichage
-# externaliser la conf.
-BORDER = 0 # 5px
-FIRST_HUE = 0.6
-OFF_LUMINANCE = 0.2
-OFF_SATURATION = 1
-ON_TOP_LUMINANCE = 0.6
-ON_BOTTOM_LUMINANCE = 0.9
-ON_SATURATION = 1
-ON_COLUMN_OVERSIZING = 2

 
 

+from config import BORDER
+from config import FIRST_HUE
+from config import OFF_LUMINANCE
+from config import OFF_SATURATION
+from config import ON_TOP_LUMINANCE
+from config import ON_BOTTOM_LUMINANCE
+from config import ON_SATURATION
+from config import ON_COLUMN_OVERSIZING

 
 

-class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) :
+
+class _PlayingScreenBase(pygame.sprite.LayeredUpdates, EventHandlerMixin) :

 
     def __init__(self, distinctNotes=[]) :
         """
 
     def __init__(self, distinctNotes=[]) :
         """


@@ -77,11 +76,11 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) :
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
             c = Column(hue, rect)
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
             c = Column(hue, rect)

-            self.add(c)
+            self.add(c, layer=0)

     
     def _initCursor(self) :
         self.cursor = WarpingCursor(blinkMode=True)
     
     def _initCursor(self) :
         self.cursor = WarpingCursor(blinkMode=True)

-        self.add(self.cursor)
+        self.add(self.cursor, layer=2)

         
         
     def highlightColumn(self, index) :
         
         
     def highlightColumn(self, index) :


@@ -141,8 +140,10 @@ class Column(pygame.sprite.Sprite, EventHandlerMixin) :
         
         topRgba = hls_to_rgba_8bits(hue, ON_TOP_LUMINANCE, ON_SATURATION)
         bottomRgba = hls_to_rgba_8bits(hue, ON_BOTTOM_LUMINANCE, ON_SATURATION)
         
         topRgba = hls_to_rgba_8bits(hue, ON_TOP_LUMINANCE, ON_SATURATION)
         bottomRgba = hls_to_rgba_8bits(hue, ON_BOTTOM_LUMINANCE, ON_SATURATION)

-        rectOn = pygame.Rect((rect.left - rect.width/2, 0),
-                             (rect.width * ON_COLUMN_OVERSIZING, rect.height))
+        onWidth = rect.width * ON_COLUMN_OVERSIZING
+        onLeft = rect.centerx - onWidth / 2
+        rectOn = pygame.Rect((onLeft, 0),
+                             (onWidth, rect.height))

         self.stateOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)
         self.rectOn = rectOn
         
         self.stateOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)
         self.rectOn = rectOn
         


@@ -150,10 +151,13 @@ class Column(pygame.sprite.Sprite, EventHandlerMixin) :
         self.rect = rect
     
     def update(self, state) :
         self.rect = rect
     
     def update(self, state) :

+        group = self.groups()[0]

         if state :
         if state :

+            group.change_layer(self, 1)

             self.image = self.stateOn
             self.rect = self.rectOn
         else :
             self.image = self.stateOn
             self.rect = self.rectOn
         else :

+            group.change_layer(self, 0)

             self.image = self.stateOff
             self.rect = self.rectOff
     
             self.image = self.stateOff
             self.rect = self.rectOff