Adding the current versions of DrawableObject and its sub classes

145 files changed, 772 insertions, 0 deletions

diff --git a/DrawableObjectTests/AnimatedSprite.py b/DrawableObjectTests/AnimatedSprite.py
new file mode 100755
index 0000000..6796600
--- /dev/null
+++ b/DrawableObjectTests/AnimatedSprite.py
@@ -0,0 +1,141 @@
+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):
+        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/AnimatedSpriteTest.py b/DrawableObjectTests/AnimatedSpriteTest.py
new file mode 100755
index 0000000..0be144a
--- /dev/null
+++ b/DrawableObjectTests/AnimatedSpriteTest.py
@@ -0,0 +1,371 @@
+#! /usr/bin/env python
+from AnimatedSprite import Spritesheet
+from AnimatedSprite import AnimatedSprite
+from DynamicDrawableObject import DynamicDrawableObject
+import pygame
+import time
+pygame.init()
+
+make=input("How many images would you like to load? ")
+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
+
+AnimPerLineArr=[ 
+    [".bmp","AnimationPerLine/bmp16/"],
+    [".bmp","AnimationPerLine/bmp24/"],
+    [".gif","AnimationPerLine/gif/"]  ,
+    [".gif","AnimationPerLine/gift/"] ,
+    [".png","AnimationPerLine/png/"]  ,
+    [".png","AnimationPerLine/pngt/"] ]
+
+FixedWidthArr=[ 
+    [".bmp","FixedWithSheets/bmp16/"],
+    [".bmp","FixedWithSheets/bmp24/"],
+    [".gif","FixedWithSheets/gif/"]  ,
+    [".gif","FixedWithSheets/gift/"] ,
+    [".png","FixedWithSheets/png/"]  ,
+    [".png","FixedWidthSheets/pngt/"] ]
+
+OneSheetArr=[ 
+    [".bmp","OneSheetPerAnimation/bmp16/"],
+    [".bmp","OneSheetPerAnimation/bmp24/"],
+    [".gif","OneSheetPerAnimation/gif/"]  ,
+    [".gif","OneSheetPerAnimation/gift/"] ,
+    [".png","OneSheetPerAnimation/png/"]  ,
+    [".png","OneSheetPerAnimation/pngt/"] ]
+
+IndivFrameArr=[ 
+    [".bmp","IndividualFrames/bmp16/"],
+    [".bmp","IndividualFrames/bmp24/"],
+    [".gif","IndividualFrames/gif/"]  ,
+    [".gif","IndividualFrames/gift/"] ,
+    [".png","IndividualFrames/png/"]  ,
+    [".png","IndividualFrames/pngt/"] ]
+
+screen = pygame.display.set_mode(SIZE) #Screen Set 600x400
+
+screen.fill((BACKGROUNDR, BACKGROUNDG, BACKGROUNDB))
+
+"""Reading Individual Frames
+"""
+
+def readIndivFrames(fileType, path):
+ switch1 = [
+  [pygame.image.load("%sa1/1%s"%(path,fileType))],
+  [pygame.image.load("%sa1/2%s"%(path,fileType))],
+  [pygame.image.load("%sa1/3%s"%(path,fileType))],
+  [pygame.image.load("%sa1/4%s"%(path,fileType))],
+  [pygame.image.load("%sa1/5%s"%(path,fileType))],
+  [pygame.image.load("%sa1/6%s"%(path,fileType))],
+  [pygame.image.load("%sa1/7%s"%(path,fileType))],
+  [pygame.image.load("%sa1/8%s"%(path,fileType))],
+  [pygame.image.load("%sa1/9%s"%(path,fileType))]
+ ]
+
+ switch2 = [
+  [pygame.image.load("%sa2/1%s"%(path,fileType))],
+  [pygame.image.load("%sa2/2%s"%(path,fileType))],
+  [pygame.image.load("%sa2/3%s"%(path,fileType))],
+  [pygame.image.load("%sa2/4%s"%(path,fileType))],
+  [pygame.image.load("%sa2/5%s"%(path,fileType))],
+  [pygame.image.load("%sa2/6%s"%(path,fileType))],
+  [pygame.image.load("%sa2/7%s"%(path,fileType))],
+  [pygame.image.load("%sa2/8%s"%(path,fileType))],
+  [pygame.image.load("%sa2/9%s"%(path,fileType))]
+ ]
+ 
+ instances= []
+
+ cnt = make
+ 
+ while cnt > 0:
+  animatedSprites = []
+  animatedSprites.append([AnimatedSprite(switch1,'',10),[(40*cnt),0,2,2]])
+
+  animatedSprites.append([AnimatedSprite(switch2,'',10),[(40*cnt),40,2,2]])
+
+  instances.append(animatedSprites)
+
+  cnt = cnt - 1
+
+ trials = 0
+ while trials < 5:
+
+  groups = len(instances) - 1
+  while groups >= 0:
+   instances[groups][0][1][0] = 40 * groups
+   instances[groups][0][1][1] = 0
+   instances[groups][1][1][0] = 40 * groups
+   instances[groups][1][1][1] = 40
+   groups = groups - 1
+
+  changes = 0
+  start = time.time()
+  while changes < 500:
+   groups = len(instances) - 1
+   while groups >= 0:
+    instances[groups][0][0].nextFrame()
+    instances[groups][1][0].nextFrame()
+
+    if instances[groups][0][1][0] < 0 or instances[groups][0][1][0] > WIDTH - 40:
+       instances[groups][0][1][2] = instances[groups][0][1][2] * -1
+       
+    if instances[groups][0][1][1] < 0 or instances[groups][0][1][1] > HEIGHT - 40:
+       instances[groups][0][1][3] = instances[groups][0][1][3] * -1
+       
+    if instances[groups][1][1][0] < 0 or instances[groups][1][1][0] > WIDTH - 40:
+       instances[groups][1][1][2] = instances[groups][1][1][2] * -1
+       
+    if instances[groups][1][1][1] < 0 or instances[groups][1][1][1] > HEIGHT - 40:
+       instances[groups][1][1][3] = instances[groups][1][1][3] * -1
+     
+
+    instances[groups][0][1][0] += instances[groups][0][1][2]
+    instances[groups][0][1][1] += instances[groups][0][1][3]
+
+    instances[groups][1][1][0] += instances[groups][1][1][2]
+    instances[groups][1][1][1] += instances[groups][1][1][3]
+
+    screen.blit(instances[groups][0][0].image[0], (instances[groups][0][0].image[0].get_rect().move(instances[groups][0][1][0], instances[groups][0][1][1])))
+    screen.blit(instances[groups][1][0].image[0], (instances[groups][1][0].image[0].get_rect().move(instances[groups][1][1][0], instances[groups][1][1][1])))
+
+    groups = groups - 1
+   pygame.display.flip()
+   screen.fill((BACKGROUNDR,BACKGROUNDG,BACKGROUNDB))
+   changes = changes + 1
+  trials = trials + 1
+  print(trials)
+  print(1/((time.time() -start)/500))
+
+#-----------------------------------------------------------------
+
+def readPerLine(fileType, path):
+
+ spriteSheet1 = Spritesheet(("%sButtons.%s"%(path,fileType)))
+
+ instances= []
+
+ cnt = make
+ while cnt > 0:
+  animatedSprites = []
+  animatedSprites.append([AnimatedSprite(spriteSheet1.img_extract(9,2,40,40),("%stext.txt"%(path)),10),[(40*cnt),0,2,2]])
+
+  animatedSprites.append([AnimatedSprite(spriteSheet1.img_extract(9,2,40,40),("%stext.txt"%(path)),10),[(40*cnt),40,2,2]])
+
+  instances.append(animatedSprites)
+
+  cnt = cnt - 1
+
+ trials = 0
+ while trials < 5:
+
+  groups = len(instances) - 1
+  while groups >= 0:
+   instances[groups][0][1][0] = 40 * groups
+   instances[groups][0][1][1] = 0
+   instances[groups][1][1][0] = 40 * groups
+   instances[groups][1][1][1] = 40
+   groups = groups - 1
+
+  changes = 0
+  start = time.time()
+  while changes < 500:
+   groups = len(instances) - 1
+   while groups >= 0:
+    instances[groups][0][0].nextAnimFrame("anim1")
+    instances[groups][1][0].nextAnimFrame("anim2")
+
+    if instances[groups][0][1][0] < 0 or instances[groups][0][1][0] > WIDTH - 40:
+       instances[groups][0][1][2] = instances[groups][0][1][2] * -1
+       
+    if instances[groups][0][1][1] < 0 or instances[groups][0][1][1] > HEIGHT - 40:
+       instances[groups][0][1][3] = instances[groups][0][1][3] * -1
+       
+    if instances[groups][1][1][0] < 0 or instances[groups][1][1][0] > WIDTH - 40:
+       instances[groups][1][1][2] = instances[groups][1][1][2] * -1
+       
+    if instances[groups][1][1][1] < 0 or instances[groups][1][1][1] > HEIGHT - 40:
+       instances[groups][1][1][3] = instances[groups][1][1][3] * -1
+     
+
+    instances[groups][0][1][0] += instances[groups][0][1][2]
+    instances[groups][0][1][1] += instances[groups][0][1][3]
+
+    instances[groups][1][1][0] += instances[groups][1][1][2]
+    instances[groups][1][1][1] += instances[groups][1][1][3]
+
+    screen.blit(instances[groups][0][0].image, (instances[groups][0][0].image.get_rect().move(instances[groups][0][1][0], instances[groups][0][1][1])))
+    screen.blit(instances[groups][1][0].image, (instances[groups][1][0].image.get_rect().move(instances[groups][1][1][0], instances[groups][1][1][1])))
+
+    groups = groups - 1
+   pygame.display.flip()
+   screen.fill((BACKGROUNDR,BACKGROUNDG,BACKGROUNDB))
+   changes = changes + 1
+  trials = trials + 1
+  print(trials)
+  print(1/((time.time() -start)/500))
+
+#-----------------------------------------------------------------
+def readIndivSheet(fileType, path):
+
+ spriteSheet1 = Spritesheet(("%s1%s"%(path,fileType)))
+ spriteSheet2 = Spritesheet(("%s2%s"%(path,fileType)))
+ 
+ instances= []
+
+ cnt = make
+ while cnt > 0:
+  animatedSprites = []
+  animatedSprites.append([AnimatedSprite(spriteSheet1.img_extract(9,1,40,40),("%stext.txt"%(path)),10),[(40*cnt),0,2,2]])
+  animatedSprites[0][0].addImages(spriteSheet2.img_extract(9,1,40,40))
+
+  animatedSprites.append([AnimatedSprite(spriteSheet1.img_extract(9,1,40,40),("%stext.txt"%(path)),10),[(40*cnt),40,2,2]])
+  animatedSprites[1][0].addImages(spriteSheet2.img_extract(9,1,40,40))
+
+  instances.append(animatedSprites)
+
+  cnt = cnt - 1
+
+ trials = 0
+ while trials < 5:
+
+  groups = len(instances) - 1
+  while groups >= 0:
+   instances[groups][0][1][0] = 40 * groups
+   instances[groups][0][1][1] = 0
+   instances[groups][1][1][0] = 40 * groups
+   instances[groups][1][1][1] = 40
+   groups = groups - 1
+
+  changes = 0
+  start = time.time()
+  while changes < 500:
+   groups = len(instances) - 1
+   while groups >= 0:
+    instances[groups][0][0].nextAnimFrame("anim1")
+    instances[groups][1][0].nextAnimFrame("anim2")
+
+    if instances[groups][0][1][0] < 0 or instances[groups][0][1][0] > WIDTH - 40:
+       instances[groups][0][1][2] = instances[groups][0][1][2] * -1
+       
+    if instances[groups][0][1][1] < 0 or instances[groups][0][1][1] > HEIGHT - 40:
+       instances[groups][0][1][3] = instances[groups][0][1][3] * -1
+       
+    if instances[groups][1][1][0] < 0 or instances[groups][1][1][0] > WIDTH - 40:
+       instances[groups][1][1][2] = instances[groups][1][1][2] * -1
+       
+    if instances[groups][1][1][1] < 0 or instances[groups][1][1][1] > HEIGHT - 40:
+       instances[groups][1][1][3] = instances[groups][1][1][3] * -1
+     
+
+    instances[groups][0][1][0] += instances[groups][0][1][2]
+    instances[groups][0][1][1] += instances[groups][0][1][3]
+
+    instances[groups][1][1][0] += instances[groups][1][1][2]
+    instances[groups][1][1][1] += instances[groups][1][1][3]
+
+    screen.blit(instances[groups][0][0].image, (instances[groups][0][0].image.get_rect().move(instances[groups][0][1][0], instances[groups][0][1][1])))
+    screen.blit(instances[groups][1][0].image, (instances[groups][1][0].image.get_rect().move(instances[groups][1][1][0], instances[groups][1][1][1])))
+
+    groups = groups - 1
+   pygame.display.flip()
+   screen.fill((BACKGROUNDR,BACKGROUNDG,BACKGROUNDB))
+   changes = changes + 1
+  trials = trials + 1
+  print(trials)
+  print(1/((time.time() -start)/500))
+
+
+#-----------------------------------------------------------------
+# iterator = 0
+# print "\nTesting One Sheet Per Animation"
+# print "" 
+# while iterator < len(AnimPerLineArr):
+# 
+#  print ""
+#  print OneSheetArr[iterator][1]
+#  readIndivSheet(OneSheetArr[iterator][0],OneSheetArr[iterator][1])
+#  iterator += 1
+# 
+# iterator = 0
+# print ""
+# print "Testing One Animation Per Line"
+# print ""
+# while iterator < len(OneSheetArr):
+# 
+#  print ""
+#  print AnimPerLineArr[iterator][1]
+#  readPerLine(AnimPerLineArr[iterator][0],AnimPerLineArr[iterator][1])
+#  iterator += 1
+#  
+# iterator = 0
+# print ""
+# print "Testing Individual Frames"
+# print ""
+# while iterator < len(IndivFrameArr):
+# 
+#  print ""
+#  print IndivFrameArr[iterator][1]
+#  readIndivFrames(IndivFrameArr[iterator][0],IndivFrameArr[iterator][1])
+#  iterator += 1 
+
+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"))]
+]
+
+dynamicObj = DynamicDrawableObject(switch1,'',1,0,0, 2, 2)
+
+cnt = 0
+
+while cnt < 100:
+
+  dynamicObj.nextFrame()
+  screen.blit(dynamicObj.image[0], (dynamicObj.getXPos(), dynamicObj.getYPos()))
+  dynamicObj.move()
+  pygame.display.flip()
+  screen.fill((BACKGROUNDR,BACKGROUNDG,BACKGROUNDB))
+  cnt += 1
+
+cnt = 0
+dynamicObj.rotate(10)
+dynamicObj.rotate(10)
+dynamicObj.setPosition(0,0)
+while cnt < 100:
+
+  dynamicObj.nextFrame()
+  screen.blit(dynamicObj.image[0], (dynamicObj.getXPos(), dynamicObj.getYPos()))
+  dynamicObj.move()
+  pygame.display.flip()
+  screen.fill((BACKGROUNDR,BACKGROUNDG,BACKGROUNDB))
+  cnt += 1
+  
+cnt = 0
+dynamicObj.setPosition(0,0)
+dynamicObj.scale(160, 160)
+dynamicObj.rotate(45)
+
+while cnt < 100:
+  
+  dynamicObj.nextFrame()
+  screen.blit(dynamicObj.image[0], (dynamicObj.getXPos(), dynamicObj.getYPos()))
+  dynamicObj.move()
+  pygame.display.flip()
+  screen.fill((BACKGROUNDR,BACKGROUNDG,BACKGROUNDB))
+  cnt += 1
+
diff --git a/DrawableObjectTests/AnimationPerLine/bmp16/Buttons.bmp b/DrawableObjectTests/AnimationPerLine/bmp16/Buttons.bmp
new file mode 100755
index 0000000..7edcb3c
--- /dev/null
+++ b/DrawableObjectTests/AnimationPerLine/bmp16/Buttons.bmp
diff --git a/DrawableObjectTests/AnimationPerLine/bmp16/text.txt b/DrawableObjectTests/AnimationPerLine/bmp16/text.txt
new file mode 100755
index 0000000..dc66dbe
--- /dev/null
+++ b/DrawableObjectTests/AnimationPerLine/bmp16/text.txt
@@ -0,0 +1,2 @@
+anim1,0,8

