Skip to content

Commit

Permalink
Don't wildcard-import from Instrument.
Browse files Browse the repository at this point in the history
  • Loading branch information
stump committed Aug 10, 2012
1 parent 9da7da8 commit b6e6ecb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
5 changes: 4 additions & 1 deletion src/Drum.py
Expand Up @@ -31,6 +31,9 @@
from Song import Note, Tempo
from Neck import Neck
from Shader import shaders
import os
import numpy as np
from Mesh import Mesh

from OpenGL.GL import *
import math
Expand All @@ -53,7 +56,7 @@
# to enable it, only here and Player.drums should need changing.


from Instrument import *
from Instrument import Instrument

class Drum(Instrument):
def __init__(self, engine, playerObj, editorMode = False, player = 0):
Expand Down
5 changes: 4 additions & 1 deletion src/Guitar.py
Expand Up @@ -30,8 +30,11 @@
from Neck import Neck
from copy import deepcopy
from Shader import shaders
from Song import Note
import Log
import math

from Instrument import *
from Instrument import Instrument
from OpenGL.GL import *

class Guitar(Instrument):
Expand Down
6 changes: 5 additions & 1 deletion src/ProGuitar.py
Expand Up @@ -20,10 +20,14 @@
# MA 02110-1301, USA. #
#####################################################################

from Song import Note, Tempo
from Guitar import Guitar
from Mesh import Mesh
import random
import os
from Shader import shaders
import Log

from Instrument import *
from OpenGL.GL import *

class ProGuitar(Guitar):
Expand Down

0 comments on commit b6e6ecb

Please sign in to comment.