Merge branch 'master' into menu-edits

data/themes/MegaLight V4/rockmeter.ini

@@ -7,14 +7,6 @@ inPixels = xscale|yscale
 valignment = bottom
 rect = (1.0/3.0, 2.0/3.0, 1.0-rock, 1.0)
 
-[layer0:fx0:Slide]
-startX = -50
-endX = 15
-startY = .1
-endY = .1
-transitionTime = 1000.0
-inPixels = startX|endX
-
 [layer1:Image]
 texture = bar.png
 yscale = 270
@@ -23,100 +15,90 @@ inPixels = xscale|yscale
 valignment = bottom
 rect = (0.0, 1.0/3.0, 0.0, 1.0)
 
-[layer1:fx0:Slide]
-startX = -50
-endX = 15
-startY = .1
-endY = .1
-transitionTime = 1000.0
-inPixels = startX|endX
-
 [layer2:Image]
 texture = bar.png
+xpos = 25
 yscale = 220
 xscale = 100
-inPixels = xscale|yscale
+inPixels = xscale|yscale|xpos
 valignment = bottom
 rect = (2.0/3.0, 1.0, 1.0-power, 1.0)
 
-[layer2:fx0:Slide]
-startX = -25
-endX = 40
-startY = .1
-endY = .1
-transitionTime = 1000.0
-inPixels = startX|endX
-
 [layer3:Image]
 texture = bar.png
+xpos = 25
 yscale = 220
 xscale = 100
-inPixels = xscale|yscale
+inPixels = xscale|yscale|xpos
 valignment = bottom
 rect = (0.0, 1.0/3.0, 0.0, 1.0)
 
-[layer3:fx0:Slide]
-startX = -25
-endX = 40
+[Group0]
+layers = 0,1,2,3
+
+[Group0:fx0:Slide]
+startX = -50
+endX = 15
 startY = .1
 endY = .1
 transitionTime = 1000.0
 inPixels = startX|endX
-
+condition = self.stage.layerGroups[2].position[1] >= .05
 
 ####SCORE GRAPHICS####
 [layer4:Text]
 font = scoreFont
 text = "%07i" % score
 alignment = right
 xpos = .25
-ypos = .05
 color = #999999
 outline = True
 
 [layer5:Image]
 texture = hud.png
 alignment = left
-xpos = 0
-ypos = .05
 
 [layer6:Text]
 font = scoreFont
 text = score
 alignment = right
 xpos = .25
-ypos = .05
 
 [layer7:Text]
 font = scoreFont
 text = "Score"
 alignment = left
 xpos = .025
-ypos = .05
 
-#####################
+[Group2]
+layers = 4,5,6,7,12,13,14,15
 
-#Stars
+[Group2:fx0:Slide]
+startX = 0
+endX = 0
+startY = -.15
+endY = .05
+transitionTime = 1400.0
+condition = self.stage.scene.countdownOK
+
+####STAR GRAPHICS####
 [layer8:Image]
 texture = hud.png
 alignment = left
-xpos = 1.13
-ypos = .145
+xpos = .13
 xscale = -1.0
 
 [layer9:Image]
 texture = graystar.png
-xpos = .95
-ypos = .145
+xpos = -.05
 xscale = 45
 yscale = 45
 inPixels = xscale|yscale
 
 [layer10:Circle]
 texture = star.png
 ratio = partialStars
-xpos = .95
-ypos = .145
+xpos = -.05
 xscale = 45
 yscale = 45
 inPixels = xscale|yscale
@@ -125,40 +107,47 @@ condition = ratio > 0 and stars <= 5
 [layer11:Text]
 text = stars
 font = scoreFont
-xpos = .88
-ypos = .145
+xpos = -.12
+
+[Group1]
+layers = 8,9,10,11
+
+[Group1:fx0:Slide]
+startX = 1.3
+endX = 1.0
+startY = .145
+endY = .145
+transitionTime = 1000.0
+condition = self.stage.layerGroups[2].position[1] >= .05
 
 ###Streak Graphics###
 [layer12:Text]
 font = scoreFont
 text = "%04i" % streak
 alignment = right
 xpos = .975
-ypos = .05
 color = #999999
 outline = True
 
 [layer13:Image]
 texture = hud.png
 alignment = left
 xpos = 1
-ypos = .05
 xscale = -1.0
 
 [layer14:Text]
 font = scoreFont
 text = streak
 alignment = right
 xpos = .975
-ypos = .05
 
 [layer15:Text]
 font = scoreFont
 text = "Streak"
 alignment = left
 xpos = .74
-ypos = .05
-#####################
+
+######OTHER##########
 
 [layer18:Text]
 text = "%d:%02i/%d:%02i" % (minutes, seconds, minutesSongLength, secondsSongLength)
@@ -171,6 +160,7 @@ alignment = center
 color = #FFFFFF00
 fadeTo = #FFFFFFFF
 transitionTime = 1000.0
+condition = self.stage.scene.countdownOK
 
 [layer19:Text]
 text = "%i Note Streak" % (50*int(streak/50))
@@ -185,3 +175,6 @@ fadeTo = #FFFF00FF
 transitionTime = 1.0
 transitionTimeOut = 1000.0
 condition = streak % 50 == 0 and streak > 0 and self.triggerPick()
+
+
+

src/Drum.py