+anim2,9,17
\ No newline at end of file
diff --git a/DrawableObjectTests/AnimationPerLine/bmp24/Buttons.bmp b/DrawableObjectTests/AnimationPerLine/bmp24/Buttons.bmp
new file mode 100755
index 0000000..a96ed6b
--- /dev/null
+++ b/DrawableObjectTests/AnimationPerLine/bmp24/Buttons.bmp
diff --git a/DrawableObjectTests/AnimationPerLine/bmp24/text.txt b/DrawableObjectTests/AnimationPerLine/bmp24/text.txt
new file mode 100755
index 0000000..dc66dbe
--- /dev/null
+++ b/DrawableObjectTests/AnimationPerLine/bmp24/text.txt
@@ -0,0 +1,2 @@
+anim1,0,8

+anim2,9,17
\ No newline at end of file
diff --git a/DrawableObjectTests/AnimationPerLine/gif/Buttons.gif b/DrawableObjectTests/AnimationPerLine/gif/Buttons.gif
new file mode 100755
index 0000000..8725ade
--- /dev/null
+++ b/DrawableObjectTests/AnimationPerLine/gif/Buttons.gif
diff --git a/DrawableObjectTests/AnimationPerLine/gif/text.txt b/DrawableObjectTests/AnimationPerLine/gif/text.txt
new file mode 100755
index 0000000..dc66dbe
--- /dev/null
+++ b/DrawableObjectTests/AnimationPerLine/gif/text.txt
@@ -0,0 +1,2 @@
+anim1,0,8

