From 3bfc5680146bb78d70a4f98ecddbcbbb65db8cbf Mon Sep 17 00:00:00 2001 From: fuzion Date: Tue, 27 Jul 2010 00:53:40 -0500 Subject: [PATCH] Neck solo lightning shader color option --- src/Neck.py | 4 +++- src/Theme.py | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Neck.py b/src/Neck.py index 6583dac33..6c38804e9 100644 --- a/src/Neck.py +++ b/src/Neck.py @@ -60,6 +60,8 @@ def __init__(self, engine, instrument, playerObj): self.boardWidth = self.engine.theme.neckWidth self.boardLength = self.engine.theme.neckLength + self.shaderSolocolor = self.engine.theme.shaderSolocolor + #death_au: fixed neck size if self.isDrum and self.engine.config.get("game", "large_drum_neck"): @@ -609,7 +611,7 @@ def renderNeck(self, visibility, song, pos): self.renderNeckMethod(self.failcount, 0, self.failNeck) if (self.guitarSolo or self.instrument.starPowerActive) and self.theme == 1: - shaders.var["solocolor"]=(0.3,0.7,0.9,0.6) + shaders.var["solocolor"]=self.shaderSolocolor else: shaders.var["solocolor"]=(0.0,)*4 diff --git a/src/Theme.py b/src/Theme.py index e24aa60ce..26370587a 100644 --- a/src/Theme.py +++ b/src/Theme.py @@ -467,6 +467,7 @@ defaultDict['neckLength'] = 9.0 defaultDict['neck_prompt_x'] = .1 defaultDict['neck_prompt_y'] = .05 +defaultDict['shaderSolocolor'] = (0.3,0.7,0.9,0.6) #Setlist defaultDict['songListDisplay'] = 1 @@ -853,6 +854,8 @@ def __init__(self, path, name): self.neckLength = config.get("theme", "neck_length") self.neck_prompt_x = config.get("theme", "menu_neck_choose_x") self.neck_prompt_y = config.get("theme", "menu_neck_choose_y") + + self.shaderSolocolor = config.get("theme", "shader_solocolor") #Setlist self.songListDisplay = config.get("theme", "song_list_display")