diff options
Diffstat (limited to 'Animation Styles')
142 files changed, 0 insertions, 771 deletions
diff --git a/Animation Styles/AnimatedSprite.py b/Animation Styles/AnimatedSprite.py deleted file mode 100755 index 6796600..0000000 --- a/Animation Styles/AnimatedSprite.py +++ /dev/null @@ -1,141 +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): - 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/Animation Styles/AnimatedSpriteTest.py b/Animation Styles/AnimatedSpriteTest.py deleted file mode 100755 index 1f8bbe5..0000000 --- a/Animation Styles/AnimatedSpriteTest.py +++ /dev/null @@ -1,317 +0,0 @@ -#! /usr/bin/env python -from AnimatedSprite import Spritesheet -from AnimatedSprite import AnimatedSprite -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 diff --git a/Animation Styles/AnimatedSpriteTest.py~ b/Animation Styles/AnimatedSpriteTest.py~ deleted file mode 100644 index 1aac3bb..0000000 --- a/Animation Styles/AnimatedSpriteTest.py~ +++ /dev/null @@ -1,289 +0,0 @@ -from AnimatedSprite import Spritesheet, AnimatedSprite -import sys, pygame, time -pygame.init() - -print "Animated Sprite Test - Authors Dave Silverman and Scott Mengel" - -#-------------------------------------------------------------- -#CONSTANTS AND VARIABLES - -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 - -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 -backgroundR = 152 -backgroundG = 0 -backgroundB = 152 -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"" -print "Testing 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 diff --git a/Animation Styles/AnimationPerLine/bmp16/Buttons.bmp b/Animation Styles/AnimationPerLine/bmp16/Buttons.bmp Binary files differdeleted file mode 100755 index 7edcb3c..0000000 --- a/Animation Styles/AnimationPerLine/bmp16/Buttons.bmp +++ /dev/null diff --git a/Animation Styles/AnimationPerLine/bmp16/text.txt b/Animation Styles/AnimationPerLine/bmp16/text.txt deleted file mode 100755 index dc66dbe..0000000 --- a/Animation Styles/AnimationPerLine/bmp16/text.txt +++ /dev/null @@ -1,2 +0,0 @@ -anim1,0,8
-anim2,9,17
\ No newline at end of file diff --git a/Animation Styles/AnimationPerLine/bmp24/Buttons.bmp b/Animation Styles/AnimationPerLine/bmp24/Buttons.bmp Binary files differdeleted file mode 100755 index a96ed6b..0000000 --- a/Animation Styles/AnimationPerLine/bmp24/Buttons.bmp +++ /dev/null diff --git a/Animation Styles/AnimationPerLine/bmp24/text.txt b/Animation Styles/AnimationPerLine/bmp24/text.txt deleted file mode 100755 index dc66dbe..0000000 --- a/Animation Styles/AnimationPerLine/bmp24/text.txt +++ /dev/null @@ -1,2 +0,0 @@ -anim1,0,8
-anim2,9,17
\ No newline at end of file diff --git a/Animation Styles/AnimationPerLine/gif/Buttons.gif b/Animation Styles/AnimationPerLine/gif/Buttons.gif Binary files differdeleted file mode 100755 index 8725ade..0000000 --- a/Animation Styles/AnimationPerLine/gif/Buttons.gif +++ /dev/null diff --git a/Animation Styles/AnimationPerLine/gif/text.txt b/Animation Styles/AnimationPerLine/gif/text.txt deleted file mode 100755 index dc66dbe..0000000 --- a/Animation Styles/AnimationPerLine/gif/text.txt +++ /dev/null @@ -1,2 +0,0 @@ -anim1,0,8
-anim2,9,17
\ No newline at end of file diff --git a/Animation Styles/AnimationPerLine/gift/Buttons.gif b/Animation Styles/AnimationPerLine/gift/Buttons.gif Binary files differdeleted file mode 100755 index 4be81f6..0000000 --- a/Animation Styles/AnimationPerLine/gift/Buttons.gif +++ /dev/null diff --git a/Animation Styles/AnimationPerLine/gift/text.txt b/Animation Styles/AnimationPerLine/gift/text.txt deleted file mode 100755 index dc66dbe..0000000 --- a/Animation Styles/AnimationPerLine/gift/text.txt +++ /dev/null @@ -1,2 +0,0 @@ -anim1,0,8
-anim2,9,17
\ No newline at end of file diff --git a/Animation Styles/AnimationPerLine/png/Buttons.png b/Animation Styles/AnimationPerLine/png/Buttons.png Binary files differdeleted file mode 100755 index 83bff0c..0000000 --- a/Animation Styles/AnimationPerLine/png/Buttons.png +++ /dev/null diff --git a/Animation Styles/AnimationPerLine/png/text.txt b/Animation Styles/AnimationPerLine/png/text.txt deleted file mode 100755 index dc66dbe..0000000 --- a/Animation Styles/AnimationPerLine/png/text.txt +++ /dev/null @@ -1,2 +0,0 @@ -anim1,0,8
-anim2,9,17
\ No newline at end of file diff --git a/Animation Styles/AnimationPerLine/pngt/Buttons.png b/Animation Styles/AnimationPerLine/pngt/Buttons.png Binary files differdeleted file mode 100755 index cb6766f..0000000 --- a/Animation Styles/AnimationPerLine/pngt/Buttons.png +++ /dev/null diff --git a/Animation Styles/AnimationPerLine/pngt/text.txt b/Animation Styles/AnimationPerLine/pngt/text.txt deleted file mode 100755 index dc66dbe..0000000 --- a/Animation Styles/AnimationPerLine/pngt/text.txt +++ /dev/null @@ -1,2 +0,0 @@ -anim1,0,8
-anim2,9,17
\ No newline at end of file diff --git a/Animation Styles/Buttons.psd b/Animation Styles/Buttons.psd Binary files differdeleted file mode 100755 index a1571e2..0000000 --- a/Animation Styles/Buttons.psd +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a1/1.bmp b/Animation Styles/IndividualFrames/bmp16/a1/1.bmp Binary files differdeleted file mode 100755 index 57630e3..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a1/1.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a1/2.bmp b/Animation Styles/IndividualFrames/bmp16/a1/2.bmp Binary files differdeleted file mode 100755 index 90af77a..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a1/2.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a1/3.bmp b/Animation Styles/IndividualFrames/bmp16/a1/3.bmp Binary files differdeleted file mode 100755 index 1751a4a..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a1/3.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a1/4.bmp b/Animation Styles/IndividualFrames/bmp16/a1/4.bmp Binary files differdeleted file mode 100755 index 1f292d1..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a1/4.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a1/5.bmp b/Animation Styles/IndividualFrames/bmp16/a1/5.bmp Binary files differdeleted file mode 100755 index fd8cc0e..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a1/5.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a1/6.bmp b/Animation Styles/IndividualFrames/bmp16/a1/6.bmp Binary files differdeleted file mode 100755 index df3a2eb..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a1/6.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a1/7.bmp b/Animation Styles/IndividualFrames/bmp16/a1/7.bmp Binary files differdeleted file mode 100755 index 51b0052..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a1/7.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a1/8.bmp b/Animation Styles/IndividualFrames/bmp16/a1/8.bmp Binary files differdeleted file mode 100755 index 9302c64..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a1/8.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a1/9.bmp b/Animation Styles/IndividualFrames/bmp16/a1/9.bmp Binary files differdeleted file mode 100755 index f5c6191..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a1/9.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a2/1.bmp b/Animation Styles/IndividualFrames/bmp16/a2/1.bmp Binary files differdeleted file mode 100755 index 4def064..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a2/1.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a2/2.bmp b/Animation Styles/IndividualFrames/bmp16/a2/2.bmp Binary files differdeleted file mode 100755 index 3750af4..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a2/2.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a2/3.bmp b/Animation Styles/IndividualFrames/bmp16/a2/3.bmp Binary files differdeleted file mode 100755 index 636c6f3..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a2/3.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a2/4.bmp b/Animation Styles/IndividualFrames/bmp16/a2/4.bmp Binary files differdeleted file mode 100755 index 646b407..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a2/4.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a2/5.bmp b/Animation Styles/IndividualFrames/bmp16/a2/5.bmp Binary files differdeleted file mode 100755 index 11a9bf5..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a2/5.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a2/6.bmp b/Animation Styles/IndividualFrames/bmp16/a2/6.bmp Binary files differdeleted file mode 100755 index ca1ba7b..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a2/6.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a2/7.bmp b/Animation Styles/IndividualFrames/bmp16/a2/7.bmp Binary files differdeleted file mode 100755 index 9375c15..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a2/7.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a2/8.bmp b/Animation Styles/IndividualFrames/bmp16/a2/8.bmp Binary files differdeleted file mode 100755 index 53b66f9..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a2/8.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp16/a2/9.bmp b/Animation Styles/IndividualFrames/bmp16/a2/9.bmp Binary files differdeleted file mode 100755 index 088558c..0000000 --- a/Animation Styles/IndividualFrames/bmp16/a2/9.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a1/1.bmp b/Animation Styles/IndividualFrames/bmp24/a1/1.bmp Binary files differdeleted file mode 100755 index e910cec..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a1/1.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a1/2.bmp b/Animation Styles/IndividualFrames/bmp24/a1/2.bmp Binary files differdeleted file mode 100755 index 0545f38..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a1/2.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a1/3.bmp b/Animation Styles/IndividualFrames/bmp24/a1/3.bmp Binary files differdeleted file mode 100755 index a154b29..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a1/3.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a1/4.bmp b/Animation Styles/IndividualFrames/bmp24/a1/4.bmp Binary files differdeleted file mode 100755 index 4ab21f9..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a1/4.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a1/5.bmp b/Animation Styles/IndividualFrames/bmp24/a1/5.bmp Binary files differdeleted file mode 100755 index 0a55d39..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a1/5.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a1/6.bmp b/Animation Styles/IndividualFrames/bmp24/a1/6.bmp Binary files differdeleted file mode 100755 index ad3f1b1..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a1/6.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a1/7.bmp b/Animation Styles/IndividualFrames/bmp24/a1/7.bmp Binary files differdeleted file mode 100755 index 915ab5b..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a1/7.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a1/8.bmp b/Animation Styles/IndividualFrames/bmp24/a1/8.bmp Binary files differdeleted file mode 100755 index b36287d..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a1/8.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a1/9.bmp b/Animation Styles/IndividualFrames/bmp24/a1/9.bmp Binary files differdeleted file mode 100755 index 2cab5a4..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a1/9.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a2/1.bmp b/Animation Styles/IndividualFrames/bmp24/a2/1.bmp Binary files differdeleted file mode 100755 index 1b41dff..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a2/1.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a2/2.bmp b/Animation Styles/IndividualFrames/bmp24/a2/2.bmp Binary files differdeleted file mode 100755 index 71cca69..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a2/2.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a2/3.bmp b/Animation Styles/IndividualFrames/bmp24/a2/3.bmp Binary files differdeleted file mode 100755 index a374206..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a2/3.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a2/4.bmp b/Animation Styles/IndividualFrames/bmp24/a2/4.bmp Binary files differdeleted file mode 100755 index 37c4304..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a2/4.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a2/5.bmp b/Animation Styles/IndividualFrames/bmp24/a2/5.bmp Binary files differdeleted file mode 100755 index 51f1acb..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a2/5.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a2/6.bmp b/Animation Styles/IndividualFrames/bmp24/a2/6.bmp Binary files differdeleted file mode 100755 index 483043c..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a2/6.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a2/7.bmp b/Animation Styles/IndividualFrames/bmp24/a2/7.bmp Binary files differdeleted file mode 100755 index d99e779..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a2/7.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a2/8.bmp b/Animation Styles/IndividualFrames/bmp24/a2/8.bmp Binary files differdeleted file mode 100755 index 223b87e..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a2/8.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/bmp24/a2/9.bmp b/Animation Styles/IndividualFrames/bmp24/a2/9.bmp Binary files differdeleted file mode 100755 index 088a0f5..0000000 --- a/Animation Styles/IndividualFrames/bmp24/a2/9.bmp +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a1/1.gif b/Animation Styles/IndividualFrames/gif/a1/1.gif Binary files differdeleted file mode 100755 index 4a89216..0000000 --- a/Animation Styles/IndividualFrames/gif/a1/1.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a1/2.gif b/Animation Styles/IndividualFrames/gif/a1/2.gif Binary files differdeleted file mode 100755 index b5019d8..0000000 --- a/Animation Styles/IndividualFrames/gif/a1/2.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a1/3.gif b/Animation Styles/IndividualFrames/gif/a1/3.gif Binary files differdeleted file mode 100755 index a87ddc6..0000000 --- a/Animation Styles/IndividualFrames/gif/a1/3.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a1/4.gif b/Animation Styles/IndividualFrames/gif/a1/4.gif Binary files differdeleted file mode 100755 index 2a398e6..0000000 --- a/Animation Styles/IndividualFrames/gif/a1/4.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a1/5.gif b/Animation Styles/IndividualFrames/gif/a1/5.gif Binary files differdeleted file mode 100755 index 93e5b8d..0000000 --- a/Animation Styles/IndividualFrames/gif/a1/5.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a1/6.gif b/Animation Styles/IndividualFrames/gif/a1/6.gif Binary files differdeleted file mode 100755 index 0e73825..0000000 --- a/Animation Styles/IndividualFrames/gif/a1/6.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a1/7.gif b/Animation Styles/IndividualFrames/gif/a1/7.gif Binary files differdeleted file mode 100755 index 061669a..0000000 --- a/Animation Styles/IndividualFrames/gif/a1/7.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a1/8.gif b/Animation Styles/IndividualFrames/gif/a1/8.gif Binary files differdeleted file mode 100755 index 90dcfda..0000000 --- a/Animation Styles/IndividualFrames/gif/a1/8.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a1/9.gif b/Animation Styles/IndividualFrames/gif/a1/9.gif Binary files differdeleted file mode 100755 index aa194d9..0000000 --- a/Animation Styles/IndividualFrames/gif/a1/9.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a2/1.gif b/Animation Styles/IndividualFrames/gif/a2/1.gif Binary files differdeleted file mode 100755 index 09134f4..0000000 --- a/Animation Styles/IndividualFrames/gif/a2/1.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a2/2.gif b/Animation Styles/IndividualFrames/gif/a2/2.gif Binary files differdeleted file mode 100755 index d9ebbc2..0000000 --- a/Animation Styles/IndividualFrames/gif/a2/2.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a2/3.gif b/Animation Styles/IndividualFrames/gif/a2/3.gif Binary files differdeleted file mode 100755 index de17bd4..0000000 --- a/Animation Styles/IndividualFrames/gif/a2/3.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a2/4.gif b/Animation Styles/IndividualFrames/gif/a2/4.gif Binary files differdeleted file mode 100755 index 87450de..0000000 --- a/Animation Styles/IndividualFrames/gif/a2/4.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a2/5.gif b/Animation Styles/IndividualFrames/gif/a2/5.gif Binary files differdeleted file mode 100755 index f95b8d9..0000000 --- a/Animation Styles/IndividualFrames/gif/a2/5.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a2/6.gif b/Animation Styles/IndividualFrames/gif/a2/6.gif Binary files differdeleted file mode 100755 index 3462272..0000000 --- a/Animation Styles/IndividualFrames/gif/a2/6.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a2/7.gif b/Animation Styles/IndividualFrames/gif/a2/7.gif Binary files differdeleted file mode 100755 index ac5f084..0000000 --- a/Animation Styles/IndividualFrames/gif/a2/7.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a2/8.gif b/Animation Styles/IndividualFrames/gif/a2/8.gif Binary files differdeleted file mode 100755 index d9d3989..0000000 --- a/Animation Styles/IndividualFrames/gif/a2/8.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gif/a2/9.gif b/Animation Styles/IndividualFrames/gif/a2/9.gif Binary files differdeleted file mode 100755 index bcdd274..0000000 --- a/Animation Styles/IndividualFrames/gif/a2/9.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a1/1.gif b/Animation Styles/IndividualFrames/gift/a1/1.gif Binary files differdeleted file mode 100755 index 2aad244..0000000 --- a/Animation Styles/IndividualFrames/gift/a1/1.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a1/2.gif b/Animation Styles/IndividualFrames/gift/a1/2.gif Binary files differdeleted file mode 100755 index ed22525..0000000 --- a/Animation Styles/IndividualFrames/gift/a1/2.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a1/3.gif b/Animation Styles/IndividualFrames/gift/a1/3.gif Binary files differdeleted file mode 100755 index 246cd12..0000000 --- a/Animation Styles/IndividualFrames/gift/a1/3.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a1/4.gif b/Animation Styles/IndividualFrames/gift/a1/4.gif Binary files differdeleted file mode 100755 index 722f240..0000000 --- a/Animation Styles/IndividualFrames/gift/a1/4.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a1/5.gif b/Animation Styles/IndividualFrames/gift/a1/5.gif Binary files differdeleted file mode 100755 index 6a71348..0000000 --- a/Animation Styles/IndividualFrames/gift/a1/5.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a1/6.gif b/Animation Styles/IndividualFrames/gift/a1/6.gif Binary files differdeleted file mode 100755 index 0dd2145..0000000 --- a/Animation Styles/IndividualFrames/gift/a1/6.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a1/7.gif b/Animation Styles/IndividualFrames/gift/a1/7.gif Binary files differdeleted file mode 100755 index 1e9914b..0000000 --- a/Animation Styles/IndividualFrames/gift/a1/7.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a1/8.gif b/Animation Styles/IndividualFrames/gift/a1/8.gif Binary files differdeleted file mode 100755 index 390124b..0000000 --- a/Animation Styles/IndividualFrames/gift/a1/8.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a1/9.gif b/Animation Styles/IndividualFrames/gift/a1/9.gif Binary files differdeleted file mode 100755 index 61c8c3c..0000000 --- a/Animation Styles/IndividualFrames/gift/a1/9.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a2/1.gif b/Animation Styles/IndividualFrames/gift/a2/1.gif Binary files differdeleted file mode 100755 index a79f1e0..0000000 --- a/Animation Styles/IndividualFrames/gift/a2/1.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a2/2.gif b/Animation Styles/IndividualFrames/gift/a2/2.gif Binary files differdeleted file mode 100755 index b2579e3..0000000 --- a/Animation Styles/IndividualFrames/gift/a2/2.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a2/3.gif b/Animation Styles/IndividualFrames/gift/a2/3.gif Binary files differdeleted file mode 100755 index 42f2c74..0000000 --- a/Animation Styles/IndividualFrames/gift/a2/3.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a2/4.gif b/Animation Styles/IndividualFrames/gift/a2/4.gif Binary files differdeleted file mode 100755 index 61b944a..0000000 --- a/Animation Styles/IndividualFrames/gift/a2/4.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a2/5.gif b/Animation Styles/IndividualFrames/gift/a2/5.gif Binary files differdeleted file mode 100755 index 865f4c7..0000000 --- a/Animation Styles/IndividualFrames/gift/a2/5.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a2/6.gif b/Animation Styles/IndividualFrames/gift/a2/6.gif Binary files differdeleted file mode 100755 index 9fa7cf2..0000000 --- a/Animation Styles/IndividualFrames/gift/a2/6.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a2/7.gif b/Animation Styles/IndividualFrames/gift/a2/7.gif Binary files differdeleted file mode 100755 index d7627b2..0000000 --- a/Animation Styles/IndividualFrames/gift/a2/7.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a2/8.gif b/Animation Styles/IndividualFrames/gift/a2/8.gif Binary files differdeleted file mode 100755 index 965acc1..0000000 --- a/Animation Styles/IndividualFrames/gift/a2/8.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/gift/a2/9.gif b/Animation Styles/IndividualFrames/gift/a2/9.gif Binary files differdeleted file mode 100755 index 0509dad..0000000 --- a/Animation Styles/IndividualFrames/gift/a2/9.gif +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a1/1.png b/Animation Styles/IndividualFrames/png/a1/1.png Binary files differdeleted file mode 100755 index 663ca83..0000000 --- a/Animation Styles/IndividualFrames/png/a1/1.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a1/2.png b/Animation Styles/IndividualFrames/png/a1/2.png Binary files differdeleted file mode 100755 index 6f44ab5..0000000 --- a/Animation Styles/IndividualFrames/png/a1/2.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a1/3.png b/Animation Styles/IndividualFrames/png/a1/3.png Binary files differdeleted file mode 100755 index c49ab7e..0000000 --- a/Animation Styles/IndividualFrames/png/a1/3.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a1/4.png b/Animation Styles/IndividualFrames/png/a1/4.png Binary files differdeleted file mode 100755 index 63eb7e2..0000000 --- a/Animation Styles/IndividualFrames/png/a1/4.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a1/5.png b/Animation Styles/IndividualFrames/png/a1/5.png Binary files differdeleted file mode 100755 index 2aaa600..0000000 --- a/Animation Styles/IndividualFrames/png/a1/5.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a1/6.png b/Animation Styles/IndividualFrames/png/a1/6.png Binary files differdeleted file mode 100755 index 8fa9737..0000000 --- a/Animation Styles/IndividualFrames/png/a1/6.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a1/7.png b/Animation Styles/IndividualFrames/png/a1/7.png Binary files differdeleted file mode 100755 index 1de0311..0000000 --- a/Animation Styles/IndividualFrames/png/a1/7.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a1/8.png b/Animation Styles/IndividualFrames/png/a1/8.png Binary files differdeleted file mode 100755 index 7d6332a..0000000 --- a/Animation Styles/IndividualFrames/png/a1/8.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a1/9.png b/Animation Styles/IndividualFrames/png/a1/9.png Binary files differdeleted file mode 100755 index 5a8b0ea..0000000 --- a/Animation Styles/IndividualFrames/png/a1/9.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a2/1.png b/Animation Styles/IndividualFrames/png/a2/1.png Binary files differdeleted file mode 100755 index 98b3d72..0000000 --- a/Animation Styles/IndividualFrames/png/a2/1.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a2/2.png b/Animation Styles/IndividualFrames/png/a2/2.png Binary files differdeleted file mode 100755 index 6ec3dac..0000000 --- a/Animation Styles/IndividualFrames/png/a2/2.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a2/3.png b/Animation Styles/IndividualFrames/png/a2/3.png Binary files differdeleted file mode 100755 index 157dfc8..0000000 --- a/Animation Styles/IndividualFrames/png/a2/3.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a2/4.png b/Animation Styles/IndividualFrames/png/a2/4.png Binary files differdeleted file mode 100755 index 5719ab6..0000000 --- a/Animation Styles/IndividualFrames/png/a2/4.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a2/5.png b/Animation Styles/IndividualFrames/png/a2/5.png Binary files differdeleted file mode 100755 index 3cfd8a3..0000000 --- a/Animation Styles/IndividualFrames/png/a2/5.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a2/6.png b/Animation Styles/IndividualFrames/png/a2/6.png Binary files differdeleted file mode 100755 index 750ed8b..0000000 --- a/Animation Styles/IndividualFrames/png/a2/6.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a2/7.png b/Animation Styles/IndividualFrames/png/a2/7.png Binary files differdeleted file mode 100755 index ce7756e..0000000 --- a/Animation Styles/IndividualFrames/png/a2/7.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a2/8.png b/Animation Styles/IndividualFrames/png/a2/8.png Binary files differdeleted file mode 100755 index e28a906..0000000 --- a/Animation Styles/IndividualFrames/png/a2/8.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/png/a2/9.png b/Animation Styles/IndividualFrames/png/a2/9.png Binary files differdeleted file mode 100755 index b6b2cd8..0000000 --- a/Animation Styles/IndividualFrames/png/a2/9.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a1/1.png b/Animation Styles/IndividualFrames/pngt/a1/1.png Binary files differdeleted file mode 100755 index dab1239..0000000 --- a/Animation Styles/IndividualFrames/pngt/a1/1.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a1/2.png b/Animation Styles/IndividualFrames/pngt/a1/2.png Binary files differdeleted file mode 100755 index 56312a7..0000000 --- a/Animation Styles/IndividualFrames/pngt/a1/2.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a1/3.png b/Animation Styles/IndividualFrames/pngt/a1/3.png Binary files differdeleted file mode 100755 index 4ceb540..0000000 --- a/Animation Styles/IndividualFrames/pngt/a1/3.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a1/4.png b/Animation Styles/IndividualFrames/pngt/a1/4.png Binary files differdeleted file mode 100755 index 38d640a..0000000 --- a/Animation Styles/IndividualFrames/pngt/a1/4.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a1/5.png b/Animation Styles/IndividualFrames/pngt/a1/5.png Binary files differdeleted file mode 100755 index dcc14d4..0000000 --- a/Animation Styles/IndividualFrames/pngt/a1/5.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a1/6.png b/Animation Styles/IndividualFrames/pngt/a1/6.png Binary files differdeleted file mode 100755 index cb2f933..0000000 --- a/Animation Styles/IndividualFrames/pngt/a1/6.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a1/7.png b/Animation Styles/IndividualFrames/pngt/a1/7.png Binary files differdeleted file mode 100755 index 497ed6f..0000000 --- a/Animation Styles/IndividualFrames/pngt/a1/7.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a1/8.png b/Animation Styles/IndividualFrames/pngt/a1/8.png Binary files differdeleted file mode 100755 index 693ac1e..0000000 --- a/Animation Styles/IndividualFrames/pngt/a1/8.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a1/9.png b/Animation Styles/IndividualFrames/pngt/a1/9.png Binary files differdeleted file mode 100755 index e83b570..0000000 --- a/Animation Styles/IndividualFrames/pngt/a1/9.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a2/1.png b/Animation Styles/IndividualFrames/pngt/a2/1.png Binary files differdeleted file mode 100755 index 06f2b7c..0000000 --- a/Animation Styles/IndividualFrames/pngt/a2/1.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a2/2.png b/Animation Styles/IndividualFrames/pngt/a2/2.png Binary files differdeleted file mode 100755 index f20ed10..0000000 --- a/Animation Styles/IndividualFrames/pngt/a2/2.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a2/3.png b/Animation Styles/IndividualFrames/pngt/a2/3.png Binary files differdeleted file mode 100755 index 6681f2e..0000000 --- a/Animation Styles/IndividualFrames/pngt/a2/3.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a2/4.png b/Animation Styles/IndividualFrames/pngt/a2/4.png Binary files differdeleted file mode 100755 index ff3f0f1..0000000 --- a/Animation Styles/IndividualFrames/pngt/a2/4.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a2/5.png b/Animation Styles/IndividualFrames/pngt/a2/5.png Binary files differdeleted file mode 100755 index 1152066..0000000 --- a/Animation Styles/IndividualFrames/pngt/a2/5.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a2/6.png b/Animation Styles/IndividualFrames/pngt/a2/6.png Binary files differdeleted file mode 100755 index 458e680..0000000 --- a/Animation Styles/IndividualFrames/pngt/a2/6.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a2/7.png b/Animation Styles/IndividualFrames/pngt/a2/7.png Binary files differdeleted file mode 100755 index 4097b74..0000000 --- a/Animation Styles/IndividualFrames/pngt/a2/7.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a2/8.png b/Animation Styles/IndividualFrames/pngt/a2/8.png Binary files differdeleted file mode 100755 index e6ee9b2..0000000 --- a/Animation Styles/IndividualFrames/pngt/a2/8.png +++ /dev/null diff --git a/Animation Styles/IndividualFrames/pngt/a2/9.png b/Animation Styles/IndividualFrames/pngt/a2/9.png Binary files differdeleted file mode 100755 index 314aabf..0000000 --- a/Animation Styles/IndividualFrames/pngt/a2/9.png +++ /dev/null diff --git a/Animation Styles/OneSheetPerAnimation/bmp16/1.bmp b/Animation Styles/OneSheetPerAnimation/bmp16/1.bmp Binary files differdeleted file mode 100755 index 9798a08..0000000 --- a/Animation Styles/OneSheetPerAnimation/bmp16/1.bmp +++ /dev/null diff --git a/Animation Styles/OneSheetPerAnimation/bmp16/2.bmp b/Animation Styles/OneSheetPerAnimation/bmp16/2.bmp Binary files differdeleted file mode 100755 index 68ba0ba..0000000 --- a/Animation Styles/OneSheetPerAnimation/bmp16/2.bmp +++ /dev/null diff --git a/Animation Styles/OneSheetPerAnimation/bmp16/text.txt b/Animation Styles/OneSheetPerAnimation/bmp16/text.txt deleted file mode 100755 index dc66dbe..0000000 --- a/Animation Styles/OneSheetPerAnimation/bmp16/text.txt +++ /dev/null @@ -1,2 +0,0 @@ -anim1,0,8
-anim2,9,17
\ No newline at end of file diff --git a/Animation Styles/OneSheetPerAnimation/bmp24/1.bmp b/Animation Styles/OneSheetPerAnimation/bmp24/1.bmp Binary files differdeleted file mode 100755 index 7ff69f4..0000000 --- a/Animation Styles/OneSheetPerAnimation/bmp24/1.bmp +++ /dev/null diff --git a/Animation Styles/OneSheetPerAnimation/bmp24/2.bmp b/Animation Styles/OneSheetPerAnimation/bmp24/2.bmp Binary files differdeleted file mode 100755 index a771b04..0000000 --- a/Animation Styles/OneSheetPerAnimation/bmp24/2.bmp +++ /dev/null diff --git a/Animation Styles/OneSheetPerAnimation/bmp24/text.txt b/Animation Styles/OneSheetPerAnimation/bmp24/text.txt deleted file mode 100755 index dc66dbe..0000000 --- a/Animation Styles/OneSheetPerAnimation/bmp24/text.txt +++ /dev/null @@ -1,2 +0,0 @@ -anim1,0,8
-anim2,9,17
\ No newline at end of file diff --git a/Animation Styles/OneSheetPerAnimation/gif/1.gif b/Animation Styles/OneSheetPerAnimation/gif/1.gif Binary files differdeleted file mode 100755 index 223321b..0000000 --- a/Animation Styles/OneSheetPerAnimation/gif/1.gif +++ /dev/null diff --git a/Animation Styles/OneSheetPerAnimation/gif/2.gif b/Animation Styles/OneSheetPerAnimation/gif/2.gif Binary files differdeleted file mode 100755 index 56c1a0f..0000000 --- a/Animation Styles/OneSheetPerAnimation/gif/2.gif +++ /dev/null diff --git a/Animation Styles/OneSheetPerAnimation/gif/text.txt b/Animation Styles/OneSheetPerAnimation/gif/text.txt deleted file mode 100755 index dc66dbe..0000000 --- a/Animation Styles/OneSheetPerAnimation/gif/text.txt +++ /dev/null @@ -1,2 +0,0 @@ -anim1,0,8
-anim2,9,17
\ No newline at end of file diff --git a/Animation Styles/OneSheetPerAnimation/gift/1.gif b/Animation Styles/OneSheetPerAnimation/gift/1.gif Binary files differdeleted file mode 100755 index 895ff39..0000000 --- a/Animation Styles/OneSheetPerAnimation/gift/1.gif +++ /dev/null diff --git a/Animation Styles/OneSheetPerAnimation/gift/2.gif b/Animation Styles/OneSheetPerAnimation/gift/2.gif Binary files differdeleted file mode 100755 index 61d6302..0000000 --- a/Animation Styles/OneSheetPerAnimation/gift/2.gif +++ /dev/null diff --git a/Animation Styles/OneSheetPerAnimation/gift/text.txt b/Animation Styles/OneSheetPerAnimation/gift/text.txt deleted file mode 100755 index dc66dbe..0000000 --- a/Animation Styles/OneSheetPerAnimation/gift/text.txt +++ /dev/null @@ -1,2 +0,0 @@ -anim1,0,8
-anim2,9,17
\ No newline at end of file diff --git a/Animation Styles/OneSheetPerAnimation/png/1.png b/Animation Styles/OneSheetPerAnimation/png/1.png Binary files differdeleted file mode 100755 index 99f9800..0000000 --- a/Animation Styles/OneSheetPerAnimation/png/1.png +++ /dev/null diff --git a/Animation Styles/OneSheetPerAnimation/png/2.png b/Animation Styles/OneSheetPerAnimation/png/2.png Binary files differdeleted file mode 100755 index 41b01d4..0000000 --- a/Animation Styles/OneSheetPerAnimation/png/2.png +++ /dev/null diff --git a/Animation Styles/OneSheetPerAnimation/png/text.txt b/Animation Styles/OneSheetPerAnimation/png/text.txt deleted file mode 100755 index dc66dbe..0000000 --- a/Animation Styles/OneSheetPerAnimation/png/text.txt +++ /dev/null @@ -1,2 +0,0 @@ -anim1,0,8
-anim2,9,17
\ No newline at end of file diff --git a/Animation Styles/OneSheetPerAnimation/pngt/1.png b/Animation Styles/OneSheetPerAnimation/pngt/1.png Binary files differdeleted file mode 100755 index 37d045a..0000000 --- a/Animation Styles/OneSheetPerAnimation/pngt/1.png +++ /dev/null diff --git a/Animation Styles/OneSheetPerAnimation/pngt/2.png b/Animation Styles/OneSheetPerAnimation/pngt/2.png Binary files differdeleted file mode 100755 index b7a00a1..0000000 --- a/Animation Styles/OneSheetPerAnimation/pngt/2.png +++ /dev/null diff --git a/Animation Styles/OneSheetPerAnimation/pngt/text.txt b/Animation Styles/OneSheetPerAnimation/pngt/text.txt deleted file mode 100755 index dc66dbe..0000000 --- a/Animation Styles/OneSheetPerAnimation/pngt/text.txt +++ /dev/null @@ -1,2 +0,0 @@ -anim1,0,8
-anim2,9,17
\ No newline at end of file |