+anim2,9,17
\ No newline at end of file
diff --git a/DrawableObjectTests/AnimationPerLine/gift/Buttons.gif b/DrawableObjectTests/AnimationPerLine/gift/Buttons.gif
new file mode 100755
index 0000000..4be81f6
--- /dev/null
+++ b/DrawableObjectTests/AnimationPerLine/gift/Buttons.gif
diff --git a/DrawableObjectTests/AnimationPerLine/gift/text.txt b/DrawableObjectTests/AnimationPerLine/gift/text.txt
new file mode 100755
index 0000000..dc66dbe
--- /dev/null
+++ b/DrawableObjectTests/AnimationPerLine/gift/text.txt
@@ -0,0 +1,2 @@
+anim1,0,8

+anim2,9,17
\ No newline at end of file
diff --git a/DrawableObjectTests/AnimationPerLine/png/Buttons.png b/DrawableObjectTests/AnimationPerLine/png/Buttons.png
new file mode 100755
index 0000000..83bff0c
--- /dev/null
+++ b/DrawableObjectTests/AnimationPerLine/png/Buttons.png
diff --git a/DrawableObjectTests/AnimationPerLine/png/text.txt b/DrawableObjectTests/AnimationPerLine/png/text.txt
new file mode 100755
index 0000000..dc66dbe
--- /dev/null
+++ b/DrawableObjectTests/AnimationPerLine/png/text.txt
@@ -0,0 +1,2 @@
+anim1,0,8

