Extending loadNotes

stump · Jun 4, 2011 · 9ccd514 · 9ccd514
1 parent 77c8e31
commit 9ccd514
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 29 deletions.
diff --git a/src/Drum.py b/src/Drum.py
@@ -141,6 +141,35 @@ def __init__(self, engine, playerObj, editorMode = False, player = 0):
 
     self.neck = Neck(self.engine, self, playerObj)
 
+  def loadNotes(self):
+    super(Drum, self).loadNotes()
+
+    if self.twoDnote == True:
+      if self.noteSpin:
+        engine.loadImgDrawing(self, "noteOpenAnimatedPowerActive", get("animated_open_power_active.png"))
+        engine.loadImgDrawing(self, "noteOpenAnimatedPower", get("animated_open_power.png"))
+        engine.loadImgDrawing(self, "noteOpenAnimated", get("animated_open.png"))        
+
+    else:
+      defaultOpenNote = False
+
+      if self.engine.fileExists(get("open.dae")): #load from notes folder
+        self.engine.resource.load(self,  "openMesh",  lambda: Mesh(self.engine.resource.fileName(get("open.dae"))))
+      else: #fallback to the default in the data folder
+        self.engine.resource.load(self,  "openMesh",  lambda: Mesh(self.engine.resource.fileName("open.dae")))
+        defaultOpenNote = True
+
+      engine.loadImgDrawing(self, "spActTex", get("spacttex.png"))
+
+      if defaultOpenNote:
+        self.opentexture = False
+        self.opentexture_star = False
+        self.opentexture_stara = False
+      else:
+        self.engine.loadImgDrawing(self, "opentexture", get("opentex.png"))
+        self.engine.loadImgDrawing(self, "opentexture_star", get("opentex_star.png"))
+        self.engine.loadImgDrawing(self, "opentexture_stara", get("opentex_stara.png"))
+
   def loadFrets(self):
     super(Drum, self).loadFrets()
 

diff --git a/src/Instrument.py b/src/Instrument.py
@@ -423,11 +423,6 @@ def loadNotes(self):
         engine.loadImgDrawing(self, "noteAnimatedPowerActive", get("animated_power_active.png"))
         engine.loadImgDrawing(self, "noteAnimatedPowerActiveHOPO", get("animated_power_active_hopo.png"))
 
-        if self.isDrum:
-          engine.loadImgDrawing(self, "noteOpenAnimatedPowerActive", get("animated_open_power_active.png"))
-          engine.loadImgDrawing(self, "noteOpenAnimatedPower", get("animated_open_power.png"))
-          engine.loadImgDrawing(self, "noteOpenAnimated", get("animated_open.png"))
-
         if self.gameMode2p == 6: #battle multiplayer
           if engine.loadImgDrawing(self, "noteButtons", get("spinnotesbattle.png")):
             self.starSpinFrames = 8
@@ -440,7 +435,6 @@ def loadNotes(self):
 
     else:
       defaultNote = False
-      defaultOpenNote = False
 
       #MFH - can't use IOError for fallback logic for a Mesh() call... 
       if self.engine.fileExists(get("note.dae")): #look in the notes folder for files
@@ -454,16 +448,8 @@ def loadNotes(self):
       else: #No mesh for star notes
         self.starMesh = None
 
-      if self.isDrum:
-        if self.engine.fileExists(get("open.dae")): #load from notes folder
-          self.engine.resource.load(self,  "openMesh",  lambda: Mesh(self.engine.resource.fileName(get("open.dae"))))
-        else: #fallback to the default in the data folder
-          self.engine.resource.load(self,  "openMesh",  lambda: Mesh(self.engine.resource.fileName("open.dae")))
-          defaultOpenNote = True
-
       if defaultNote:
         self.notetex = False
-
       else:
         self.notetex = True
         self.startex = True
@@ -483,21 +469,7 @@ def loadNotes(self):
           if not self.engine.loadImgDrawing(self,  "staratex"+chr(97+i),  get("staratex_"+chr(97+i)+".png")):
             self.staratex = False
             break
-
-
-      if self.isDrum: 
-        engine.loadImgDrawing(self, "spActTex", get("spacttex.png"))
-
-
-      if defaultOpenNote:
-        self.opentexture = False
-        self.opentexture_star = False
-        self.opentexture_stara = False
-      else:
-        self.engine.loadImgDrawing(self, "opentexture", get("opentex.png"))
-        self.engine.loadImgDrawing(self, "opentexture_star", get("opentex_star.png"))
-        self.engine.loadImgDrawing(self, "opentexture_stara", get("opentex_stara.png"))
-
+
   def loadFrets(self):
     engine = self.engine
     themename = self.engine.data.themeLabel