@@ -115,10 +115,6 @@ def __init__(self, engine, playerObj, editorMode = False, player = 0):
     #myfingershurt:
     self.hopoStyle = 0    
 
-    if self.theme < 2:    #make board same size as guitar board if GH based theme so it rockmeters dont interfere
-      self.boardWidth     = 3.0
-      self.boardLength    = 9.0
-
     self.drumFretButtons = None
 
     #blazingamer
@@ -216,8 +212,8 @@ def loadFrets(self):
     else:
       defaultOpenKey = False
 
-      if self.engine.fileExists(get("open.dae")): #look in the frets folder for files
-        engine.resource.load(self,  "keyMeshOpen",  lambda: Mesh(engine.resource.fileName(get("open.dae"))))
+      if self.engine.fileExists(get("key_open.dae")): #look in the frets folder for files
+        engine.resource.load(self,  "keyMeshOpen",  lambda: Mesh(engine.resource.fileName(get("key_open.dae"))))
       else: #default to files in data folder
         engine.resource.load(self,  "keyMeshOpen",  lambda: Mesh(engine.resource.fileName("key_open.dae")))
         defaultOpenKey = True
@@ -434,7 +430,6 @@ def renderFrets(self, visibility, song, controls):
         texture = None
         model = self.keyMesh
         if self.keytex:
-          model = self.keyMesh
           if n == 0:
             texture = self.keytexb.texture
           elif n == 1:
@@ -450,7 +445,7 @@ def renderFrets(self, visibility, song, controls):
           model = self.keyMeshOpen
 
         c = [.1 + .8 * c[0] + f, .1 + .8 * c[1] + f, .1 + .8 * c[2] + f, v]
-        self.render3DKey(texture, model, x, y, c, n)
+        self.render3DKey(texture, model, x, y, c, n, f)
 
     glDisable(GL_DEPTH_TEST)      
 
@@ -667,8 +662,7 @@ def render(self, visibility, song, pos, controls, killswitch):
         self.renderFreestyleLanes(visibility, song, pos, controls) #MFH - render the lanes on top of the notes.
         self.renderFrets(visibility, song, controls)
 
-        if self.hitFlamesPresent: #MFH - only when present!
-          self.renderFreestyleFlames(visibility, controls)    #MFH - freestyle hit flames
+        self.renderFreestyleFlames(visibility, controls)    #MFH - freestyle hit flames
 
       else:
 
@@ -683,7 +677,8 @@ def render(self, visibility, song, pos, controls, killswitch):
           self.renderNotes(visibility, song, pos)
           self.renderFrets(visibility, song, controls)
 
-        self.renderFlames(song, pos, controls)    #MFH - only when freestyle inactive!
+        self.renderAnimatedFlames(song, pos)
+        self.renderFlames(song, pos)    #MFH - only when freestyle inactive!
 
 
   def playDrumSounds(self, controls, playBassDrumOnly = False):   #MFH - handles playing of drum sounds.  

src/Guitar.py

@@ -108,7 +108,6 @@ def renderFrets(self, visibility, song, controls):
     glEnable(GL_DEPTH_TEST)
 
     for n in range(self.strings2):
-      pressed = None #to make sure guitar doesnt crash
       keyNumb = n
       f = self.fretWeight[keyNumb]
       c = list(self.fretColors[keyNumb])
@@ -130,7 +129,7 @@ def renderFrets(self, visibility, song, controls):
         else:
           texY = (0.0, 1.0 / self.fretImgColNumber)#fret normal guitar/bass/drums
 
-          if controls.getState(self.keys[n]) or controls.getState(self.keys[n+5]) or (self.isDrum and pressed):#fret press
+          if controls.getState(self.keys[n]) or controls.getState(self.keys[n+5]):#fret press
             texY = (1.0 / self.fretImgColNumber, 2.0 / self.fretImgColNumber)
 
           elif self.hit[n] or (self.battleStatus[3] and self.battleBreakString == n):#frets on note hit
@@ -149,7 +148,7 @@ def renderFrets(self, visibility, song, controls):
           texture = None
 
         c = [.1 + .8 * c[0] + f, .1 + .8 * c[1] + f, .1 + .8 * c[2] + f, v]
-        self.render3DKey(texture,self.keyMesh, x, y, c, n)
+        self.render3DKey(texture,self.keyMesh, x, y, c, n, f)
 
     glDisable(GL_DEPTH_TEST)
 
@@ -304,8 +303,7 @@ def render(self, visibility, song, pos, controls, killswitch):
         self.renderFreestyleLanes(visibility, song, pos, None) #MFH - render the lanes on top of the notes.
         self.renderFrets(visibility, song, controls)
 
-        if self.hitFlamesPresent:   #MFH - only if present!
-          self.renderFreestyleFlames(visibility, controls)    #MFH - freestyle hit flames
+        self.renderFreestyleFlames(visibility, controls)    #MFH - freestyle hit flames
 
       else:
         self.renderTails(visibility, song, pos, killswitch)
@@ -325,7 +323,8 @@ def render(self, visibility, song, pos, controls, killswitch):
 
         self.renderHitGlow()
         self.renderHitTrails(controls)
-        self.renderFlames(song, pos, controls)    #MFH - only when freestyle inactive!
+        self.renderAnimatedFlames(song, pos)
+        self.renderFlames(song, pos)    #MFH - only when freestyle inactive!
 
       if self.leftyMode:
         if not self.battleStatus[6]: