Themeable fretboard fade

stump · Nov 21, 2010 · 49daabd · 49daabd
1 parent cdc3669
commit 49daabd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/Neck.py b/src/Neck.py
@@ -63,6 +63,8 @@ def __init__(self, engine, instrument, playerObj):
     self.boardLength    = self.engine.theme.neckLength
     self.shaderSolocolor    = self.engine.theme.shaderSolocolor
 
+    self.boardFadeAmmount = self.engine.theme.boardFade
+
     #death_au: fixed neck size
 
     if self.isDrum and self.engine.config.get("game", "large_drum_neck"):
@@ -81,8 +83,8 @@ def __init__(self, engine, instrument, playerObj):
                              [color[0],color[1],color[2], 0],
                              [color[0],color[1],color[2], self.vis],
                              [color[0],color[1],color[2], self.vis],
-                             [color[0],color[1],color[2], self.vis],
-                             [color[0],color[1],color[2], self.vis],
+                             [color[0],color[1],color[2], self.vis/self.boardFadeAmmount],
+                             [color[0],color[1],color[2], self.vis/self.boardFadeAmmount],
                              [color[0],color[1],color[2], 0],
                              [color[0],color[1],color[2], 0]], dtype=np.float32)
 
@@ -403,8 +405,8 @@ def project(beat):
                              [color[0],color[1],color[2], 0],
                              [color[0],color[1],color[2], v],
                              [color[0],color[1],color[2], v],
-                             [color[0],color[1],color[2], v],
-                             [color[0],color[1],color[2], v],
+                             [color[0],color[1],color[2], v/self.boardFadeAmmount],
+                             [color[0],color[1],color[2], v/self.boardFadeAmmount],
                              [color[0],color[1],color[2], 0],
                              [color[0],color[1],color[2], 0]], dtype=np.float32)
 
@@ -581,8 +583,8 @@ def project(beat):
                          [color[0],color[1],color[2], v],
                          [color[0],color[1],color[2], v],
                          [color[0],color[1],color[2], v],
-                         [color[0],color[1],color[2], v],
-                         [color[0],color[1],color[2], v],
+                         [color[0],color[1],color[2], v/self.boardFadeAmmount],
+                         [color[0],color[1],color[2], v/self.boardFadeAmmount],
                          [color[0],color[1],color[2], 0],
                          [color[0],color[1],color[2], 0]], dtype=np.float32)
       cmgl.drawArrays(GL_TRIANGLE_STRIP, vertices=track_vtx, colors=track_col, texcoords=track_tex)

diff --git a/src/Theme.py b/src/Theme.py
@@ -157,6 +157,9 @@ def get(value, type = str, default = None):
       self.povTarget  = (get("pov_target_x", float), get("pov_target_y", float), get("pov_target_z", float))
       self.povOrigin  = (get("pov_origin_x", float), get("pov_origin_y", float), get("pov_origin_z", float))
 
+      #Fade settings for fretboard
+      self.boardFade = (get("fretboard_fade_ammount", float, 1))
+
       #Loading phrases
       self.loadingPhrase = get("loading_phrase", str, "Let's get this show on the Road_Impress the Crowd_" + 
                                                       "Don't forget to strum!_Rock the house!_Jurgen is watching").split("_")