+anim2,9,17
\ No newline at end of file
diff --git a/DrawableObjectTests/AnimationPerLine/pngt/Buttons.png b/DrawableObjectTests/AnimationPerLine/pngt/Buttons.png
new file mode 100755
index 0000000..cb6766f
--- /dev/null
+++ b/DrawableObjectTests/AnimationPerLine/pngt/Buttons.png
diff --git a/DrawableObjectTests/AnimationPerLine/pngt/text.txt b/DrawableObjectTests/AnimationPerLine/pngt/text.txt
new file mode 100755
index 0000000..dc66dbe
--- /dev/null
+++ b/DrawableObjectTests/AnimationPerLine/pngt/text.txt
@@ -0,0 +1,2 @@
+anim1,0,8

+anim2,9,17
\ No newline at end of file
diff --git a/DrawableObjectTests/Buttons.psd b/DrawableObjectTests/Buttons.psd
new file mode 100755
index 0000000..a1571e2
--- /dev/null
+++ b/DrawableObjectTests/Buttons.psd
diff --git a/DrawableObjectTests/DrawableObject.py b/DrawableObjectTests/DrawableObject.py
new file mode 100755
index 0000000..e48ccf2
--- /dev/null
+++ b/DrawableObjectTests/DrawableObject.py
@@ -0,0 +1,105 @@
+import pygame

+

+class DrawableObject(pygame.sprite.Sprite):

+

+    def __init__(self,images,textfileName,fps = 10, x = 0, y = 0, xVelocity = 0, yVelocity = 0):

+        pygame.sprite.Sprite.__init__(self)

+        cnt = 0

+        

+        self._originals = images

+        self._images = images

+        self._start = pygame.time.get_ticks()

+        self._delay = 1000 / fps

+        self._last_update = 0

+        self._frame = 0

+        self.animations = {}

+        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):

+

+        self._frame = self.animations[animName][0]

+        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 scale(self, newXSize, newYSize):

+        

+        self.xSize = newXSize

+        self.ySize = newYSize

+

+        cnt = 0

+        while  cnt < len(self._images):

+            

+            self._images[cnt][0] = pygame.transform.scale(self._originals[cnt][0], (newXSize, newYSize))

+            cnt += 1

+

+    #def rotate(self,angle):

+            

+        #self._images = copy.deepcopy(self._originals)

+

+        #cnt = 0 

+       

+        #self.myAngle += angle

+        #while  cnt < len(self._images):

+

+            #self._images[cnt][0] = pygame.transform.rotate(self._images[cnt][0], self.myAngle)

