Merge branch 'master' of github.com:stump/fofix

stump · Nov 21, 2010 · 7519c46 · 7519c46
2 parents 6af3604 + 49daabd
commit 7519c46
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 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)
 
@@ -379,8 +381,10 @@ def renderNeckMethod(self, visibility, offset, neck, alpha = False): #blazingame
 
     def project(beat):
       return 0.125 * beat / self.beatsPerUnit    # glorandwarf: was 0.12
-
-    color = self.engine.theme.spNoteColor #self.spColor #(.3,.7,.9)
+    if self.instrument.starPowerActive and (self.theme == 0 or self.theme == 1):#8bit
+      color = self.engine.theme.spNoteColor #self.spColor #(.3,.7,.9)
+    else:
+      color = (1,1,1)
 
     v            = visibility
     l            = self.boardLength
@@ -401,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)
 
@@ -579,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("_")