115 files changed, 0 insertions, 559 deletions
diff --git a/DrawableObjectTests/AnimatedSprite.py b/DrawableObjectTests/AnimatedSprite.py
deleted file mode 100755
index 4f5c8ba..0000000
--- a/DrawableObjectTests/AnimatedSprite.py
+++ /dev/null
@@ -1,140 +0,0 @@
-import pygame
-
-class Spritesheet:
-    """
-    Class from http://www.scriptedfun.com/transcript-2-using-sprite-sheets-and-drawing-the-background/
-
-    """
-    def __init__(self, filename):
-        self.sheet = pygame.image.load(filename)#.convert()
-
-    def imgat(self, rect):
-        rect = pygame.Rect(rect)
-        image = pygame.Surface(rect.size)#.convert()
-        image.blit(self.sheet, (0, 0), rect)
-        return image
-
-    def imgsat(self, rects):
-        imgs = []
-        for rect in rects:
-            imgs.append(self.imgat(rect))
-        return imgs
-
-    def img_extract( self, cols, rows, width, height ):
-        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)
-
-
-class AnimatedSprite(pygame.sprite.Sprite):
-    """
-    http://shinylittlething.com/2009/07/21/pygame-and-animated-sprites/
-    """
-
-    def __init__(self,images,textfileName,fps = 10):
-        pygame.sprite.Sprite.__init__(self)
-        self._images = images
-
-        # Track the time we started, and the time between updates.
-        # Then we can figure out when we have to switch the image.
-        self._start = pygame.time.get_ticks()
-        self._delay = 1000 / fps
-        self._last_update = 0
-        self._frame = 0
-        self.animations = {}
-        
-        if textfileName != '':
-           f = open(textfileName, 'r')
-           currentLine = f.readline()
-           while currentLine != '':
-             animValues = currentLine.split(",")
-             #This is a list called animations that at each position contains a list of two values. the first value is the start position
-             #of the given animation and the second is the end position of the given animation
-             self.animations[animValues[0]] =  [int(animValues[1]), int(animValues[2])]
-             currentLine = f.readline()
-
-        # Call update to set our first image.
-        #self.update(pygame.time.get_ticks())
-
-    def addImages(self, images):
-
-        self._images.extend(images)
-
-    def update(self, t):
-        # This method updates the animation in a situation where there is only one animation contained within the object.
-
-        #calculates the amount of time that has passed since the last update
-        timePassed = t - self._last_update
-        #checks if enough time has passed that it would need to update the frame of the animation
-        if timePassed > self._delay:
-            #since enough time has passed, it will determine how many times the frame was supposed to change since the last update
-            frameChanges = int(timePassed/self._delay)
-            #goes to the frame that it should be at right now and skips any frames that would have already been over and done with
-            self._frame += frameChanges
-            #checks if the current frame is past the final frame and continues to check over and over until it is not
-            while self._frame >= len(self._images):
-              #since we are past the final frame it is now figuring out how many frames past the final frame we have actually gone
-              framesPast = self._frame - len(self._images)
-              #sets the current frame to the frame it should be at
-              self._frame = framesPast - 1
-            #sets the current image to the image associated with the current frame
-            self.image = self._images[self._frame]
-            #sets the last update value to the current time so that at the next update the time change is accurate
-            self._last_update = t
-
-    def updateAnimation(self, t, animName):
-        # This method updates the animation based on the start and end frame of the specific animation you are on.
-        #This means that if your object contains multiple animations, you can use this method to reference the exact
-        #animation that you are using.
-
-        #calculates the amount of time that has passed since the last update
-        timePassed = t - self._last_update
-        #checks if enough time has passed that it would need to update the frame of the animation
-        if timePassed > self._delay:
-            #Checks to make sure that the current frame is actually set to a position within the animation
-            if self._frame < self.animations.get(animName)[0] or self._frame > self.animations.get(animName)[1]:
-              #corrects the position of the current frame
-              self._frame = self.animations.get(animName)[0]
-            #since enough time has passed, it will determine how many times the frame was supposed to change since the last update
-            frameChanges = int(timePassed/self._delay)
-            #goes to the frame that it should be at right now and skips any frames that would have already been over and done with
-            self._frame += frameChanges
-            #checks if the current frame is past the final frame of the current animation and continues to check over and over
-            #until it is not
-            while self._frame >= self.animations.get(animName)[1]:
-              #Determines how many frames past the final frame of the animation it is
-              framesPast = self._frame - self.animations.get(animName)[1]
-              #Sets the current frame to the frame it should be at
-              self._frame = framesPast - 1 + self.animations.get(animName)[0]
-            #sets the current image to the image associated with the current frame
-            self.image = self._images[self._frame]
-            #sets the last update value to the current time so that at the next update the time change is accurate
-            self._last_update = t
-
-    def nextFrame(self):
-        # This definition is designed to simply move to the next frame.
-        # All of the other definitions only move to the nex frame if
-        # enough time has passed based on the framerate. With this
-        # definition I can go right to the next frame allowing me to
-        # see how fast a framerate I can get to and not be limited by 
-        # what I define.
-
-        self._frame += 1
-        if self._frame >= len(self._images):
-            framesPast = self._frame - len(self._images)
-            self._frame = framesPast
-        self.image = self._images[self._frame]
-        
-    def nextAnimFrame(self, animName):
-        # This definition is designed to simply move to the next frame of the specified animation.
-        if self._frame < self.animations[animName][0]:
-            self._frame = self.animations[animName][0]
-
-        self._frame += 1
-        if self._frame > self.animations[animName][1]:
-            framesPast = self._frame - self.animations[animName][1]
-            self._frame = framesPast - 1 + self.animations[animName][0]
-        self.image = self._images[self._frame]
-        
diff --git a/DrawableObjectTests/Buttons.psd b/DrawableObjectTests/Buttons.psd
deleted file mode 100755
index a1571e2..0000000
--- a/DrawableObjectTests/Buttons.psd
+++ /dev/null
diff --git a/DrawableObjectTests/DrawableObjectMoveScaleTest.py b/DrawableObjectTests/DrawableObjectMoveScaleTest.py
deleted file mode 100755
index c1bff71..0000000
--- a/DrawableObjectTests/DrawableObjectMoveScaleTest.py
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /usr/bin/env python
-from Spritesheet import Spritesheet
-from DynamicDrawableObject import DynamicDrawableObject
-from Scene import Scene
-import pygame
-import time
-pygame.init()
-
-img={}
-ft="" #filetype
-r=0 #frame refreshes
-i=1 #cycles images
-SIZE = WIDTH, HEIGHT = 600,400 #screen sizes
-t=0 #trial number
-
-BACKGROUNDR=152
-BACKGROUNDG=0
-BACKGROUNDB=152
-
-screen = pygame.display.set_mode(SIZE) #Screen Set 600x400
-
-screen.fill((BACKGROUNDR, BACKGROUNDG, BACKGROUNDB))
-
-def blitAndFlip():
-    screen.fill((BACKGROUNDR, BACKGROUNDG, BACKGROUNDB))
-    cnt = 0
-    while cnt < myScene.getListSize():
-
-       screen.blit(myScene.getObject(cnt).image, [myScene.getObject(cnt).getXPos(),myScene.getObject(cnt).getYPos()])
-       cnt += 1
-
-
-    pygame.display.flip()
-
-switch1 = [
-  [pygame.image.load("%sa1/1%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/2%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/3%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/4%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/5%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/6%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/7%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/8%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/9%s"%("IndividualFrames/bmp16/",".bmp"))]
-]
-
-switch3 = [
-  [pygame.image.load("%sa1/1%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/2%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/3%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/4%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/5%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/6%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/7%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/8%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa1/9%s"%("IndividualFrames/bmp16/",".bmp"))]
-]
-
-switch2 = [
-  [pygame.image.load("%sa2/1%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa2/2%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa2/3%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa2/4%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa2/5%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa2/6%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa2/7%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa2/8%s"%("IndividualFrames/bmp16/",".bmp"))],
-  [pygame.image.load("%sa2/9%s"%("IndividualFrames/bmp16/",".bmp"))]
-]
-
-dynamicObj = DynamicDrawableObject(switch1,'',1,39,3, 2, 2)
-secondDynamicObj = DynamicDrawableObject(switch1,'',1,39,100, 3, 3)
-staticObj = DynamicDrawableObject(switch2,'',1,40,43, 4, 4)
-
-initialList = [dynamicObj, secondDynamicObj]
-secondaryList = [staticObj]
-
-myScene = Scene(initialList)
-myScene.addObjects(secondaryList)
-
-myScene.nextFrame()
-blitAndFlip()
-time.sleep(2)
-myScene.getObject(1).scale(100, 100)
-myScene.getObject(1).nextFrame()
-myScene.getObject(0).nextFrame()
-myScene.getObject(2).nextFrame()
-blitAndFlip()
-time.sleep(2)
-myScene.getObject(1).rotate(45)
-myScene.getObject(1).nextFrame()
-myScene.getObject(0).nextFrame()
-myScene.getObject(2).nextFrame()
-blitAndFlip()
-time.sleep(2)
-myScene.getObject(1).rotate(-45)
-myScene.getObject(1).nextFrame()
-myScene.getObject(0).nextFrame()
-myScene.getObject(2).nextFrame()
-blitAndFlip()
-time.sleep(2)
-
diff --git a/DrawableObjectTests/DynamicDrawableObject.py b/DrawableObjectTests/DynamicDrawableObject.py
deleted file mode 100755
index 3b3722d..0000000
--- a/DrawableObjectTests/DynamicDrawableObject.py
+++ /dev/null
@@ -1,89 +0,0 @@
-import pygame
-from DrawableObject import DrawableObject
-
-class DynamicDrawableObject(DrawableObject, pygame.sprite.Sprite):
-
-    def __init__(self,images,textfileName,fps = 10, x = 0, y = 0, xVelocity = 0, yVelocity = 0):
-
-        DrawableObject.__init__(self, images, textfileName, fps, x, y, xVelocity, yVelocity)
-
-    def addImages(self, images):
-
-        self._images.extend(images)
-
-    def update(self, t):
-
-        timePassed = t + self._last_update
-        if timePassed > self._delay:
-
-            self._frame += timePassed/self._delay
-            while self._frame >= len(self._images):
-
-              framesPast = self._frame - len(self._images)
-              self._frame = framesPast - 1
-
-            self.image = self._images[self._frame]
-            self._last_update = timePassed%self._delay
-        self._last_update = timePassed
-
-    def updateCurrentAnimation(self, t):
-
-        cnt = 0
-        while cnt < len(animations):
-           
-           if animations[cnt] == self._current_anim:
-        
-              timePassed = t + self._last_update
-              if timePassed > self._delay:
-
-                  if self._frame < self.animations.get(self._current_anim)[0] or self._frame > self.animations.get(self._current_anim)[1]: #checking if I am in the animation and putting me there if I am not
-      
-                    self._frame = self.animations.get(self._current_anim)[0]
-
-                  self._frame += timePassed/self._delay
-                  while self._frame >= self.animations.get(self._current_anim)[1]:
-      
-                    framesPast = self._frame - self.animations.get(self._current_anim)[1]
-                    self._frame = framesPast - 1 + self.animations.get(self._current_anim)[0]
-      
-                  self.image = self._images[self._frame]
-                  self._last_update = timePassed%self._delay
-              self._last_update = timePassed
-                  
-              cnt = len(animations)
-
-           cnt += 1
-
-    def nextFrame(self):
-
-        self._frame += 1
-        if self._frame >= len(self._images):
-
-            framesPast = self._frame - len(self._images)
-            self._frame = framesPast
-
-        self.image = self._images[self._frame]
-
-    def nextCurrentAnimFrame(self):
-
-        cnt = 0
-        while cnt < len(animations):
-           
-           if animations[cnt] == self._current_anim:
-              
-              if self._frame < self.animations[self._current_anim][0] or self._frame > self.animations[self._current_anim][1]:
-                  
-                  self._frame = self.animations[self._current_anim][0]
-              else:
-                  self._frame += 1
-
-              if self._frame > self.animations[self._current_anim][1]:
-      
-                  framesPast = self._frame - self.animations[self._current_anim][1]
-                  self._frame = framesPast - 1 + self.animations[self._current_anim][0]
-                  
-              self.image = self._images[self._frame]
-              
-              cnt = len(anmiations)
-
-           cnt += 1
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/1.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/1.bmp
deleted file mode 100755
index 57630e3..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a1/1.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/2.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/2.bmp
deleted file mode 100755
index 90af77a..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a1/2.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/3.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/3.bmp
deleted file mode 100755
index 1751a4a..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a1/3.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/4.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/4.bmp
deleted file mode 100755
index 1f292d1..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a1/4.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/5.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/5.bmp
deleted file mode 100755
index fd8cc0e..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a1/5.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/6.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/6.bmp
deleted file mode 100755
index df3a2eb..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a1/6.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/7.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/7.bmp
deleted file mode 100755
index 51b0052..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a1/7.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/8.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/8.bmp
deleted file mode 100755
index 9302c64..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a1/8.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/9.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/9.bmp
deleted file mode 100755
index f5c6191..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a1/9.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/1.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/1.bmp
deleted file mode 100755
index 4def064..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a2/1.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/2.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/2.bmp
deleted file mode 100755
index 3750af4..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a2/2.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/3.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/3.bmp
deleted file mode 100755
index 636c6f3..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a2/3.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/4.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/4.bmp
deleted file mode 100755
index 646b407..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a2/4.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/5.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/5.bmp
deleted file mode 100755
index 11a9bf5..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a2/5.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/6.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/6.bmp
deleted file mode 100755
index ca1ba7b..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a2/6.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/7.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/7.bmp
deleted file mode 100755
index 9375c15..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a2/7.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/8.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/8.bmp
deleted file mode 100755
index 53b66f9..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a2/8.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/9.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/9.bmp
deleted file mode 100755
index 088558c..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp16/a2/9.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/1.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/1.bmp
deleted file mode 100755
index e910cec..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a1/1.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/2.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/2.bmp
deleted file mode 100755
index 0545f38..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a1/2.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/3.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/3.bmp
deleted file mode 100755
index a154b29..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a1/3.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/4.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/4.bmp
deleted file mode 100755
index 4ab21f9..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a1/4.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/5.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/5.bmp
deleted file mode 100755
index 0a55d39..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a1/5.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/6.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/6.bmp
deleted file mode 100755
index ad3f1b1..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a1/6.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/7.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/7.bmp
deleted file mode 100755
index 915ab5b..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a1/7.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/8.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/8.bmp
deleted file mode 100755
index b36287d..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a1/8.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/9.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/9.bmp
deleted file mode 100755
index 2cab5a4..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a1/9.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/1.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/1.bmp
deleted file mode 100755
index 1b41dff..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a2/1.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/2.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/2.bmp
deleted file mode 100755
index 71cca69..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a2/2.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/3.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/3.bmp
deleted file mode 100755
index a374206..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a2/3.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/4.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/4.bmp
deleted file mode 100755
index 37c4304..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a2/4.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/5.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/5.bmp
deleted file mode 100755
index 51f1acb..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a2/5.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/6.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/6.bmp
deleted file mode 100755
index 483043c..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a2/6.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/7.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/7.bmp
deleted file mode 100755
index d99e779..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a2/7.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/8.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/8.bmp
deleted file mode 100755
index 223b87e..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a2/8.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/9.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/9.bmp
deleted file mode 100755
index 088a0f5..0000000
--- a/DrawableObjectTests/IndividualFrames/bmp24/a2/9.bmp
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/1.gif b/DrawableObjectTests/IndividualFrames/gif/a1/1.gif
deleted file mode 100755
index 4a89216..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a1/1.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/2.gif b/DrawableObjectTests/IndividualFrames/gif/a1/2.gif
deleted file mode 100755
index b5019d8..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a1/2.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/3.gif b/DrawableObjectTests/IndividualFrames/gif/a1/3.gif
deleted file mode 100755
index a87ddc6..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a1/3.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/4.gif b/DrawableObjectTests/IndividualFrames/gif/a1/4.gif
deleted file mode 100755
index 2a398e6..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a1/4.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/5.gif b/DrawableObjectTests/IndividualFrames/gif/a1/5.gif
deleted file mode 100755
index 93e5b8d..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a1/5.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/6.gif b/DrawableObjectTests/IndividualFrames/gif/a1/6.gif
deleted file mode 100755
index 0e73825..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a1/6.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/7.gif b/DrawableObjectTests/IndividualFrames/gif/a1/7.gif
deleted file mode 100755
index 061669a..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a1/7.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/8.gif b/DrawableObjectTests/IndividualFrames/gif/a1/8.gif
deleted file mode 100755
index 90dcfda..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a1/8.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/9.gif b/DrawableObjectTests/IndividualFrames/gif/a1/9.gif
deleted file mode 100755
index aa194d9..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a1/9.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/1.gif b/DrawableObjectTests/IndividualFrames/gif/a2/1.gif
deleted file mode 100755
index 09134f4..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a2/1.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/2.gif b/DrawableObjectTests/IndividualFrames/gif/a2/2.gif
deleted file mode 100755
index d9ebbc2..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a2/2.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/3.gif b/DrawableObjectTests/IndividualFrames/gif/a2/3.gif
deleted file mode 100755
index de17bd4..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a2/3.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/4.gif b/DrawableObjectTests/IndividualFrames/gif/a2/4.gif
deleted file mode 100755
index 87450de..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a2/4.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/5.gif b/DrawableObjectTests/IndividualFrames/gif/a2/5.gif
deleted file mode 100755
index f95b8d9..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a2/5.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/6.gif b/DrawableObjectTests/IndividualFrames/gif/a2/6.gif
deleted file mode 100755
index 3462272..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a2/6.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/7.gif b/DrawableObjectTests/IndividualFrames/gif/a2/7.gif
deleted file mode 100755
index ac5f084..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a2/7.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/8.gif b/DrawableObjectTests/IndividualFrames/gif/a2/8.gif
deleted file mode 100755
index d9d3989..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a2/8.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/9.gif b/DrawableObjectTests/IndividualFrames/gif/a2/9.gif
deleted file mode 100755
index bcdd274..0000000
--- a/DrawableObjectTests/IndividualFrames/gif/a2/9.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/1.gif b/DrawableObjectTests/IndividualFrames/gift/a1/1.gif
deleted file mode 100755
index 2aad244..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a1/1.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/2.gif b/DrawableObjectTests/IndividualFrames/gift/a1/2.gif
deleted file mode 100755
index ed22525..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a1/2.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/3.gif b/DrawableObjectTests/IndividualFrames/gift/a1/3.gif
deleted file mode 100755
index 246cd12..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a1/3.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/4.gif b/DrawableObjectTests/IndividualFrames/gift/a1/4.gif
deleted file mode 100755
index 722f240..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a1/4.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/5.gif b/DrawableObjectTests/IndividualFrames/gift/a1/5.gif
deleted file mode 100755
index 6a71348..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a1/5.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/6.gif b/DrawableObjectTests/IndividualFrames/gift/a1/6.gif
deleted file mode 100755
index 0dd2145..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a1/6.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/7.gif b/DrawableObjectTests/IndividualFrames/gift/a1/7.gif
deleted file mode 100755
index 1e9914b..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a1/7.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/8.gif b/DrawableObjectTests/IndividualFrames/gift/a1/8.gif
deleted file mode 100755
index 390124b..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a1/8.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/9.gif b/DrawableObjectTests/IndividualFrames/gift/a1/9.gif
deleted file mode 100755
index 61c8c3c..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a1/9.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/1.gif b/DrawableObjectTests/IndividualFrames/gift/a2/1.gif
deleted file mode 100755
index a79f1e0..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a2/1.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/2.gif b/DrawableObjectTests/IndividualFrames/gift/a2/2.gif
deleted file mode 100755
index b2579e3..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a2/2.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/3.gif b/DrawableObjectTests/IndividualFrames/gift/a2/3.gif
deleted file mode 100755
index 42f2c74..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a2/3.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/4.gif b/DrawableObjectTests/IndividualFrames/gift/a2/4.gif
deleted file mode 100755
index 61b944a..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a2/4.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/5.gif b/DrawableObjectTests/IndividualFrames/gift/a2/5.gif
deleted file mode 100755
index 865f4c7..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a2/5.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/6.gif b/DrawableObjectTests/IndividualFrames/gift/a2/6.gif
deleted file mode 100755
index 9fa7cf2..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a2/6.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/7.gif b/DrawableObjectTests/IndividualFrames/gift/a2/7.gif
deleted file mode 100755
index d7627b2..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a2/7.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/8.gif b/DrawableObjectTests/IndividualFrames/gift/a2/8.gif
deleted file mode 100755
index 965acc1..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a2/8.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/9.gif b/DrawableObjectTests/IndividualFrames/gift/a2/9.gif
deleted file mode 100755
index 0509dad..0000000
--- a/DrawableObjectTests/IndividualFrames/gift/a2/9.gif
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/1.png b/DrawableObjectTests/IndividualFrames/png/a1/1.png
deleted file mode 100755
index 663ca83..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a1/1.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/2.png b/DrawableObjectTests/IndividualFrames/png/a1/2.png
deleted file mode 100755
index 6f44ab5..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a1/2.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/3.png b/DrawableObjectTests/IndividualFrames/png/a1/3.png
deleted file mode 100755
index c49ab7e..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a1/3.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/4.png b/DrawableObjectTests/IndividualFrames/png/a1/4.png
deleted file mode 100755
index 63eb7e2..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a1/4.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/5.png b/DrawableObjectTests/IndividualFrames/png/a1/5.png
deleted file mode 100755
index 2aaa600..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a1/5.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/6.png b/DrawableObjectTests/IndividualFrames/png/a1/6.png
deleted file mode 100755
index 8fa9737..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a1/6.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/7.png b/DrawableObjectTests/IndividualFrames/png/a1/7.png
deleted file mode 100755
index 1de0311..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a1/7.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/8.png b/DrawableObjectTests/IndividualFrames/png/a1/8.png
deleted file mode 100755
index 7d6332a..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a1/8.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/9.png b/DrawableObjectTests/IndividualFrames/png/a1/9.png
deleted file mode 100755
index 5a8b0ea..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a1/9.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/1.png b/DrawableObjectTests/IndividualFrames/png/a2/1.png
deleted file mode 100755
index 98b3d72..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a2/1.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/2.png b/DrawableObjectTests/IndividualFrames/png/a2/2.png
deleted file mode 100755
index 6ec3dac..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a2/2.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/3.png b/DrawableObjectTests/IndividualFrames/png/a2/3.png
deleted file mode 100755
index 157dfc8..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a2/3.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/4.png b/DrawableObjectTests/IndividualFrames/png/a2/4.png
deleted file mode 100755
index 5719ab6..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a2/4.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/5.png b/DrawableObjectTests/IndividualFrames/png/a2/5.png
deleted file mode 100755
index 3cfd8a3..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a2/5.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/6.png b/DrawableObjectTests/IndividualFrames/png/a2/6.png
deleted file mode 100755
index 750ed8b..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a2/6.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/7.png b/DrawableObjectTests/IndividualFrames/png/a2/7.png
deleted file mode 100755
index ce7756e..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a2/7.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/8.png b/DrawableObjectTests/IndividualFrames/png/a2/8.png
deleted file mode 100755
index e28a906..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a2/8.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/9.png b/DrawableObjectTests/IndividualFrames/png/a2/9.png
deleted file mode 100755
index b6b2cd8..0000000
--- a/DrawableObjectTests/IndividualFrames/png/a2/9.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/1.png b/DrawableObjectTests/IndividualFrames/pngt/a1/1.png
deleted file mode 100755
index dab1239..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a1/1.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/2.png b/DrawableObjectTests/IndividualFrames/pngt/a1/2.png
deleted file mode 100755
index 56312a7..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a1/2.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/3.png b/DrawableObjectTests/IndividualFrames/pngt/a1/3.png
deleted file mode 100755
index 4ceb540..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a1/3.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/4.png b/DrawableObjectTests/IndividualFrames/pngt/a1/4.png
deleted file mode 100755
index 38d640a..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a1/4.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/5.png b/DrawableObjectTests/IndividualFrames/pngt/a1/5.png
deleted file mode 100755
index dcc14d4..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a1/5.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/6.png b/DrawableObjectTests/IndividualFrames/pngt/a1/6.png
deleted file mode 100755
index cb2f933..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a1/6.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/7.png b/DrawableObjectTests/IndividualFrames/pngt/a1/7.png
deleted file mode 100755
index 497ed6f..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a1/7.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/8.png b/DrawableObjectTests/IndividualFrames/pngt/a1/8.png
deleted file mode 100755
index 693ac1e..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a1/8.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/9.png b/DrawableObjectTests/IndividualFrames/pngt/a1/9.png
deleted file mode 100755
index e83b570..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a1/9.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/1.png b/DrawableObjectTests/IndividualFrames/pngt/a2/1.png
deleted file mode 100755
index 06f2b7c..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a2/1.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/2.png b/DrawableObjectTests/IndividualFrames/pngt/a2/2.png
deleted file mode 100755
index f20ed10..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a2/2.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/3.png b/DrawableObjectTests/IndividualFrames/pngt/a2/3.png
deleted file mode 100755
index 6681f2e..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a2/3.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/4.png b/DrawableObjectTests/IndividualFrames/pngt/a2/4.png
deleted file mode 100755
index ff3f0f1..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a2/4.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/5.png b/DrawableObjectTests/IndividualFrames/pngt/a2/5.png
deleted file mode 100755
index 1152066..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a2/5.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/6.png b/DrawableObjectTests/IndividualFrames/pngt/a2/6.png
deleted file mode 100755
index 458e680..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a2/6.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/7.png b/DrawableObjectTests/IndividualFrames/pngt/a2/7.png
deleted file mode 100755
index 4097b74..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a2/7.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/8.png b/DrawableObjectTests/IndividualFrames/pngt/a2/8.png
deleted file mode 100755
index e6ee9b2..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a2/8.png
+++ /dev/null
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/9.png b/DrawableObjectTests/IndividualFrames/pngt/a2/9.png
deleted file mode 100755
index 314aabf..0000000
--- a/DrawableObjectTests/IndividualFrames/pngt/a2/9.png
+++ /dev/null
diff --git a/DrawableObjectTests/Scene.py b/DrawableObjectTests/Scene.py
deleted file mode 100644
index 959fd87..0000000
--- a/DrawableObjectTests/Scene.py
+++ /dev/null
@@ -1,165 +0,0 @@
-import pygame
-
-class Scene:
-
-    def __init__(self, drawableObjects):
-    
-       self._my_Objects = []
-
-       cnt = 0
-       while cnt < len(drawableObjects):
-           self._my_Objects.append([drawableObjects[cnt],drawableObjects[cnt].getXPos(),drawableObjects[cnt].getYPos()])
-           cnt += 1
-           
-       self.xPos = 0
-       self.yPos = 0
-       self.xSize = 0
-       self.ySize = 0
-       
-       self.calcPosition()
-       self.calcSize()
-       self.setRelativePositions()
-
-    def calcPosition(self):
-    
-       lowestX = 9000
-       lowestY = 9000
-       
-       cnt = 0
-       while cnt < len(self._my_Objects):
-           if self._my_Objects[cnt][0].getXPos() < lowestX: lowestX = self._my_Objects[cnt][0].getXPos()
-           if self._my_Objects[cnt][0].getYPos() < lowestY: lowestY = self._my_Objects[cnt][0].getYPos()
-           cnt += 1
-
-       self.xPos = lowestX
-       self.yPos = lowestY
-
-    def calcSize(self):
-    
-       highestX = 0
-       highestY = 0
-       
-       cnt = 0
-       while cnt < len(self._my_Objects):
-           if self._my_Objects[cnt][0].getXPos() + self._my_Objects[cnt][0].getXSize() > highestX: highestX = self._my_Objects[cnt][0].getXPos() + self._my_Objects[cnt][0].getXSize()
-           if self._my_Objects[cnt][0].getYPos() + self._my_Objects[cnt][0].getYSize() > highestY: highestY = self._my_Objects[cnt][0].getYPos() + self._my_Objects[cnt][0].getYSize()
-           cnt += 1
-
-       self.xSize = highestX - self.xPos
-       self.ySize = highestY - self.yPos
-    
-    def addObjects(self, newDrawableObjects):
-
-       cnt = 0
-       while cnt < len(newDrawableObjects):
-           self._my_Objects.append([newDrawableObjects[cnt],newDrawableObjects[cnt].getXPos(),newDrawableObjects[cnt].getYPos()])
-           cnt += 1
-       
-       self.calcPosition()
-       self.calcSize()
-       self.setRelativePositions()
-
-    def setRelativePositions(self):
-
-       cnt = 0
-       while cnt < len(self._my_Objects):
-           self._my_Objects[cnt][1] = self._my_Objects[cnt][1] - self.xPos
-           self._my_Objects[cnt][2] = self._my_Objects[cnt][2] - self.yPos
-           cnt += 1
-
-    def removeObject(self, index):
-
-       if index < len(self._my_Objects): del self._my_Objects[index]
-
-    def getObject(self, index):
-
-       if index < len(self._my_Objects):
-          return  self._my_Objects[index][0]
-
-    def getListSize(self):
-       return len(self._my_Objects)
-
-    def moveObjects(self):
-
-       cnt = 0
-       while cnt < len(self._my_Objects):
-
-          self._my_Objects[cnt][0].move()
-          cnt += 1
-
-       self.calcPosition()
-       self.calcSize()
-       self.setRelativePositions()
-
-    def moveScene(self, xNudge = 0, yNudge = 0):
-
-       cnt = 0
-       while cnt < len(self._my_Objects):
-
-          self._my_Objects[cnt][0].nudge(xNudge, yNudge)
-          cnt += 1
-
-       self.calcPosition()
-
-    def setPosition(self, newXPos = None, newYPos = None):
-
-       if newXPos != None: self.xPos = newXPos
-       if newYPos != None: self.yPos = newYPos
-
-       cnt = 0
-       while cnt < len(self._my_Objects):
-
-          self._my_Objects[cnt][0].setPosition(self.xPos + self._my_Objects[cnt][1], self.yPos + self._my_Objects[cnt][2])
-          cnt += 1
-
-    def getXPos(self):
-       return self.xPos
-
-    def getYPos(self):
-       return self.yPos
-
-    def getXSize(self):
-       return self.xSize
-
-    def getYSize(self):
-       return self.ySize
-
-    def scaleObjects(self, newXSize = None, newYSize = None):
-
-       cnt = 0
-       while cnt < len(self._my_Objects):
-           self._my_Objects[cnt][0].scale(newXSize, newYSize)
-           cnt += 1
-
-    def scaleScene(self, newXSize = None, newYSize = None):
-
-       xScale = 1
-       yScale = 1
-
-       if newXSize != None: xScale = (newXSize * 1.0)/self.xSize
-       if newYSize != None: yScale = (newYSize * 1.0)/self.ySize
-
-       cnt = 0
-       while cnt < len(self._my_Objects):
-           self._my_Objects[cnt][0].scale(xScale * self._my_Objects[cnt][0].getXSize(), yScale * self._my_Objects[cnt][0].getYSize())
-           self._my_Objects[cnt][1] = xScale * self._my_Objects[cnt][1]
-           self._my_Objects[cnt][2] = yScale * self._my_Objects[cnt][2]
-           cnt += 1
-
-       self.setPosition()
-
-    def updateAnimations(self, t):
-
-       cnt = 0
-       while cnt < len(self._my_Objects):
-
-          self._my_Objects[cnt][0].updateCurrentAnimation(t)
-          cnt += 1
-
-    def nextFrame(self):
-
-       cnt = 0
-       while cnt < len(self._my_Objects):
-
-          self._my_Objects[cnt][0].nextFrame()
-          cnt += 1
diff --git a/DrawableObjectTests/Spritesheet.py b/DrawableObjectTests/Spritesheet.py
deleted file mode 100755
index ddb18a8..0000000
--- a/DrawableObjectTests/Spritesheet.py
+++ /dev/null
@@ -1,31 +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 seporate images from the sprite sheet
-    """
-    def __init__(self, filename):
-        self.sheet = pygame.image.load(filename).convert()
-
-    def imgat(self, rect, myColorKey = None):
-        rect = pygame.Rect(rect)
-        image = pygame.Surface(rect.size).convert()
-        if myColorKey == None: myColorKey = image.get_at((0,0))
-        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)
-\ No newline at end of file
diff --git a/DrawableObjectTests/StaticDrawableObject.py b/DrawableObjectTests/StaticDrawableObject.py
deleted file mode 100755
index 6486eb2..0000000
--- a/DrawableObjectTests/StaticDrawableObject.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import pygame
-from DrawableObject import DrawableObject
-
-class StaticDrawableObject(pygame.sprite.Sprite):
-
-    def __init __(self,images,textfileName,fps = 10):
-        pygame.sprite.Sprite.__init__(self)
-        self._images = images
-
-        self._start = pygame.time.get_ticks()
-        self._delay = 1000 / fps
-        self._last_update = 0
-        self._frame = 0
-        self.animations = {}
-        
-        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)
-
-
-