Skip to content

Commit

Permalink
Implement separate hitflamesanimation image for when Starpower/Overdr…
Browse files Browse the repository at this point in the history
…ive is activated.
  • Loading branch information
mdsitton committed Jun 17, 2011
1 parent 20e0c6b commit 6887c2e
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/Instrument.py
Expand Up @@ -392,6 +392,8 @@ def loadFlames(self):

if not engine.loadImgDrawing(self, "hitflamesAnim", os.path.join("themes",themename,"hitflamesanimation.png"), textureSize = (128, 128)):
self.Hitanim2 = False

engine.loadImgDrawing(self, "powerHitflamesAnim", os.path.join("themes",themename,"powerhitflamesanimation.png"), textureSize = (128, 128))

if not engine.loadImgDrawing(self, "hitglowAnim", os.path.join("themes",themename,"hitglowanimation.png"), textureSize = (128, 128)):
self.Hitanim = False
Expand Down Expand Up @@ -880,8 +882,12 @@ def renderFlames(self, song, pos, controls):
HIndex = 0

texX = (HIndex*(1.0/self.HFrameLimit2), HIndex*(1.0/self.HFrameLimit2)+(1.0/self.HFrameLimit2))
if self.powerHitflamesAnim and self.starPowerActive.
texture = self.powerHitflamesAnim
else:
texture = self.hitflamesAnim

self.engine.draw3Dtex(self.hitflamesAnim, coord = (x, y + .665, 0), rot = (90, 1, 0, 0), scale = (1.6, 1.6, 4.9),
self.engine.draw3Dtex(texture, coord = (x, y + .665, 0), rot = (90, 1, 0, 0), scale = (1.6, 1.6, 4.9),
vertex = (-vtx,-vtx,vtx,vtx), texcoord = (texX[0],0.0,texX[1],1.0),
multiples = True, alpha = True, color = (1,1,1))
self.HCountAni = True
Expand Down

0 comments on commit 6887c2e

Please sign in to comment.