+            #cnt += 1

+

+        #self.scale(self.xSize, self.ySize)

+

+    #def getRotation(self):

+    

+       #return self.myAngle

+    

+    def setPosition(self, x = None, y = None):

+    

+       if x != None:  self.xPos = x

+       if y != None:  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

diff --git a/DrawableObjectTests/DynamicDrawableObject.py b/DrawableObjectTests/DynamicDrawableObject.py
new file mode 100755
index 0000000..351aea1
--- /dev/null
+++ b/DrawableObjectTests/DynamicDrawableObject.py
@@ -0,0 +1,70 @@
+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:

+

+            frameChanges = int(timePassed/self._delay)

+            self._frame += frameChanges

+            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 = t

+

+    def updateAnimation(self, t, animName):

+

+        timePassed = t - self._last_update

+        if timePassed > self._delay:

+

+            if self._frame < self.animations.get(animName)[0] or self._frame > self.animations.get(animName)[1]:

+

+              self._frame = self.animations.get(animName)[0]

+

+            frameChanges = int(timePassed/self._delay)

+            self._frame += frameChanges

+            while self._frame >= self.animations.get(animName)[1]:

+

+              framesPast = self._frame - self.animations.get(animName)[1]

+              self._frame = framesPast - 1 + self.animations.get(animName)[0]

+

+            self.image = self._images[self._frame]

+            self._last_update = t

+

+    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 nextAnimFrame(self, animName):

+

+        if self._frame < self.animations[animName][0] or self._frame > self.animations[animName][1]:

+            

