diff --git a/src/Neck.py b/src/Neck.py index 38f61f2a6..59b432dbf 100644 --- a/src/Neck.py +++ b/src/Neck.py @@ -63,7 +63,7 @@ def __init__(self, engine, instrument, playerObj): self.boardLength = self.engine.theme.neckLength self.shaderSolocolor = self.engine.theme.shaderSolocolor - self.boardFadeAmmount = self.engine.theme.boardFade + self.boardFadeAmount = self.engine.theme.boardFade #death_au: fixed neck size @@ -83,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/self.boardFadeAmmount], - [color[0],color[1],color[2], self.vis/self.boardFadeAmmount], + [color[0],color[1],color[2], self.vis/self.boardFadeAmount], + [color[0],color[1],color[2], self.vis/self.boardFadeAmount], [color[0],color[1],color[2], 0], [color[0],color[1],color[2], 0]], dtype=np.float32) @@ -405,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/self.boardFadeAmmount], - [color[0],color[1],color[2], v/self.boardFadeAmmount], + [color[0],color[1],color[2], v/self.boardFadeAmount], + [color[0],color[1],color[2], v/self.boardFadeAmount], [color[0],color[1],color[2], 0], [color[0],color[1],color[2], 0]], dtype=np.float32) @@ -583,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/self.boardFadeAmmount], - [color[0],color[1],color[2], v/self.boardFadeAmmount], + [color[0],color[1],color[2], v/self.boardFadeAmount], + [color[0],color[1],color[2], v/self.boardFadeAmount], [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 index 8788b478d..c699c4008 100644 --- a/src/Theme.py +++ b/src/Theme.py @@ -158,7 +158,7 @@ def get(value, type = str, default = None): 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)) + self.boardFade = (get("fretboard_fade_amount", float, 1)) #Loading phrases self.loadingPhrase = get("loading_phrase", str, "Let's get this show on the Road_Impress the Crowd_" +