From 688d323ac85a2b02a5ce57a3cab8006230b07920 Mon Sep 17 00:00:00 2001
From: jlew <jlew.blackout@gmail.com>
Date: Thu, 05 Aug 2010 02:57:13 +0000
Subject: Code Cleanup

---
diff --git a/MAFH2/drawableobject/DrawableObject.py b/MAFH2/drawableobject/DrawableObject.py
deleted file mode 100755
index 449741c..0000000
--- a/MAFH2/drawableobject/DrawableObject.py
+++ /dev/null
@@ -1,161 +0,0 @@
-import pygame
-
-class DrawableObject(pygame.sprite.Sprite):
-
-    def __init__(self,images,textfileName,fps = 2, x = 0, y = 0, xVelocity = 0, yVelocity = 0):
-        pygame.sprite.Sprite.__init__(self)
-        cnt = 0
-        
-        #self._originals = images
-        #self._images = images
-        self._images = []
-        self._origImages = []
-        while cnt < len(images):
-            self._images.append(images[cnt].convert())
-            self._origImages.append(images[cnt].convert())
-            cnt += 1
-        self.image = self._images[0]
-        self._start = pygame.time.get_ticks()
-        self._delay = 1000 / fps
-        self._last_update = 0
-        self._frame = 0
-        self.animations = {}
-        self._current_anim = ""
-        self.xPos = x
-        self.yPos = y
-        self.xSpeed = xVelocity
-        self.ySpeed = yVelocity
-        self.myAngle = 0
-        self.xSize = 40
-        self.ySize = 40
-        
-        if textfileName != '':
-
-           f = open(textfileName, 'r')
-           currentLine = f.readline()
-           while currentLine != '':
-
-             animValues = currentLine.split(",")
-             self.animations[animValues[0]] =  [int(animValues[1]), int(animValues[2])]
-             currentLine = f.readline()
-
-
-    def addImages(self, images):
-
-        self._images.extend(images)
-        #self._originals.extend(images)
-        
-    def goToAnim(self, animName):
-
-        cnt = 0
-        while cnt < len(animations):
-           
-           if animations[cnt] == animName:
-             self._current_anim = animName
-             self._frame = self.animations[animName][0]
-             self.image = self._images[self._frame]
-             cnt = len(animations)
-           cnt += 1
-           
-    def goToFrame(self, frame):
-
-        self._frame = frame
-        self.image = self._images[self._frame]
-
-    def move(self):
-
-        self.xPos += self.xSpeed
-        self.yPos += self.ySpeed
-
-        self.image[0].get_rect().move(self.xPos,self.yPos)
-
-    def nudge(self, xNudge = 0, yNudge = 0):
-
-        self.xPos += xNudge
-        self.yPos += yNudge
-
-        self.image[0].get_rect().move(self.xPos,self.yPos)
-
-    def scale(self, newXSize = None, newYSize = None):
-
-        if newXSize != None: self.xSize = newXSize
-        if newYSize != None: self.ySize = newYSize
-
-        cnt = 0
-        while  cnt < len(self._images):
-            
-            self._origImages[cnt] = pygame.transform.scale(self._origImages[cnt], (self.xSize, self.ySize))
-            self._images[cnt] = self._origImages[cnt]
-            cnt += 1
-            
-    def getXSize(self):
-    
-       return self.xSize
-
-    def getYSize(self):
-
-       return self.ySize
-
-    def rotate(self,angle):
-
-        cnt = 0
-
-        self.myAngle += angle
-        while  cnt < len(self._images):
-
-            self._images[cnt] = pygame.transform.rotate(self._origImages[cnt], self.myAngle)
-            cnt += 1
-
-    def getRotation(self):
-
-       return self.myAngle
-    
-    def setPosition(self, x = None, y = None):
-    
-       if x != None and x >= 0:  self.xPos = x
-       if y != None and y >= 0:  self.yPos = y
-
-    def getXPos(self):
-
-       return self.xPos
-
-    def getYPos(self):
-
-       return self.yPos
-
-    def setSpeed(self, xVelocity = None, yVelocity = None):
-
-       if xVelocity != None:  self.xSpeed = xVelocity
-       if yVelocity != None:  self.ySpeed = yVelocity
-
-    def getXSpeed(self):
-    
-       return self.xSpeed
-
-    def getYSpeed(self):
-
-       return self.ySpeed
-       
-    def calcColorKey(self):
-    
-       myColorKey = images[0].get_at((0,0))
-       setColorKey(myColorKey)
-
-    def setColorKey(self, aColor):
-
-       cnt = 0
-       while cnt < len(self._images):
-          self._images[cnt].set_colorkey(aColor)
-          cnt += 1
-
-    def update(self, t):
-       pass
-
-    def updateCurrnetAnimation(self, t):
-       pass
-
-    def nextFrame(self):
-       pass
-
-    def nextCurrentAnimFrame(self):
-       pass
diff --git a/MAFH2/drawableobject/Spritesheet.py b/MAFH2/drawableobject/Spritesheet.py
deleted file mode 100755
index bce2db5..0000000
--- a/MAFH2/drawableobject/Spritesheet.py
+++ /dev/null
@@ -1,33 +0,0 @@
-import pygame
-
-class Spritesheet:
-    """
-    Class from http://www.scriptedfun.com/transcript-2-using-sprite-sheets-and-drawing-the-background/
-
-    This class can be used to seperate images from the sprite sheet
-    """
-    def __init__(self, filename):
-        self.sheet = pygame.image.load(filename).convert_alpha()
-        self.sheet = self.imgat(self.sheet.get_rect())
-
-    def imgat(self, rect, myColorKey = None):
-        rect = pygame.Rect(rect)
-        image = pygame.Surface(rect.size).convert_alpha()
-        if myColorKey == None:
-            myColorKey = (255,0,255)
-        image.set_colorkey(myColorKey)
-        image.blit(self.sheet, (0, 0), rect)
-        return image
-
-    def imgsat(self, rects, myColorKey = None):
-        imgs = []
-        for rect in rects:
-            imgs.append(self.imgat(rect, myColorKey))
-        return imgs
-
-    def img_extract( self, cols, rows, width, height, myColorKey = None):
-        rect_list = []
-        for y in range(0, rows):
-            for x in range(0, cols):
-                rect_list.append((width*x, height*y, width, height))
-        return self.imgsat( rect_list, myColorKey)
diff --git a/MAFH2/drawableobject/__init__.py b/MAFH2/drawableobject/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/MAFH2/drawableobject/__init__.py
+++ /dev/null
--
cgit v0.9.1