+            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/IndividualFrames/bmp16/a1/1.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/1.bmp
new file mode 100755
index 0000000..57630e3
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a1/1.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/2.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/2.bmp
new file mode 100755
index 0000000..90af77a
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a1/2.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/3.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/3.bmp
new file mode 100755
index 0000000..1751a4a
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a1/3.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/4.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/4.bmp
new file mode 100755
index 0000000..1f292d1
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a1/4.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/5.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/5.bmp
new file mode 100755
index 0000000..fd8cc0e
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a1/5.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/6.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/6.bmp
new file mode 100755
index 0000000..df3a2eb
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a1/6.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/7.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/7.bmp
new file mode 100755
index 0000000..51b0052
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a1/7.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/8.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/8.bmp
new file mode 100755
index 0000000..9302c64
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a1/8.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/9.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/9.bmp
new file mode 100755
index 0000000..f5c6191
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a1/9.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/1.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/1.bmp
new file mode 100755
index 0000000..4def064
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a2/1.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/2.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/2.bmp
new file mode 100755
index 0000000..3750af4
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a2/2.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/3.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/3.bmp
new file mode 100755
index 0000000..636c6f3
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a2/3.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/4.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/4.bmp
new file mode 100755
index 0000000..646b407
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a2/4.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/5.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/5.bmp
new file mode 100755
index 0000000..11a9bf5
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a2/5.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/6.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/6.bmp
new file mode 100755
index 0000000..ca1ba7b
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a2/6.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/7.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/7.bmp
new file mode 100755
index 0000000..9375c15
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a2/7.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/8.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/8.bmp
new file mode 100755
index 0000000..53b66f9
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a2/8.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/9.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/9.bmp
new file mode 100755
index 0000000..088558c
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp16/a2/9.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/1.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/1.bmp
new file mode 100755
index 0000000..e910cec
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a1/1.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/2.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/2.bmp
new file mode 100755
index 0000000..0545f38
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a1/2.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/3.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/3.bmp
new file mode 100755
index 0000000..a154b29
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a1/3.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/4.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/4.bmp
new file mode 100755
index 0000000..4ab21f9
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a1/4.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/5.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/5.bmp
new file mode 100755
index 0000000..0a55d39
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a1/5.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/6.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/6.bmp
new file mode 100755
index 0000000..ad3f1b1
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a1/6.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/7.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/7.bmp
new file mode 100755
index 0000000..915ab5b
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a1/7.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/8.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/8.bmp
new file mode 100755
index 0000000..b36287d
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a1/8.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/9.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/9.bmp
new file mode 100755
index 0000000..2cab5a4
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a1/9.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/1.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/1.bmp
new file mode 100755
index 0000000..1b41dff
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a2/1.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/2.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/2.bmp
new file mode 100755
index 0000000..71cca69
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a2/2.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/3.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/3.bmp
new file mode 100755
index 0000000..a374206
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a2/3.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/4.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/4.bmp
new file mode 100755
index 0000000..37c4304
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a2/4.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/5.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/5.bmp
new file mode 100755
index 0000000..51f1acb
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a2/5.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/6.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/6.bmp
new file mode 100755
index 0000000..483043c
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a2/6.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/7.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/7.bmp
new file mode 100755
index 0000000..d99e779
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a2/7.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/8.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/8.bmp
new file mode 100755
index 0000000..223b87e
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a2/8.bmp
diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/9.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/9.bmp
new file mode 100755
index 0000000..088a0f5
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/bmp24/a2/9.bmp
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/1.gif b/DrawableObjectTests/IndividualFrames/gif/a1/1.gif
new file mode 100755
index 0000000..4a89216
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a1/1.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/2.gif b/DrawableObjectTests/IndividualFrames/gif/a1/2.gif
new file mode 100755
index 0000000..b5019d8
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a1/2.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/3.gif b/DrawableObjectTests/IndividualFrames/gif/a1/3.gif
new file mode 100755
index 0000000..a87ddc6
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a1/3.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/4.gif b/DrawableObjectTests/IndividualFrames/gif/a1/4.gif
new file mode 100755
index 0000000..2a398e6
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a1/4.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/5.gif b/DrawableObjectTests/IndividualFrames/gif/a1/5.gif
new file mode 100755
index 0000000..93e5b8d
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a1/5.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/6.gif b/DrawableObjectTests/IndividualFrames/gif/a1/6.gif
new file mode 100755
index 0000000..0e73825
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a1/6.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/7.gif b/DrawableObjectTests/IndividualFrames/gif/a1/7.gif
new file mode 100755
index 0000000..061669a
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a1/7.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/8.gif b/DrawableObjectTests/IndividualFrames/gif/a1/8.gif
new file mode 100755
index 0000000..90dcfda
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a1/8.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/9.gif b/DrawableObjectTests/IndividualFrames/gif/a1/9.gif
new file mode 100755
index 0000000..aa194d9
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a1/9.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/1.gif b/DrawableObjectTests/IndividualFrames/gif/a2/1.gif
new file mode 100755
index 0000000..09134f4
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a2/1.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/2.gif b/DrawableObjectTests/IndividualFrames/gif/a2/2.gif
new file mode 100755
index 0000000..d9ebbc2
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a2/2.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/3.gif b/DrawableObjectTests/IndividualFrames/gif/a2/3.gif
new file mode 100755
index 0000000..de17bd4
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a2/3.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/4.gif b/DrawableObjectTests/IndividualFrames/gif/a2/4.gif
new file mode 100755
index 0000000..87450de
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a2/4.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/5.gif b/DrawableObjectTests/IndividualFrames/gif/a2/5.gif
new file mode 100755
index 0000000..f95b8d9
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a2/5.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/6.gif b/DrawableObjectTests/IndividualFrames/gif/a2/6.gif
new file mode 100755
index 0000000..3462272
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a2/6.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/7.gif b/DrawableObjectTests/IndividualFrames/gif/a2/7.gif
new file mode 100755
index 0000000..ac5f084
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a2/7.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/8.gif b/DrawableObjectTests/IndividualFrames/gif/a2/8.gif
new file mode 100755
index 0000000..d9d3989
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a2/8.gif
diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/9.gif b/DrawableObjectTests/IndividualFrames/gif/a2/9.gif
new file mode 100755
index 0000000..bcdd274
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gif/a2/9.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/1.gif b/DrawableObjectTests/IndividualFrames/gift/a1/1.gif
new file mode 100755
index 0000000..2aad244
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a1/1.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/2.gif b/DrawableObjectTests/IndividualFrames/gift/a1/2.gif
new file mode 100755
index 0000000..ed22525
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a1/2.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/3.gif b/DrawableObjectTests/IndividualFrames/gift/a1/3.gif
new file mode 100755
index 0000000..246cd12
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a1/3.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/4.gif b/DrawableObjectTests/IndividualFrames/gift/a1/4.gif
new file mode 100755
index 0000000..722f240
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a1/4.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/5.gif b/DrawableObjectTests/IndividualFrames/gift/a1/5.gif
new file mode 100755
index 0000000..6a71348
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a1/5.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/6.gif b/DrawableObjectTests/IndividualFrames/gift/a1/6.gif
new file mode 100755
index 0000000..0dd2145
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a1/6.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/7.gif b/DrawableObjectTests/IndividualFrames/gift/a1/7.gif
new file mode 100755
index 0000000..1e9914b
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a1/7.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/8.gif b/DrawableObjectTests/IndividualFrames/gift/a1/8.gif
new file mode 100755
index 0000000..390124b
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a1/8.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/9.gif b/DrawableObjectTests/IndividualFrames/gift/a1/9.gif
new file mode 100755
index 0000000..61c8c3c
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a1/9.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/1.gif b/DrawableObjectTests/IndividualFrames/gift/a2/1.gif
new file mode 100755
index 0000000..a79f1e0
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a2/1.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/2.gif b/DrawableObjectTests/IndividualFrames/gift/a2/2.gif
new file mode 100755
index 0000000..b2579e3
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a2/2.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/3.gif b/DrawableObjectTests/IndividualFrames/gift/a2/3.gif
new file mode 100755
index 0000000..42f2c74
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a2/3.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/4.gif b/DrawableObjectTests/IndividualFrames/gift/a2/4.gif
new file mode 100755
index 0000000..61b944a
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a2/4.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/5.gif b/DrawableObjectTests/IndividualFrames/gift/a2/5.gif
new file mode 100755
index 0000000..865f4c7
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a2/5.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/6.gif b/DrawableObjectTests/IndividualFrames/gift/a2/6.gif
new file mode 100755
index 0000000..9fa7cf2
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a2/6.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/7.gif b/DrawableObjectTests/IndividualFrames/gift/a2/7.gif
new file mode 100755
index 0000000..d7627b2
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a2/7.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/8.gif b/DrawableObjectTests/IndividualFrames/gift/a2/8.gif
new file mode 100755
index 0000000..965acc1
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a2/8.gif
diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/9.gif b/DrawableObjectTests/IndividualFrames/gift/a2/9.gif
new file mode 100755
index 0000000..0509dad
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/gift/a2/9.gif
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/1.png b/DrawableObjectTests/IndividualFrames/png/a1/1.png
new file mode 100755
index 0000000..663ca83
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a1/1.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/2.png b/DrawableObjectTests/IndividualFrames/png/a1/2.png
new file mode 100755
index 0000000..6f44ab5
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a1/2.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/3.png b/DrawableObjectTests/IndividualFrames/png/a1/3.png
new file mode 100755
index 0000000..c49ab7e
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a1/3.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/4.png b/DrawableObjectTests/IndividualFrames/png/a1/4.png
new file mode 100755
index 0000000..63eb7e2
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a1/4.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/5.png b/DrawableObjectTests/IndividualFrames/png/a1/5.png
new file mode 100755
index 0000000..2aaa600
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a1/5.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/6.png b/DrawableObjectTests/IndividualFrames/png/a1/6.png
new file mode 100755
index 0000000..8fa9737
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a1/6.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/7.png b/DrawableObjectTests/IndividualFrames/png/a1/7.png
new file mode 100755
index 0000000..1de0311
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a1/7.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/8.png b/DrawableObjectTests/IndividualFrames/png/a1/8.png
new file mode 100755
index 0000000..7d6332a
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a1/8.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a1/9.png b/DrawableObjectTests/IndividualFrames/png/a1/9.png
new file mode 100755
index 0000000..5a8b0ea
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a1/9.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/1.png b/DrawableObjectTests/IndividualFrames/png/a2/1.png
new file mode 100755
index 0000000..98b3d72
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a2/1.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/2.png b/DrawableObjectTests/IndividualFrames/png/a2/2.png
new file mode 100755
index 0000000..6ec3dac
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a2/2.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/3.png b/DrawableObjectTests/IndividualFrames/png/a2/3.png
new file mode 100755
index 0000000..157dfc8
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a2/3.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/4.png b/DrawableObjectTests/IndividualFrames/png/a2/4.png
new file mode 100755
index 0000000..5719ab6
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a2/4.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/5.png b/DrawableObjectTests/IndividualFrames/png/a2/5.png
new file mode 100755
index 0000000..3cfd8a3
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a2/5.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/6.png b/DrawableObjectTests/IndividualFrames/png/a2/6.png
new file mode 100755
index 0000000..750ed8b
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a2/6.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/7.png b/DrawableObjectTests/IndividualFrames/png/a2/7.png
new file mode 100755
index 0000000..ce7756e
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a2/7.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/8.png b/DrawableObjectTests/IndividualFrames/png/a2/8.png
new file mode 100755
index 0000000..e28a906
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a2/8.png
diff --git a/DrawableObjectTests/IndividualFrames/png/a2/9.png b/DrawableObjectTests/IndividualFrames/png/a2/9.png
new file mode 100755
index 0000000..b6b2cd8
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/png/a2/9.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/1.png b/DrawableObjectTests/IndividualFrames/pngt/a1/1.png
new file mode 100755
index 0000000..dab1239
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a1/1.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/2.png b/DrawableObjectTests/IndividualFrames/pngt/a1/2.png
new file mode 100755
index 0000000..56312a7
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a1/2.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/3.png b/DrawableObjectTests/IndividualFrames/pngt/a1/3.png
new file mode 100755
index 0000000..4ceb540
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a1/3.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/4.png b/DrawableObjectTests/IndividualFrames/pngt/a1/4.png
new file mode 100755
index 0000000..38d640a
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a1/4.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/5.png b/DrawableObjectTests/IndividualFrames/pngt/a1/5.png
new file mode 100755
index 0000000..dcc14d4
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a1/5.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/6.png b/DrawableObjectTests/IndividualFrames/pngt/a1/6.png
new file mode 100755
index 0000000..cb2f933
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a1/6.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/7.png b/DrawableObjectTests/IndividualFrames/pngt/a1/7.png
new file mode 100755
index 0000000..497ed6f
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a1/7.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/8.png b/DrawableObjectTests/IndividualFrames/pngt/a1/8.png
new file mode 100755
index 0000000..693ac1e
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a1/8.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/9.png b/DrawableObjectTests/IndividualFrames/pngt/a1/9.png
new file mode 100755
index 0000000..e83b570
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a1/9.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/1.png b/DrawableObjectTests/IndividualFrames/pngt/a2/1.png
new file mode 100755
index 0000000..06f2b7c
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a2/1.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/2.png b/DrawableObjectTests/IndividualFrames/pngt/a2/2.png
new file mode 100755
index 0000000..f20ed10
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a2/2.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/3.png b/DrawableObjectTests/IndividualFrames/pngt/a2/3.png
new file mode 100755
index 0000000..6681f2e
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a2/3.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/4.png b/DrawableObjectTests/IndividualFrames/pngt/a2/4.png
new file mode 100755
index 0000000..ff3f0f1
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a2/4.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/5.png b/DrawableObjectTests/IndividualFrames/pngt/a2/5.png
new file mode 100755
index 0000000..1152066
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a2/5.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/6.png b/DrawableObjectTests/IndividualFrames/pngt/a2/6.png
new file mode 100755
index 0000000..458e680
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a2/6.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/7.png b/DrawableObjectTests/IndividualFrames/pngt/a2/7.png
new file mode 100755
index 0000000..4097b74
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a2/7.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/8.png b/DrawableObjectTests/IndividualFrames/pngt/a2/8.png
new file mode 100755
index 0000000..e6ee9b2
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a2/8.png
diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/9.png b/DrawableObjectTests/IndividualFrames/pngt/a2/9.png
new file mode 100755
index 0000000..314aabf
--- /dev/null
+++ b/DrawableObjectTests/IndividualFrames/pngt/a2/9.png
diff --git a/DrawableObjectTests/OneSheetPerAnimation/bmp16/1.bmp b/DrawableObjectTests/OneSheetPerAnimation/bmp16/1.bmp
new file mode 100755
index 0000000..9798a08
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/bmp16/1.bmp
diff --git a/DrawableObjectTests/OneSheetPerAnimation/bmp16/2.bmp b/DrawableObjectTests/OneSheetPerAnimation/bmp16/2.bmp
new file mode 100755
index 0000000..68ba0ba
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/bmp16/2.bmp
diff --git a/DrawableObjectTests/OneSheetPerAnimation/bmp16/text.txt b/DrawableObjectTests/OneSheetPerAnimation/bmp16/text.txt
new file mode 100755
index 0000000..dc66dbe
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/bmp16/text.txt
@@ -0,0 +1,2 @@
+anim1,0,8

