Skip to content

Commit

Permalink
move hitlightning to the bottom so it will be above all the other flames
Browse files Browse the repository at this point in the history
  • Loading branch information
mdsitton committed Jun 12, 2011
1 parent 02c7a64 commit 694da6f
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions src/Instrument.py
Expand Up @@ -901,13 +901,6 @@ def renderFlames(self, song, pos, controls):
scaleMod = .6 * ms * ff

for step in range(4):
#draw lightning in GH themes on SP gain
if step == 0 and event.finalStar and self.spEnabled and self.hitlightning:
self.engine.draw3Dtex(self.hitlightning, coord = (xlightning, ff / 6, 3.3), rot = (90, 1, 0, 0),
scale = (.15 + .5 * ms * ff, event.flameCount / 3.0 + .6 * ms * ff, 2), vertex = (.4,-2,-.4,2),
texcoord = (0.0,0.0,1.0,1.0), multiples = True, alpha = True, color = (1,1,1))
continue

if step == 0:
yzscaleMod = event.flameCount/ scaleChange[step]
else:
Expand All @@ -919,6 +912,12 @@ def renderFlames(self, song, pos, controls):
vertex = (-vtx,-vtx,vtx,vtx), texcoord = (0.0,0.0,1.0,1.0),
multiples = True, alpha = True, color = flameColor)

#draw lightning in GH themes on SP gain
if step == 0 and event.finalStar and self.spEnabled and self.hitlightning:
self.engine.draw3Dtex(self.hitlightning, coord = (xlightning, ff / 6, 3.3), rot = (90, 1, 0, 0),
scale = (.15 + .5 * ms * ff, event.flameCount / 3.0 + .6 * ms * ff, 2), vertex = (.4,-2,-.4,2),
texcoord = (0.0,0.0,1.0,1.0), multiples = True, alpha = True, color = (1,1,1))

event.flameCount += 1

def renderNote(self, length, sustain, color, tailOnly = False, isTappable = False, fret = 0, spNote = False, isOpen = False, spAct = False):
Expand Down

0 comments on commit 694da6f

Please sign in to comment.