+anim2,9,17
\ No newline at end of file
diff --git a/DrawableObjectTests/OneSheetPerAnimation/bmp24/1.bmp b/DrawableObjectTests/OneSheetPerAnimation/bmp24/1.bmp
new file mode 100755
index 0000000..7ff69f4
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/bmp24/1.bmp
diff --git a/DrawableObjectTests/OneSheetPerAnimation/bmp24/2.bmp b/DrawableObjectTests/OneSheetPerAnimation/bmp24/2.bmp
new file mode 100755
index 0000000..a771b04
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/bmp24/2.bmp
diff --git a/DrawableObjectTests/OneSheetPerAnimation/bmp24/text.txt b/DrawableObjectTests/OneSheetPerAnimation/bmp24/text.txt
new file mode 100755
index 0000000..dc66dbe
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/bmp24/text.txt
@@ -0,0 +1,2 @@
+anim1,0,8

+anim2,9,17
\ No newline at end of file
diff --git a/DrawableObjectTests/OneSheetPerAnimation/gif/1.gif b/DrawableObjectTests/OneSheetPerAnimation/gif/1.gif
new file mode 100755
index 0000000..223321b
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/gif/1.gif
diff --git a/DrawableObjectTests/OneSheetPerAnimation/gif/2.gif b/DrawableObjectTests/OneSheetPerAnimation/gif/2.gif
new file mode 100755
index 0000000..56c1a0f
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/gif/2.gif
diff --git a/DrawableObjectTests/OneSheetPerAnimation/gif/text.txt b/DrawableObjectTests/OneSheetPerAnimation/gif/text.txt
new file mode 100755
index 0000000..dc66dbe
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/gif/text.txt
@@ -0,0 +1,2 @@
+anim1,0,8

+anim2,9,17
\ No newline at end of file
diff --git a/DrawableObjectTests/OneSheetPerAnimation/gift/1.gif b/DrawableObjectTests/OneSheetPerAnimation/gift/1.gif
new file mode 100755
index 0000000..895ff39
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/gift/1.gif
diff --git a/DrawableObjectTests/OneSheetPerAnimation/gift/2.gif b/DrawableObjectTests/OneSheetPerAnimation/gift/2.gif
new file mode 100755
index 0000000..61d6302
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/gift/2.gif
diff --git a/DrawableObjectTests/OneSheetPerAnimation/gift/text.txt b/DrawableObjectTests/OneSheetPerAnimation/gift/text.txt
new file mode 100755
index 0000000..dc66dbe
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/gift/text.txt
@@ -0,0 +1,2 @@
+anim1,0,8

+anim2,9,17
\ No newline at end of file
diff --git a/DrawableObjectTests/OneSheetPerAnimation/png/1.png b/DrawableObjectTests/OneSheetPerAnimation/png/1.png
new file mode 100755
index 0000000..99f9800
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/png/1.png
diff --git a/DrawableObjectTests/OneSheetPerAnimation/png/2.png b/DrawableObjectTests/OneSheetPerAnimation/png/2.png
new file mode 100755
index 0000000..41b01d4
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/png/2.png
diff --git a/DrawableObjectTests/OneSheetPerAnimation/png/text.txt b/DrawableObjectTests/OneSheetPerAnimation/png/text.txt
new file mode 100755
index 0000000..dc66dbe
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/png/text.txt
@@ -0,0 +1,2 @@
+anim1,0,8

+anim2,9,17
\ No newline at end of file
diff --git a/DrawableObjectTests/OneSheetPerAnimation/pngt/1.png b/DrawableObjectTests/OneSheetPerAnimation/pngt/1.png
new file mode 100755
index 0000000..37d045a
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/pngt/1.png
diff --git a/DrawableObjectTests/OneSheetPerAnimation/pngt/2.png b/DrawableObjectTests/OneSheetPerAnimation/pngt/2.png
new file mode 100755
index 0000000..b7a00a1
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/pngt/2.png
diff --git a/DrawableObjectTests/OneSheetPerAnimation/pngt/text.txt b/DrawableObjectTests/OneSheetPerAnimation/pngt/text.txt
new file mode 100755
index 0000000..dc66dbe
--- /dev/null
+++ b/DrawableObjectTests/OneSheetPerAnimation/pngt/text.txt
@@ -0,0 +1,2 @@
+anim1,0,8

+anim2,9,17
\ No newline at end of file
diff --git a/DrawableObjectTests/Spritesheet.py b/DrawableObjectTests/Spritesheet.py
new file mode 100755
index 0000000..a16226c
--- /dev/null
+++ b/DrawableObjectTests/Spritesheet.py
@@ -0,0 +1,29 @@
+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):

+        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)
\ No newline at end of file
diff --git a/DrawableObjectTests/StaticDrawableObject.py b/DrawableObjectTests/StaticDrawableObject.py
new file mode 100755
index 0000000..6486eb2
--- /dev/null
+++ b/DrawableObjectTests/StaticDrawableObject.py
@@ -0,0 +1,32 @@
+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)

+

+

+