diff options
author | slm <jtmengel@gmail.com> | 2010-08-05 04:56:35 (GMT) |
---|---|---|
committer | slm <jtmengel@gmail.com> | 2010-08-05 04:56:35 (GMT) |
commit | d64ea3c18599d3df0065b6466c90bbdf0411bd56 (patch) | |
tree | 2d230492a3558602b9841ff08ff4438647776f53 | |
parent | 3b059d14fd5de2efd69beef7a6b1e362bacb1dd8 (diff) |
Deleted depreciated directories of tests - finalized the prototype of the Drawable Object test to be included in the complete test kit.
931 files changed, 0 insertions, 4832 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 diff --git a/DrawableObjectTests/AnimatedSprite.py b/DrawableObjectTests/AnimatedSprite.py deleted file mode 100755 index 4f5c8ba..0000000 --- a/DrawableObjectTests/AnimatedSprite.py +++ /dev/null @@ -1,140 +0,0 @@ -import pygame - -class Spritesheet: - """ - Class from http://www.scriptedfun.com/transcript-2-using-sprite-sheets-and-drawing-the-background/ - - """ - def __init__(self, filename): - self.sheet = pygame.image.load(filename)#.convert() - - def imgat(self, rect): - rect = pygame.Rect(rect) - image = pygame.Surface(rect.size)#.convert() - image.blit(self.sheet, (0, 0), rect) - return image - - def imgsat(self, rects): - imgs = [] - for rect in rects: - imgs.append(self.imgat(rect)) - return imgs - - def img_extract( self, cols, rows, width, height ): - rect_list = [] - for y in range(0, rows): - for x in range(0, cols): - rect_list.append( (width*x, height*y, width, height) ) - return self.imgsat( rect_list) - - -class AnimatedSprite(pygame.sprite.Sprite): - """ - http://shinylittlething.com/2009/07/21/pygame-and-animated-sprites/ - """ - - def __init__(self,images,textfileName,fps = 10): - pygame.sprite.Sprite.__init__(self) - self._images = images - - # Track the time we started, and the time between updates. - # Then we can figure out when we have to switch the image. - self._start = pygame.time.get_ticks() - self._delay = 1000 / fps - self._last_update = 0 - self._frame = 0 - self.animations = {} - - if textfileName != '': - f = open(textfileName, 'r') - currentLine = f.readline() - while currentLine != '': - animValues = currentLine.split(",") - #This is a list called animations that at each position contains a list of two values. the first value is the start position - #of the given animation and the second is the end position of the given animation - self.animations[animValues[0]] = [int(animValues[1]), int(animValues[2])] - currentLine = f.readline() - - # Call update to set our first image. - #self.update(pygame.time.get_ticks()) - - def addImages(self, images): - - self._images.extend(images) - - def update(self, t): - # This method updates the animation in a situation where there is only one animation contained within the object. - - #calculates the amount of time that has passed since the last update - timePassed = t - self._last_update - #checks if enough time has passed that it would need to update the frame of the animation - if timePassed > self._delay: - #since enough time has passed, it will determine how many times the frame was supposed to change since the last update - frameChanges = int(timePassed/self._delay) - #goes to the frame that it should be at right now and skips any frames that would have already been over and done with - self._frame += frameChanges - #checks if the current frame is past the final frame and continues to check over and over until it is not - while self._frame >= len(self._images): - #since we are past the final frame it is now figuring out how many frames past the final frame we have actually gone - framesPast = self._frame - len(self._images) - #sets the current frame to the frame it should be at - self._frame = framesPast - 1 - #sets the current image to the image associated with the current frame - self.image = self._images[self._frame] - #sets the last update value to the current time so that at the next update the time change is accurate - self._last_update = t - - def updateAnimation(self, t, animName): - # This method updates the animation based on the start and end frame of the specific animation you are on. - #This means that if your object contains multiple animations, you can use this method to reference the exact - #animation that you are using. - - #calculates the amount of time that has passed since the last update - timePassed = t - self._last_update - #checks if enough time has passed that it would need to update the frame of the animation - if timePassed > self._delay: - #Checks to make sure that the current frame is actually set to a position within the animation - if self._frame < self.animations.get(animName)[0] or self._frame > self.animations.get(animName)[1]: - #corrects the position of the current frame - self._frame = self.animations.get(animName)[0] - #since enough time has passed, it will determine how many times the frame was supposed to change since the last update - frameChanges = int(timePassed/self._delay) - #goes to the frame that it should be at right now and skips any frames that would have already been over and done with - self._frame += frameChanges - #checks if the current frame is past the final frame of the current animation and continues to check over and over - #until it is not - while self._frame >= self.animations.get(animName)[1]: - #Determines how many frames past the final frame of the animation it is - framesPast = self._frame - self.animations.get(animName)[1] - #Sets the current frame to the frame it should be at - self._frame = framesPast - 1 + self.animations.get(animName)[0] - #sets the current image to the image associated with the current frame - self.image = self._images[self._frame] - #sets the last update value to the current time so that at the next update the time change is accurate - self._last_update = t - - def nextFrame(self): - # This definition is designed to simply move to the next frame. - # All of the other definitions only move to the nex frame if - # enough time has passed based on the framerate. With this - # definition I can go right to the next frame allowing me to - # see how fast a framerate I can get to and not be limited by - # what I define. - - self._frame += 1 - if self._frame >= len(self._images): - framesPast = self._frame - len(self._images) - self._frame = framesPast - self.image = self._images[self._frame] - - def nextAnimFrame(self, animName): - # This definition is designed to simply move to the next frame of the specified animation. - if self._frame < self.animations[animName][0]: - self._frame = self.animations[animName][0] - - self._frame += 1 - if self._frame > self.animations[animName][1]: - framesPast = self._frame - self.animations[animName][1] - self._frame = framesPast - 1 + self.animations[animName][0] - self.image = self._images[self._frame] - diff --git a/DrawableObjectTests/Buttons.psd b/DrawableObjectTests/Buttons.psd Binary files differdeleted file mode 100755 index a1571e2..0000000 --- a/DrawableObjectTests/Buttons.psd +++ /dev/null diff --git a/DrawableObjectTests/DrawableObjectMoveScaleTest.py b/DrawableObjectTests/DrawableObjectMoveScaleTest.py deleted file mode 100755 index c1bff71..0000000 --- a/DrawableObjectTests/DrawableObjectMoveScaleTest.py +++ /dev/null @@ -1,102 +0,0 @@ -#! /usr/bin/env python -from Spritesheet import Spritesheet -from DynamicDrawableObject import DynamicDrawableObject -from Scene import Scene -import pygame -import time -pygame.init() - -img={} -ft="" #filetype -r=0 #frame refreshes -i=1 #cycles images -SIZE = WIDTH, HEIGHT = 600,400 #screen sizes -t=0 #trial number - -BACKGROUNDR=152 -BACKGROUNDG=0 -BACKGROUNDB=152 - -screen = pygame.display.set_mode(SIZE) #Screen Set 600x400 - -screen.fill((BACKGROUNDR, BACKGROUNDG, BACKGROUNDB)) - -def blitAndFlip(): - screen.fill((BACKGROUNDR, BACKGROUNDG, BACKGROUNDB)) - cnt = 0 - while cnt < myScene.getListSize(): - - screen.blit(myScene.getObject(cnt).image, [myScene.getObject(cnt).getXPos(),myScene.getObject(cnt).getYPos()]) - cnt += 1 - - - pygame.display.flip() - -switch1 = [ - [pygame.image.load("%sa1/1%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/2%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/3%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/4%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/5%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/6%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/7%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/8%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/9%s"%("IndividualFrames/bmp16/",".bmp"))] -] - -switch3 = [ - [pygame.image.load("%sa1/1%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/2%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/3%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/4%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/5%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/6%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/7%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/8%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa1/9%s"%("IndividualFrames/bmp16/",".bmp"))] -] - -switch2 = [ - [pygame.image.load("%sa2/1%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa2/2%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa2/3%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa2/4%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa2/5%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa2/6%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa2/7%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa2/8%s"%("IndividualFrames/bmp16/",".bmp"))], - [pygame.image.load("%sa2/9%s"%("IndividualFrames/bmp16/",".bmp"))] -] - -dynamicObj = DynamicDrawableObject(switch1,'',1,39,3, 2, 2) -secondDynamicObj = DynamicDrawableObject(switch1,'',1,39,100, 3, 3) -staticObj = DynamicDrawableObject(switch2,'',1,40,43, 4, 4) - -initialList = [dynamicObj, secondDynamicObj] -secondaryList = [staticObj] - -myScene = Scene(initialList) -myScene.addObjects(secondaryList) - -myScene.nextFrame() -blitAndFlip() -time.sleep(2) -myScene.getObject(1).scale(100, 100) -myScene.getObject(1).nextFrame() -myScene.getObject(0).nextFrame() -myScene.getObject(2).nextFrame() -blitAndFlip() -time.sleep(2) -myScene.getObject(1).rotate(45) -myScene.getObject(1).nextFrame() -myScene.getObject(0).nextFrame() -myScene.getObject(2).nextFrame() -blitAndFlip() -time.sleep(2) -myScene.getObject(1).rotate(-45) -myScene.getObject(1).nextFrame() -myScene.getObject(0).nextFrame() -myScene.getObject(2).nextFrame() -blitAndFlip() -time.sleep(2) - diff --git a/DrawableObjectTests/DynamicDrawableObject.py b/DrawableObjectTests/DynamicDrawableObject.py deleted file mode 100755 index 3b3722d..0000000 --- a/DrawableObjectTests/DynamicDrawableObject.py +++ /dev/null @@ -1,89 +0,0 @@ -import pygame
-from DrawableObject import DrawableObject
-
-class DynamicDrawableObject(DrawableObject, pygame.sprite.Sprite):
-
- def __init__(self,images,textfileName,fps = 10, x = 0, y = 0, xVelocity = 0, yVelocity = 0):
-
- DrawableObject.__init__(self, images, textfileName, fps, x, y, xVelocity, yVelocity)
-
- def addImages(self, images):
-
- self._images.extend(images)
-
- def update(self, t):
-
- timePassed = t + self._last_update
- if timePassed > self._delay:
-
- self._frame += timePassed/self._delay
- while self._frame >= len(self._images):
-
- framesPast = self._frame - len(self._images)
- self._frame = framesPast - 1
-
- self.image = self._images[self._frame]
- self._last_update = timePassed%self._delay
- self._last_update = timePassed
-
- def updateCurrentAnimation(self, t):
-
- cnt = 0
- while cnt < len(animations):
-
- if animations[cnt] == self._current_anim:
-
- timePassed = t + self._last_update
- if timePassed > self._delay:
-
- if self._frame < self.animations.get(self._current_anim)[0] or self._frame > self.animations.get(self._current_anim)[1]: #checking if I am in the animation and putting me there if I am not
-
- self._frame = self.animations.get(self._current_anim)[0]
-
- self._frame += timePassed/self._delay
- while self._frame >= self.animations.get(self._current_anim)[1]:
-
- framesPast = self._frame - self.animations.get(self._current_anim)[1]
- self._frame = framesPast - 1 + self.animations.get(self._current_anim)[0]
-
- self.image = self._images[self._frame]
- self._last_update = timePassed%self._delay
- self._last_update = timePassed
-
- cnt = len(animations)
-
- cnt += 1
-
- def nextFrame(self):
-
- self._frame += 1
- if self._frame >= len(self._images):
-
- framesPast = self._frame - len(self._images)
- self._frame = framesPast
-
- self.image = self._images[self._frame]
-
- def nextCurrentAnimFrame(self):
-
- cnt = 0
- while cnt < len(animations):
-
- if animations[cnt] == self._current_anim:
-
- if self._frame < self.animations[self._current_anim][0] or self._frame > self.animations[self._current_anim][1]:
-
- self._frame = self.animations[self._current_anim][0]
- else:
- self._frame += 1
-
- if self._frame > self.animations[self._current_anim][1]:
-
- framesPast = self._frame - self.animations[self._current_anim][1]
- self._frame = framesPast - 1 + self.animations[self._current_anim][0]
-
- self.image = self._images[self._frame]
-
- cnt = len(anmiations)
-
- cnt += 1
diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/1.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/1.bmp Binary files differdeleted file mode 100755 index 57630e3..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a1/1.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/2.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/2.bmp Binary files differdeleted file mode 100755 index 90af77a..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a1/2.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/3.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/3.bmp Binary files differdeleted file mode 100755 index 1751a4a..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a1/3.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/4.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/4.bmp Binary files differdeleted file mode 100755 index 1f292d1..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a1/4.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/5.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/5.bmp Binary files differdeleted file mode 100755 index fd8cc0e..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a1/5.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/6.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/6.bmp Binary files differdeleted file mode 100755 index df3a2eb..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a1/6.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/7.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/7.bmp Binary files differdeleted file mode 100755 index 51b0052..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a1/7.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/8.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/8.bmp Binary files differdeleted file mode 100755 index 9302c64..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a1/8.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a1/9.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a1/9.bmp Binary files differdeleted file mode 100755 index f5c6191..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a1/9.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/1.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/1.bmp Binary files differdeleted file mode 100755 index 4def064..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a2/1.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/2.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/2.bmp Binary files differdeleted file mode 100755 index 3750af4..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a2/2.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/3.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/3.bmp Binary files differdeleted file mode 100755 index 636c6f3..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a2/3.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/4.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/4.bmp Binary files differdeleted file mode 100755 index 646b407..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a2/4.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/5.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/5.bmp Binary files differdeleted file mode 100755 index 11a9bf5..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a2/5.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/6.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/6.bmp Binary files differdeleted file mode 100755 index ca1ba7b..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a2/6.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/7.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/7.bmp Binary files differdeleted file mode 100755 index 9375c15..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a2/7.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/8.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/8.bmp Binary files differdeleted file mode 100755 index 53b66f9..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a2/8.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp16/a2/9.bmp b/DrawableObjectTests/IndividualFrames/bmp16/a2/9.bmp Binary files differdeleted file mode 100755 index 088558c..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp16/a2/9.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/1.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/1.bmp Binary files differdeleted file mode 100755 index e910cec..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a1/1.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/2.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/2.bmp Binary files differdeleted file mode 100755 index 0545f38..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a1/2.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/3.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/3.bmp Binary files differdeleted file mode 100755 index a154b29..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a1/3.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/4.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/4.bmp Binary files differdeleted file mode 100755 index 4ab21f9..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a1/4.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/5.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/5.bmp Binary files differdeleted file mode 100755 index 0a55d39..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a1/5.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/6.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/6.bmp Binary files differdeleted file mode 100755 index ad3f1b1..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a1/6.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/7.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/7.bmp Binary files differdeleted file mode 100755 index 915ab5b..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a1/7.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/8.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/8.bmp Binary files differdeleted file mode 100755 index b36287d..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a1/8.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a1/9.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a1/9.bmp Binary files differdeleted file mode 100755 index 2cab5a4..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a1/9.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/1.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/1.bmp Binary files differdeleted file mode 100755 index 1b41dff..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a2/1.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/2.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/2.bmp Binary files differdeleted file mode 100755 index 71cca69..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a2/2.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/3.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/3.bmp Binary files differdeleted file mode 100755 index a374206..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a2/3.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/4.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/4.bmp Binary files differdeleted file mode 100755 index 37c4304..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a2/4.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/5.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/5.bmp Binary files differdeleted file mode 100755 index 51f1acb..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a2/5.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/6.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/6.bmp Binary files differdeleted file mode 100755 index 483043c..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a2/6.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/7.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/7.bmp Binary files differdeleted file mode 100755 index d99e779..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a2/7.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/8.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/8.bmp Binary files differdeleted file mode 100755 index 223b87e..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a2/8.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/bmp24/a2/9.bmp b/DrawableObjectTests/IndividualFrames/bmp24/a2/9.bmp Binary files differdeleted file mode 100755 index 088a0f5..0000000 --- a/DrawableObjectTests/IndividualFrames/bmp24/a2/9.bmp +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/1.gif b/DrawableObjectTests/IndividualFrames/gif/a1/1.gif Binary files differdeleted file mode 100755 index 4a89216..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a1/1.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/2.gif b/DrawableObjectTests/IndividualFrames/gif/a1/2.gif Binary files differdeleted file mode 100755 index b5019d8..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a1/2.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/3.gif b/DrawableObjectTests/IndividualFrames/gif/a1/3.gif Binary files differdeleted file mode 100755 index a87ddc6..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a1/3.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/4.gif b/DrawableObjectTests/IndividualFrames/gif/a1/4.gif Binary files differdeleted file mode 100755 index 2a398e6..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a1/4.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/5.gif b/DrawableObjectTests/IndividualFrames/gif/a1/5.gif Binary files differdeleted file mode 100755 index 93e5b8d..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a1/5.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/6.gif b/DrawableObjectTests/IndividualFrames/gif/a1/6.gif Binary files differdeleted file mode 100755 index 0e73825..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a1/6.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/7.gif b/DrawableObjectTests/IndividualFrames/gif/a1/7.gif Binary files differdeleted file mode 100755 index 061669a..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a1/7.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/8.gif b/DrawableObjectTests/IndividualFrames/gif/a1/8.gif Binary files differdeleted file mode 100755 index 90dcfda..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a1/8.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a1/9.gif b/DrawableObjectTests/IndividualFrames/gif/a1/9.gif Binary files differdeleted file mode 100755 index aa194d9..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a1/9.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/1.gif b/DrawableObjectTests/IndividualFrames/gif/a2/1.gif Binary files differdeleted file mode 100755 index 09134f4..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a2/1.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/2.gif b/DrawableObjectTests/IndividualFrames/gif/a2/2.gif Binary files differdeleted file mode 100755 index d9ebbc2..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a2/2.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/3.gif b/DrawableObjectTests/IndividualFrames/gif/a2/3.gif Binary files differdeleted file mode 100755 index de17bd4..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a2/3.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/4.gif b/DrawableObjectTests/IndividualFrames/gif/a2/4.gif Binary files differdeleted file mode 100755 index 87450de..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a2/4.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/5.gif b/DrawableObjectTests/IndividualFrames/gif/a2/5.gif Binary files differdeleted file mode 100755 index f95b8d9..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a2/5.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/6.gif b/DrawableObjectTests/IndividualFrames/gif/a2/6.gif Binary files differdeleted file mode 100755 index 3462272..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a2/6.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/7.gif b/DrawableObjectTests/IndividualFrames/gif/a2/7.gif Binary files differdeleted file mode 100755 index ac5f084..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a2/7.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/8.gif b/DrawableObjectTests/IndividualFrames/gif/a2/8.gif Binary files differdeleted file mode 100755 index d9d3989..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a2/8.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gif/a2/9.gif b/DrawableObjectTests/IndividualFrames/gif/a2/9.gif Binary files differdeleted file mode 100755 index bcdd274..0000000 --- a/DrawableObjectTests/IndividualFrames/gif/a2/9.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/1.gif b/DrawableObjectTests/IndividualFrames/gift/a1/1.gif Binary files differdeleted file mode 100755 index 2aad244..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a1/1.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/2.gif b/DrawableObjectTests/IndividualFrames/gift/a1/2.gif Binary files differdeleted file mode 100755 index ed22525..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a1/2.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/3.gif b/DrawableObjectTests/IndividualFrames/gift/a1/3.gif Binary files differdeleted file mode 100755 index 246cd12..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a1/3.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/4.gif b/DrawableObjectTests/IndividualFrames/gift/a1/4.gif Binary files differdeleted file mode 100755 index 722f240..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a1/4.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/5.gif b/DrawableObjectTests/IndividualFrames/gift/a1/5.gif Binary files differdeleted file mode 100755 index 6a71348..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a1/5.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/6.gif b/DrawableObjectTests/IndividualFrames/gift/a1/6.gif Binary files differdeleted file mode 100755 index 0dd2145..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a1/6.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/7.gif b/DrawableObjectTests/IndividualFrames/gift/a1/7.gif Binary files differdeleted file mode 100755 index 1e9914b..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a1/7.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/8.gif b/DrawableObjectTests/IndividualFrames/gift/a1/8.gif Binary files differdeleted file mode 100755 index 390124b..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a1/8.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a1/9.gif b/DrawableObjectTests/IndividualFrames/gift/a1/9.gif Binary files differdeleted file mode 100755 index 61c8c3c..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a1/9.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/1.gif b/DrawableObjectTests/IndividualFrames/gift/a2/1.gif Binary files differdeleted file mode 100755 index a79f1e0..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a2/1.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/2.gif b/DrawableObjectTests/IndividualFrames/gift/a2/2.gif Binary files differdeleted file mode 100755 index b2579e3..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a2/2.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/3.gif b/DrawableObjectTests/IndividualFrames/gift/a2/3.gif Binary files differdeleted file mode 100755 index 42f2c74..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a2/3.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/4.gif b/DrawableObjectTests/IndividualFrames/gift/a2/4.gif Binary files differdeleted file mode 100755 index 61b944a..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a2/4.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/5.gif b/DrawableObjectTests/IndividualFrames/gift/a2/5.gif Binary files differdeleted file mode 100755 index 865f4c7..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a2/5.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/6.gif b/DrawableObjectTests/IndividualFrames/gift/a2/6.gif Binary files differdeleted file mode 100755 index 9fa7cf2..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a2/6.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/7.gif b/DrawableObjectTests/IndividualFrames/gift/a2/7.gif Binary files differdeleted file mode 100755 index d7627b2..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a2/7.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/8.gif b/DrawableObjectTests/IndividualFrames/gift/a2/8.gif Binary files differdeleted file mode 100755 index 965acc1..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a2/8.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/gift/a2/9.gif b/DrawableObjectTests/IndividualFrames/gift/a2/9.gif Binary files differdeleted file mode 100755 index 0509dad..0000000 --- a/DrawableObjectTests/IndividualFrames/gift/a2/9.gif +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a1/1.png b/DrawableObjectTests/IndividualFrames/png/a1/1.png Binary files differdeleted file mode 100755 index 663ca83..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a1/1.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a1/2.png b/DrawableObjectTests/IndividualFrames/png/a1/2.png Binary files differdeleted file mode 100755 index 6f44ab5..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a1/2.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a1/3.png b/DrawableObjectTests/IndividualFrames/png/a1/3.png Binary files differdeleted file mode 100755 index c49ab7e..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a1/3.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a1/4.png b/DrawableObjectTests/IndividualFrames/png/a1/4.png Binary files differdeleted file mode 100755 index 63eb7e2..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a1/4.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a1/5.png b/DrawableObjectTests/IndividualFrames/png/a1/5.png Binary files differdeleted file mode 100755 index 2aaa600..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a1/5.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a1/6.png b/DrawableObjectTests/IndividualFrames/png/a1/6.png Binary files differdeleted file mode 100755 index 8fa9737..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a1/6.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a1/7.png b/DrawableObjectTests/IndividualFrames/png/a1/7.png Binary files differdeleted file mode 100755 index 1de0311..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a1/7.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a1/8.png b/DrawableObjectTests/IndividualFrames/png/a1/8.png Binary files differdeleted file mode 100755 index 7d6332a..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a1/8.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a1/9.png b/DrawableObjectTests/IndividualFrames/png/a1/9.png Binary files differdeleted file mode 100755 index 5a8b0ea..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a1/9.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a2/1.png b/DrawableObjectTests/IndividualFrames/png/a2/1.png Binary files differdeleted file mode 100755 index 98b3d72..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a2/1.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a2/2.png b/DrawableObjectTests/IndividualFrames/png/a2/2.png Binary files differdeleted file mode 100755 index 6ec3dac..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a2/2.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a2/3.png b/DrawableObjectTests/IndividualFrames/png/a2/3.png Binary files differdeleted file mode 100755 index 157dfc8..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a2/3.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a2/4.png b/DrawableObjectTests/IndividualFrames/png/a2/4.png Binary files differdeleted file mode 100755 index 5719ab6..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a2/4.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a2/5.png b/DrawableObjectTests/IndividualFrames/png/a2/5.png Binary files differdeleted file mode 100755 index 3cfd8a3..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a2/5.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a2/6.png b/DrawableObjectTests/IndividualFrames/png/a2/6.png Binary files differdeleted file mode 100755 index 750ed8b..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a2/6.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a2/7.png b/DrawableObjectTests/IndividualFrames/png/a2/7.png Binary files differdeleted file mode 100755 index ce7756e..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a2/7.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a2/8.png b/DrawableObjectTests/IndividualFrames/png/a2/8.png Binary files differdeleted file mode 100755 index e28a906..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a2/8.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/png/a2/9.png b/DrawableObjectTests/IndividualFrames/png/a2/9.png Binary files differdeleted file mode 100755 index b6b2cd8..0000000 --- a/DrawableObjectTests/IndividualFrames/png/a2/9.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/1.png b/DrawableObjectTests/IndividualFrames/pngt/a1/1.png Binary files differdeleted file mode 100755 index dab1239..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a1/1.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/2.png b/DrawableObjectTests/IndividualFrames/pngt/a1/2.png Binary files differdeleted file mode 100755 index 56312a7..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a1/2.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/3.png b/DrawableObjectTests/IndividualFrames/pngt/a1/3.png Binary files differdeleted file mode 100755 index 4ceb540..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a1/3.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/4.png b/DrawableObjectTests/IndividualFrames/pngt/a1/4.png Binary files differdeleted file mode 100755 index 38d640a..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a1/4.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/5.png b/DrawableObjectTests/IndividualFrames/pngt/a1/5.png Binary files differdeleted file mode 100755 index dcc14d4..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a1/5.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/6.png b/DrawableObjectTests/IndividualFrames/pngt/a1/6.png Binary files differdeleted file mode 100755 index cb2f933..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a1/6.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/7.png b/DrawableObjectTests/IndividualFrames/pngt/a1/7.png Binary files differdeleted file mode 100755 index 497ed6f..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a1/7.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/8.png b/DrawableObjectTests/IndividualFrames/pngt/a1/8.png Binary files differdeleted file mode 100755 index 693ac1e..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a1/8.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a1/9.png b/DrawableObjectTests/IndividualFrames/pngt/a1/9.png Binary files differdeleted file mode 100755 index e83b570..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a1/9.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/1.png b/DrawableObjectTests/IndividualFrames/pngt/a2/1.png Binary files differdeleted file mode 100755 index 06f2b7c..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a2/1.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/2.png b/DrawableObjectTests/IndividualFrames/pngt/a2/2.png Binary files differdeleted file mode 100755 index f20ed10..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a2/2.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/3.png b/DrawableObjectTests/IndividualFrames/pngt/a2/3.png Binary files differdeleted file mode 100755 index 6681f2e..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a2/3.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/4.png b/DrawableObjectTests/IndividualFrames/pngt/a2/4.png Binary files differdeleted file mode 100755 index ff3f0f1..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a2/4.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/5.png b/DrawableObjectTests/IndividualFrames/pngt/a2/5.png Binary files differdeleted file mode 100755 index 1152066..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a2/5.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/6.png b/DrawableObjectTests/IndividualFrames/pngt/a2/6.png Binary files differdeleted file mode 100755 index 458e680..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a2/6.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/7.png b/DrawableObjectTests/IndividualFrames/pngt/a2/7.png Binary files differdeleted file mode 100755 index 4097b74..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a2/7.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/8.png b/DrawableObjectTests/IndividualFrames/pngt/a2/8.png Binary files differdeleted file mode 100755 index e6ee9b2..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a2/8.png +++ /dev/null diff --git a/DrawableObjectTests/IndividualFrames/pngt/a2/9.png b/DrawableObjectTests/IndividualFrames/pngt/a2/9.png Binary files differdeleted file mode 100755 index 314aabf..0000000 --- a/DrawableObjectTests/IndividualFrames/pngt/a2/9.png +++ /dev/null diff --git a/DrawableObjectTests/Scene.py b/DrawableObjectTests/Scene.py deleted file mode 100644 index 959fd87..0000000 --- a/DrawableObjectTests/Scene.py +++ /dev/null @@ -1,165 +0,0 @@ -import pygame
-
-class Scene:
-
- def __init__(self, drawableObjects):
-
- self._my_Objects = []
-
- cnt = 0
- while cnt < len(drawableObjects):
- self._my_Objects.append([drawableObjects[cnt],drawableObjects[cnt].getXPos(),drawableObjects[cnt].getYPos()])
- cnt += 1
-
- self.xPos = 0
- self.yPos = 0
- self.xSize = 0
- self.ySize = 0
-
- self.calcPosition()
- self.calcSize()
- self.setRelativePositions()
-
- def calcPosition(self):
-
- lowestX = 9000
- lowestY = 9000
-
- cnt = 0
- while cnt < len(self._my_Objects):
- if self._my_Objects[cnt][0].getXPos() < lowestX: lowestX = self._my_Objects[cnt][0].getXPos()
- if self._my_Objects[cnt][0].getYPos() < lowestY: lowestY = self._my_Objects[cnt][0].getYPos()
- cnt += 1
-
- self.xPos = lowestX
- self.yPos = lowestY
-
- def calcSize(self):
-
- highestX = 0
- highestY = 0
-
- cnt = 0
- while cnt < len(self._my_Objects):
- if self._my_Objects[cnt][0].getXPos() + self._my_Objects[cnt][0].getXSize() > highestX: highestX = self._my_Objects[cnt][0].getXPos() + self._my_Objects[cnt][0].getXSize()
- if self._my_Objects[cnt][0].getYPos() + self._my_Objects[cnt][0].getYSize() > highestY: highestY = self._my_Objects[cnt][0].getYPos() + self._my_Objects[cnt][0].getYSize()
- cnt += 1
-
- self.xSize = highestX - self.xPos
- self.ySize = highestY - self.yPos
-
- def addObjects(self, newDrawableObjects):
-
- cnt = 0
- while cnt < len(newDrawableObjects):
- self._my_Objects.append([newDrawableObjects[cnt],newDrawableObjects[cnt].getXPos(),newDrawableObjects[cnt].getYPos()])
- cnt += 1
-
- self.calcPosition()
- self.calcSize()
- self.setRelativePositions()
-
- def setRelativePositions(self):
-
- cnt = 0
- while cnt < len(self._my_Objects):
- self._my_Objects[cnt][1] = self._my_Objects[cnt][1] - self.xPos
- self._my_Objects[cnt][2] = self._my_Objects[cnt][2] - self.yPos
- cnt += 1
-
- def removeObject(self, index):
-
- if index < len(self._my_Objects): del self._my_Objects[index]
-
- def getObject(self, index):
-
- if index < len(self._my_Objects):
- return self._my_Objects[index][0]
-
- def getListSize(self):
- return len(self._my_Objects)
-
- def moveObjects(self):
-
- cnt = 0
- while cnt < len(self._my_Objects):
-
- self._my_Objects[cnt][0].move()
- cnt += 1
-
- self.calcPosition()
- self.calcSize()
- self.setRelativePositions()
-
- def moveScene(self, xNudge = 0, yNudge = 0):
-
- cnt = 0
- while cnt < len(self._my_Objects):
-
- self._my_Objects[cnt][0].nudge(xNudge, yNudge)
- cnt += 1
-
- self.calcPosition()
-
- def setPosition(self, newXPos = None, newYPos = None):
-
- if newXPos != None: self.xPos = newXPos
- if newYPos != None: self.yPos = newYPos
-
- cnt = 0
- while cnt < len(self._my_Objects):
-
- self._my_Objects[cnt][0].setPosition(self.xPos + self._my_Objects[cnt][1], self.yPos + self._my_Objects[cnt][2])
- cnt += 1
-
- def getXPos(self):
- return self.xPos
-
- def getYPos(self):
- return self.yPos
-
- def getXSize(self):
- return self.xSize
-
- def getYSize(self):
- return self.ySize
-
- def scaleObjects(self, newXSize = None, newYSize = None):
-
- cnt = 0
- while cnt < len(self._my_Objects):
- self._my_Objects[cnt][0].scale(newXSize, newYSize)
- cnt += 1
-
- def scaleScene(self, newXSize = None, newYSize = None):
-
- xScale = 1
- yScale = 1
-
- if newXSize != None: xScale = (newXSize * 1.0)/self.xSize
- if newYSize != None: yScale = (newYSize * 1.0)/self.ySize
-
- cnt = 0
- while cnt < len(self._my_Objects):
- self._my_Objects[cnt][0].scale(xScale * self._my_Objects[cnt][0].getXSize(), yScale * self._my_Objects[cnt][0].getYSize())
- self._my_Objects[cnt][1] = xScale * self._my_Objects[cnt][1]
- self._my_Objects[cnt][2] = yScale * self._my_Objects[cnt][2]
- cnt += 1
-
- self.setPosition()
-
- def updateAnimations(self, t):
-
- cnt = 0
- while cnt < len(self._my_Objects):
-
- self._my_Objects[cnt][0].updateCurrentAnimation(t)
- cnt += 1
-
- def nextFrame(self):
-
- cnt = 0
- while cnt < len(self._my_Objects):
-
- self._my_Objects[cnt][0].nextFrame()
- cnt += 1
diff --git a/DrawableObjectTests/Spritesheet.py b/DrawableObjectTests/Spritesheet.py deleted file mode 100755 index ddb18a8..0000000 --- a/DrawableObjectTests/Spritesheet.py +++ /dev/null @@ -1,31 +0,0 @@ -import pygame
-
-class Spritesheet:
- """
- Class from http://www.scriptedfun.com/transcript-2-using-sprite-sheets-and-drawing-the-background/
-
- This class can be used to seporate images from the sprite sheet
- """
- def __init__(self, filename):
- self.sheet = pygame.image.load(filename).convert()
-
- def imgat(self, rect, myColorKey = None):
- rect = pygame.Rect(rect)
- image = pygame.Surface(rect.size).convert()
- if myColorKey == None: myColorKey = image.get_at((0,0))
- image.set_colorkey(myColorKey)
- image.blit(self.sheet, (0, 0), rect)
- return image
-
- def imgsat(self, rects, myColorKey = None):
- imgs = []
- for rect in rects:
- imgs.append(self.imgat(rect, myColorKey))
- return imgs
-
- def img_extract( self, cols, rows, width, height, myColorKey = None):
- rect_list = []
- for y in range(0, rows):
- for x in range(0, cols):
- rect_list.append( (width*x, height*y, width, height,) )
- return self.imgsat( rect_list, myColorKey)
\ No newline at end of file diff --git a/DrawableObjectTests/StaticDrawableObject.py b/DrawableObjectTests/StaticDrawableObject.py deleted file mode 100755 index 6486eb2..0000000 --- a/DrawableObjectTests/StaticDrawableObject.py +++ /dev/null @@ -1,32 +0,0 @@ -import pygame
-from DrawableObject import DrawableObject
-
-class StaticDrawableObject(pygame.sprite.Sprite):
-
- def __init __(self,images,textfileName,fps = 10):
- pygame.sprite.Sprite.__init__(self)
- self._images = images
-
- self._start = pygame.time.get_ticks()
- self._delay = 1000 / fps
- self._last_update = 0
- self._frame = 0
- self.animations = {}
-
- if textfileName != '':
-
- f = open(textfileName, 'r')
- currentLine = f.readline()
- while currentLine != '':
-
- animValues = currentLine.split(",")
- self.animations[animValues[0]] = [int(animValues[1]), int(animValues[2])]
- currentLine = f.readline()
-
-
- def addImages(self, images):
-
- self._images.extend(images)
-
-
-
diff --git a/anim/completeTest/fileTypeTests.py b/anim/completeTest/fileTypeTests.py deleted file mode 100755 index f770b45..0000000 --- a/anim/completeTest/fileTypeTests.py +++ /dev/null @@ -1,51 +0,0 @@ -#! /usr/bin/env python -#import sys - - -print "\n\nWelcome to the master File Type Tester Interface" -print "Authors: Scott 'JT' Mengel and Dave Silverman" -print "\nPlease select the test(s) you want to run in the order you want to run them." -print "Enter 'Exit' into the prompt to close the program. (NOTE: not working yet)\n" -print "0. Run all tests" -print "1. Simple File Type Variety Test, as images (NOTE: not working yet)" -print "2. Simple File Type variety Test, as sprites (NOTE: not working yet)" -print "3. Selected Scalability Test (NOTE: not working yet)" - -file=open('./testresult.csv','a') -i=int(1) -keyIn="temp val" - - -#= .image() Animation Test ======== -#- test --------------------------- -def imgTest(): - print "imgTest" - - -#= .sprite() Animation Test ======= -#- test --------------------------- -def spriteTest(): - print "spriteTest" - - -#= Scalability Test =============== -#- test --------------------------- -def scaleTest(): - print "scaleTest" - - -#= Super (every) Test ============= -#- test --------------------------- -def superTest(): - print "superTest" - -list=[superTest,imgTest, spriteTest, scaleTest] - -while True: - keyIn=raw_input(">") - - try: - temp = int(keyIn) - list[temp]() - except: - break diff --git a/anim/completeTest/ioexample.py b/anim/completeTest/ioexample.py deleted file mode 100755 index 020e09e..0000000 --- a/anim/completeTest/ioexample.py +++ /dev/null @@ -1,20 +0,0 @@ -#! /usr/bin/env python -# -print "\nWelcome to the master File Type Tester Interface" -print "Authors: Scott 'JT' Mengel and Dave Silverman" -print "\nPlease select the test(s) you want to run, in the order you want to run them, seperated by commas.\n" -print "1. Simple File Type Variety Test, as images" -print "2. Simple File Type variety Test, as sprites" -print "3. Selected Scalability Test" -file=open('./localfile','a') -keyIn=0 - -while 1: - try: - keyIn = int(raw_input(">")) - print "You have selected %i"%keyIn - file.seek(5) - file.write("File Accessed!%s"%str(keyIn)) - break - except ValueError: - print "Error: out of bounds." diff --git a/anim/completeTest/localfile b/anim/completeTest/localfile deleted file mode 100644 index 4f70f41..0000000 --- a/anim/completeTest/localfile +++ /dev/null @@ -1 +0,0 @@ -File Accessed!1
\ No newline at end of file diff --git a/anim/completeTest/testresult.csv b/anim/completeTest/testresult.csv deleted file mode 100644 index e69de29..0000000 --- a/anim/completeTest/testresult.csv +++ /dev/null diff --git a/anim/spriteTest.py b/anim/spriteTest.py deleted file mode 100755 index c06596a..0000000 --- a/anim/spriteTest.py +++ /dev/null @@ -1,109 +0,0 @@ -#! /usr/bin/env python -import sys, pygame, time -pygame.init() - -print "Full Test - Authors Dave Silverman and Scott Mengel" -print "Set size to 600 x 400 px" -print "Running..." - -#-------------------------------------------------------------- -#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 n -colorkey=(255, 152, 0) - -ftArr=[ ["bmp","BMPs 16-Bits/"] , ["bmp","BMPs 24-Bits/"] , ["bmp","BMPs 32-Bits/"] , ["gif","GIFs/"] , ["gif","GIFs Transparent/"] , ["jpg","JPGs 1Low/"] , ["jpg","JPGs 2Medium/"] , ["jpg","JPGs 3High/"] , ["jpg","JPGs 4Max/"] , ["png","PNGs Indexed/"] , ["png","PNGs Transparent/"] ] - -screen = pygame.display.set_mode(size) #Screen Set 600x400 -background = 152, 251, 152 # pale green - -#The switch function -#------------------------------------------------------------- -def chngImg(): - cnt=make - while cnt>0: - switcher = { - 1: pygame.image.load("%s2 Button.%s"%(ft[1],ft[0])), - 2: pygame.image.load("%s3 Button.%s"%(ft[1],ft[0])), - 3: pygame.image.load("%s4 Button.%s"%(ft[1],ft[0])), - 4: pygame.image.load("%s5 Button.%s"%(ft[1],ft[0])), - 5: pygame.image.load("%s6 Button.%s"%(ft[1],ft[0])), - 6: pygame.image.load("%s7 Button.%s"%(ft[1],ft[0])), - 7: pygame.image.load("%s8 Button.%s"%(ft[1],ft[0])), - 8: pygame.image.load("%s9 Button.%s"%(ft[1],ft[0])), - 9: pygame.image.load("%s1 Button.%s"%(ft[1],ft[0])) - } - img[cnt,0]=switcher.get(i,pygame.image.load("%s1 Button.%s"%(ft[1],ft[0]))) - #img[cnt,0].set_colorkey(colorkey, pygame.RLEACCEL) - cnt=cnt-1 -#----------------------------------------------------------------- -#Collision detection - -def collision(): - cnt=make - while cnt>0: - if img[cnt,1].left < 0 or img[cnt,1].right > width: - img[cnt,2]=[ -img[cnt,2][0], img[cnt,2][1] ] - if img[cnt,1].top < 0 or img[cnt,1].bottom > height: - img[cnt,2]=[ img[cnt,2][0], -img[cnt,2][1] ] - img[cnt,1] = img[cnt,1].move(img[cnt,2]) - screen.blit(img[cnt,0],img[cnt,1]) - cnt=cnt-1 - pygame.display.flip() -#----------------------------------------------------------------- -#----------------------------------------------------------------- -#----------------------------------------------------------------- -#----------------------------------------------------------------- -while 1: - cnt=make - ft=ftArr[t] - print "Testing "+ft[1]+"N Button."+ft[0] - trial=5 - while trial>0: - while cnt>0: - img[cnt,0]= pygame.image.load("%s1 Button.%s"%(ft[1],ft[0])) #image.load - img[cnt,1]= img[cnt,0].get_rect() - img[cnt,2]= [2,2] #speed - m=cnt*40 # named m cause i wanted some m&ms - img[cnt,1]=img[cnt,1].move(m,m) #see? it wasn't as tastey though - cnt=cnt-1 - r=0 - start=time.time() -# ----------------------------------------------------------------- - while 1: - chngImg() - i=i+1 - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - -# speed1=collision(ballrect1,speed1) -# ballrect1 = ballrect1.move(speed1) - - collision() - screen.fill(background) - -# cnt=make -# while cnt>0: -# screen.blit(ball1, ballrect1) -# screen.blit(img[cnt,0],img[cnt,1]) -# cnt=cnt-1 -# -# pygame.display.flip() - - r=r+1 - if r>500: break - -# ----------------------------------------------------------------- -# ----------------------------------------------------------------- - - print 1/((time.time()-start)/r) - trial=trial-1 - t=t+1 diff --git a/anim/test.py b/anim/test.py deleted file mode 100755 index c06596a..0000000 --- a/anim/test.py +++ /dev/null @@ -1,109 +0,0 @@ -#! /usr/bin/env python -import sys, pygame, time -pygame.init() - -print "Full Test - Authors Dave Silverman and Scott Mengel" -print "Set size to 600 x 400 px" -print "Running..." - -#-------------------------------------------------------------- -#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 n -colorkey=(255, 152, 0) - -ftArr=[ ["bmp","BMPs 16-Bits/"] , ["bmp","BMPs 24-Bits/"] , ["bmp","BMPs 32-Bits/"] , ["gif","GIFs/"] , ["gif","GIFs Transparent/"] , ["jpg","JPGs 1Low/"] , ["jpg","JPGs 2Medium/"] , ["jpg","JPGs 3High/"] , ["jpg","JPGs 4Max/"] , ["png","PNGs Indexed/"] , ["png","PNGs Transparent/"] ] - -screen = pygame.display.set_mode(size) #Screen Set 600x400 -background = 152, 251, 152 # pale green - -#The switch function -#------------------------------------------------------------- -def chngImg(): - cnt=make - while cnt>0: - switcher = { - 1: pygame.image.load("%s2 Button.%s"%(ft[1],ft[0])), - 2: pygame.image.load("%s3 Button.%s"%(ft[1],ft[0])), - 3: pygame.image.load("%s4 Button.%s"%(ft[1],ft[0])), - 4: pygame.image.load("%s5 Button.%s"%(ft[1],ft[0])), - 5: pygame.image.load("%s6 Button.%s"%(ft[1],ft[0])), - 6: pygame.image.load("%s7 Button.%s"%(ft[1],ft[0])), - 7: pygame.image.load("%s8 Button.%s"%(ft[1],ft[0])), - 8: pygame.image.load("%s9 Button.%s"%(ft[1],ft[0])), - 9: pygame.image.load("%s1 Button.%s"%(ft[1],ft[0])) - } - img[cnt,0]=switcher.get(i,pygame.image.load("%s1 Button.%s"%(ft[1],ft[0]))) - #img[cnt,0].set_colorkey(colorkey, pygame.RLEACCEL) - cnt=cnt-1 -#----------------------------------------------------------------- -#Collision detection - -def collision(): - cnt=make - while cnt>0: - if img[cnt,1].left < 0 or img[cnt,1].right > width: - img[cnt,2]=[ -img[cnt,2][0], img[cnt,2][1] ] - if img[cnt,1].top < 0 or img[cnt,1].bottom > height: - img[cnt,2]=[ img[cnt,2][0], -img[cnt,2][1] ] - img[cnt,1] = img[cnt,1].move(img[cnt,2]) - screen.blit(img[cnt,0],img[cnt,1]) - cnt=cnt-1 - pygame.display.flip() -#----------------------------------------------------------------- -#----------------------------------------------------------------- -#----------------------------------------------------------------- -#----------------------------------------------------------------- -while 1: - cnt=make - ft=ftArr[t] - print "Testing "+ft[1]+"N Button."+ft[0] - trial=5 - while trial>0: - while cnt>0: - img[cnt,0]= pygame.image.load("%s1 Button.%s"%(ft[1],ft[0])) #image.load - img[cnt,1]= img[cnt,0].get_rect() - img[cnt,2]= [2,2] #speed - m=cnt*40 # named m cause i wanted some m&ms - img[cnt,1]=img[cnt,1].move(m,m) #see? it wasn't as tastey though - cnt=cnt-1 - r=0 - start=time.time() -# ----------------------------------------------------------------- - while 1: - chngImg() - i=i+1 - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - -# speed1=collision(ballrect1,speed1) -# ballrect1 = ballrect1.move(speed1) - - collision() - screen.fill(background) - -# cnt=make -# while cnt>0: -# screen.blit(ball1, ballrect1) -# screen.blit(img[cnt,0],img[cnt,1]) -# cnt=cnt-1 -# -# pygame.display.flip() - - r=r+1 - if r>500: break - -# ----------------------------------------------------------------- -# ----------------------------------------------------------------- - - print 1/((time.time()-start)/r) - trial=trial-1 - t=t+1 diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/1.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/1.bmp Binary files differdeleted file mode 100644 index 57630e3..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/1.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/2.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/2.bmp Binary files differdeleted file mode 100644 index 90af77a..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/2.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/3.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/3.bmp Binary files differdeleted file mode 100644 index 1751a4a..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/3.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/4.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/4.bmp Binary files differdeleted file mode 100644 index 1f292d1..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/4.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/5.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/5.bmp Binary files differdeleted file mode 100644 index fd8cc0e..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/5.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/6.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/6.bmp Binary files differdeleted file mode 100644 index df3a2eb..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/6.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/7.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/7.bmp Binary files differdeleted file mode 100644 index 51b0052..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/7.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/8.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/8.bmp Binary files differdeleted file mode 100644 index 9302c64..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/8.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/9.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/9.bmp Binary files differdeleted file mode 100644 index f5c6191..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a1/9.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/1.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/1.bmp Binary files differdeleted file mode 100644 index 4def064..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/1.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/2.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/2.bmp Binary files differdeleted file mode 100644 index 3750af4..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/2.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/3.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/3.bmp Binary files differdeleted file mode 100644 index 636c6f3..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/3.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/4.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/4.bmp Binary files differdeleted file mode 100644 index 646b407..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/4.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/5.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/5.bmp Binary files differdeleted file mode 100644 index 11a9bf5..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/5.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/6.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/6.bmp Binary files differdeleted file mode 100644 index ca1ba7b..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/6.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/7.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/7.bmp Binary files differdeleted file mode 100644 index 9375c15..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/7.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/8.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/8.bmp Binary files differdeleted file mode 100644 index 53b66f9..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/8.bmp +++ /dev/null diff --git a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/9.bmp b/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/9.bmp Binary files differdeleted file mode 100644 index 088558c..0000000 --- a/devtools/CompleteTestKit/Animation Styles/IndividualFrames/bmp16/a2/9.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/1.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/1.bmp Binary files differdeleted file mode 100644 index 57630e3..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/1.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/2.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/2.bmp Binary files differdeleted file mode 100644 index 90af77a..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/2.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/3.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/3.bmp Binary files differdeleted file mode 100644 index 1751a4a..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/3.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/4.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/4.bmp Binary files differdeleted file mode 100644 index 1f292d1..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/4.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/5.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/5.bmp Binary files differdeleted file mode 100644 index fd8cc0e..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/5.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/6.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/6.bmp Binary files differdeleted file mode 100644 index df3a2eb..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/6.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/7.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/7.bmp Binary files differdeleted file mode 100644 index 51b0052..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/7.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/8.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/8.bmp Binary files differdeleted file mode 100644 index 9302c64..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/8.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/9.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/9.bmp Binary files differdeleted file mode 100644 index f5c6191..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/9.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/1.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/1.bmp Binary files differdeleted file mode 100644 index 4def064..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/1.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/2.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/2.bmp Binary files differdeleted file mode 100644 index 3750af4..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/2.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/3.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/3.bmp Binary files differdeleted file mode 100644 index 636c6f3..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/3.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/4.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/4.bmp Binary files differdeleted file mode 100644 index 646b407..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/4.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/5.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/5.bmp Binary files differdeleted file mode 100644 index 11a9bf5..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/5.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/6.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/6.bmp Binary files differdeleted file mode 100644 index ca1ba7b..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/6.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/7.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/7.bmp Binary files differdeleted file mode 100644 index 9375c15..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/7.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/8.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/8.bmp Binary files differdeleted file mode 100644 index 53b66f9..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/8.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/9.bmp b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/9.bmp Binary files differdeleted file mode 100644 index 088558c..0000000 --- a/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/9.bmp +++ /dev/null diff --git a/devtools/Dave's Test Kit/DODirtyTest.py b/devtools/Dave's Test Kit/DODirtyTest.py deleted file mode 100755 index b3d5df3..0000000 --- a/devtools/Dave's Test Kit/DODirtyTest.py +++ /dev/null @@ -1,92 +0,0 @@ -#! /usr/bin/env python
-import pygame
-from pygame.locals import *
-import time
-from Scene import Scene
-from DrawableObject import DrawableObject
-from DynamicDrawableObject import DynamicDrawableObject
-pygame.init()
-
-FRAME=2500 #setting number of frames per trial
-screenWidth = 600 #screen width
-screenHeight = 400 #screen height
-numImages = 4 #number of copies of images
-numGroups = 1
-maxTrial = 5 # multiple trials, but hard coded in this test
-
-screen = pygame.display.set_mode( [int(screenWidth),
- int(screenHeight)] ) #Setting the screen size to the given size
-pygame.display.set_caption("Sprite Speed Test Window")
-background = pygame.image.load("Room.gif")#Loading my background image
-screen.blit(background,[0,0])#blitting my background to screen
-pygame.display.flip()#flipping screen
-
-#Creating my list of images to use later
-surfaceList = [
- pygame.image.load(
- "./Animation Styles/IndividualFrames/bmp16/a2/1.bmp").convert(),
- pygame.image.load(
- "./Animation Styles/IndividualFrames/bmp16/a2/2.bmp").convert(),
- pygame.image.load(
- "./Animation Styles/IndividualFrames/bmp16/a2/3.bmp").convert(),
- pygame.image.load(
- "./Animation Styles/IndividualFrames/bmp16/a2/4.bmp").convert(),
- pygame.image.load(
- "./Animation Styles/IndividualFrames/bmp16/a2/5.bmp").convert(),
- pygame.image.load(
- "./Animation Styles/IndividualFrames/bmp16/a2/6.bmp").convert(),
- pygame.image.load(
- "./Animation Styles/IndividualFrames/bmp16/a2/7.bmp").convert(),
- pygame.image.load(
- "./Animation Styles/IndividualFrames/bmp16/a2/8.bmp").convert(),
- pygame.image.load(
- "./Animation Styles/IndividualFrames/bmp16/a2/9.bmp").convert()
- ]
-
-for aTrial in range(maxTrial):
- start = time.time()#starting timer
-
-#creating my DynamicDrawableObject object using my previously made images list
- a = DynamicDrawableObject(surfaceList,'', 72, 40, 40 , 2,2)
- b = DynamicDrawableObject(surfaceList,'', 24, 80, 80 , 2,2)
- c = DynamicDrawableObject(surfaceList,'', 12,120, 120, 2,2)
- d = DynamicDrawableObject(surfaceList,'', 1, 160, 160, 2,2)
-
- sceneList=[Scene(a),] #creating my array of scenes
- sceneList[0].addObjects([b,c,d])
-
- for sc in range(numGroups):
- for img in range(sceneList[sc].getListSize()):
- sceneList[sc].getObject(img).setSpeed(2,2)
-
- #printing time to load images and stuff
- print (time.time()-start) ,
- print " -- Time to load"
-
- #setting up timer stuff
- clock = pygame.time.Clock()
- clock.tick()
- start = time.time()
-
- #loop that goes through and upodates my objects
- for frame in range(FRAME):
- time.sleep(.25)
- dirtyList=[]
- for sc in range(numGroups):
-
- for img in range(sceneList[sc].getListSize()):
- thisrect = sceneList[sc].getObject(img).getRectangle()
- if thisrect.right>screenWidth or thisrect.left<0:
- sceneList[sc].setSpeed( sceneList[sc].getXSpeed()*-1, None )
- if thisrect.bottom>screenHeight or thisrect.top<0:
- sceneList[sc].setSpeed( None , sceneList[sc].getYSpeed()*-1 )
-
- sceneList[sc].update(clock.get_time()) #calls the update function for my DDO
-
- clock.tick() #ticks clock
-
- dirtyList.extend( sceneList[sc].draw(screen) )#adding stuff that has been updated to my dirty list
-
- pygame.display.update(dirtyList) #updates the screen with the dirty list
- for sc in range(numGroups):
- sceneList[sc].clear(screen, background) #clears stuff behind images based on given background image.
diff --git a/devtools/Dave's Test Kit/DrawableFontObject.py b/devtools/Dave's Test Kit/DrawableFontObject.py deleted file mode 100644 index 425d572..0000000 --- a/devtools/Dave's Test Kit/DrawableFontObject.py +++ /dev/null @@ -1,16 +0,0 @@ -import pygame
-from DrawableObject import DrawableObject
-
-class DrawableFontObject(DrawableObject, pygame.sprite.Sprite):
-
- def __init__(self,text,font, x = 0, y = 0):
-
- self.font = font
- self.textImage = font.render(text, 1, (255,255,255))
- #self._image = self.textImage
- DrawableObject.__init__(self, [self.textImage], '')
-
- def changeText(self, newText, color=(255,255,255)):
-
- self._images[0] = self.font.render(newText, True, color)
- self.image = self._images[0]
diff --git a/devtools/Dave's Test Kit/DrawableObject.py b/devtools/Dave's Test Kit/DrawableObject.py deleted file mode 100644 index 3b12d85..0000000 --- a/devtools/Dave's Test Kit/DrawableObject.py +++ /dev/null @@ -1,141 +0,0 @@ -import pygame
-
-class DrawableObject(pygame.sprite.Sprite):
-
- def __init__(self, images, textfileName, x = 0, y = 0):
- pygame.sprite.Sprite.__init__(self)
-
- self._images = []
- self._origImages = []
- for i in range(len(images)):
- self._images.append(images[i].convert())
- self._origImages.append(images[i].convert())
-
- self._start = pygame.time.get_ticks()
- self.image = self._images[0]
- self._last_update = 0
- self._frame = 0
- self.animations = {}
- self._current_anim = ""
- self.rect = self.image.get_rect()
- self.xPos = x
- self.yPos = y
- self.myAngle = 0
- self.xSize = 40 # <--
- self.ySize = 40 # <--
- self.rect.topleft = (x,y)
-
- 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()
-
- else:
-
- self.animations["anim1"] = [0, len(self._images)]
- self.goToAnim("anim1")
-
- def repopulateImages(self, newImages):
-
- self._images = []
- self._origImages = []
- for i in range(len(newImages)):
- self._images.append(newImages[i].convert())
- self._origImages.append(newImages[i].convert())
-
- self.image = self._images[0]
- self._frame = 0
- self.xSize = 40 # <--
- self.ySize = 40 # <--
-
- def addImages(self, images):
- self._images.extend(images)
- self._origImages.extend(images)
-
- def goToAnim(self, animName):
- if self.animations.get(animName, 0) != 0:
- self._current_anim = animName
- self._frame = self.animations[animName][0]
- self.image = self._images[self._frame]
-
- def nudge(self, x, y):
- self.xPos += x
- self.yPos += y
- self.rect.right += x
- self.rect.top += y
-
- def scale(self, x=None, y=None):
- if type(x).__name__=='int': self.xSize = x
- if type(y).__name__=='int': self.ySize = y
-
- for i in range(len(self._images)):
- self._origImages[i] = pygame.transform.scale(self._origImages[i], (self.xSize, self.ySize))
- self._images[i] = self._origImages[i]
-
- def fill(self, color):
- for i in range(len(self._images)):
- #print "filling with ", color
- self._origImages[i].fill(color)
- self._images[i].fill(color)
-
- def getXSize(self):
- return self.xSize
-
- def getYSize(self):
- return self.ySize
-
- def rotate(self,angle):
- self.myAngle += angle
- for i in range(len(self._images)):
- self._images[i] = pygame.transform.rotate(self._origImages[i], self.myAngle)
-
- def getRotation(self):
- return self.myAngle
-
- def setPosition(self, x = None, y = None):
- if type(x).__name__=='int': self.xPos = x
- if type(y).__name__=='int': self.yPos = y
- self.rect.topleft = (self.xPos, self.yPos)
-
- def getXPos(self):
- return self.xPos
-
- def getYPos(self):
- return self.yPos
-
- def calcColorKey(self, x=0, y=0):
- myColorKey = images[0].get_at((x,y))
- setColorKey(myColorKey)
-
- def makeTransparent(self, bool = True):
-
- if bool == True:
- self.image.fill((255,255,255,255))
- else:
- self._images[self._frame] = self._origImages[self._frame]
- self.image = self._images[self._frame]
-
- def setColorKey(self, aColor):
- for i in range(len(self._images)):
- self._images[i].set_colorkey(aColor)
-
- def update(self, t=None):
- timePassed = t + self._last_update
-
- if (timePassed) > 200:
-
- self.image = self._images[self._frame]
- self._last_update = timePassed%1000
- else:
- self._last_update = timePassed
-
- def nextFrame(self):
- pass
-
- def nextCurrentAnimFrame(self):
- pass
diff --git a/devtools/Dave's Test Kit/DynamicDrawableObject.py b/devtools/Dave's Test Kit/DynamicDrawableObject.py deleted file mode 100644 index 9319c9e..0000000 --- a/devtools/Dave's Test Kit/DynamicDrawableObject.py +++ /dev/null @@ -1,71 +0,0 @@ -import pygame
-from DrawableObject import DrawableObject
-
-class DynamicDrawableObject(DrawableObject, pygame.sprite.Sprite):
-
- def __init__(self,images,textfileName,fps = 10, x = 0, y = 0, xVelocity = 0, yVelocity = 0):
- self._delay = 1000/fps
- DrawableObject.__init__(self, images, textfileName, x, y)
-
- def addImages(self, images):
- self._images.extend(images)
-
- def setSpeed(self, xVelocity = None, yVelocity = None):
- if xVelocity != None: self.xSpeed = xVelocity
- if yVelocity != None: self.ySpeed = yVelocity
-
- def getXSpeed(self):
- return self.xSpeed
-
- def getYSpeed(self):
- return self.ySpeed
-
- def getRectangle(self):
- return self.rect
-
- def move(self):
- self.xPos += self.xSpeed
- self.yPos += self.ySpeed
- self.rect.right += self.xSpeed
- self.rect.top += self.ySpeed
-
- def update(self, t):
- timePassed = t + self._last_update
- if (timePassed) > self._delay:
- if self._frame < self.animations.get(self._current_anim)[0] or self._frame > self.animations.get(self._current_anim)[1]:
- self._frame = self.animations.get(self._current_anim)[0]
-
- self._frame += timePassed/self._delay
-
- while self._frame >= self.animations.get(self._current_anim)[1]:
- framesPast = self._frame - self.animations.get(self._current_anim)[1]
- self._frame = framesPast - 1 + self.animations.get(self._current_anim)[0]
-
- self.image = self._images[self._frame]
- self._last_update = timePassed%self._delay
- else:
- self._last_update = timePassed
-
- def nextFrame(self):
- self._frame += 1
- if self._frame >= len(self._images):
- framesPast = self._frame - len(self._images)
- self._frame = framesPast
-
- self.image = self._images[self._frame]
-
- def nextCurrentAnimFrame(self):
-
- for cnt in range(len(animations)):
-
- if animations[cnt] == self._current_anim:
- if self._frame < self.animations[self._current_anim][0] or self._frame > self.animations[self._current_anim][1]:
- self._frame = self.animations[self._current_anim][0]
-
- else: self._frame += 1
-
- if self._frame > self.animations[self._current_anim][1]:
- framesPast = self._frame - self.animations[self._current_anim][1]
- self._frame = framesPast - 1 + self.animations[self._current_anim][0]
-
- self.image = self._images[self._frame]
diff --git a/devtools/Dave's Test Kit/FontDirtyTest.py b/devtools/Dave's Test Kit/FontDirtyTest.py deleted file mode 100644 index 22a6661..0000000 --- a/devtools/Dave's Test Kit/FontDirtyTest.py +++ /dev/null @@ -1,57 +0,0 @@ -#! /usr/bin/env python
-import pygame
-from pygame.locals import *
-from time import time
-from Scene import Scene
-from DrawableObject import DrawableObject
-from DrawableFontObject import DrawableFontObject
-pygame.init()
-
-FRAME=500 #setting number of frames per trial
-screenWidth = 600 #screen width
-screenHeight = 400 #screen height
-numImages = 1 #number of copies of images
-maxTrial = 5 # multiple trials, but hard coded in this test
-dirtyList=[] #list for objects to be updated
-
-#print the height and width
-print "width,height",
-print screenWidth,
-print ",",
-print screenHeight
-
-screen = pygame.display.set_mode( [int(screenWidth),
- int(screenHeight)] ) #Setting the screen size to the given size
-pygame.display.set_caption("Sprite Speed Test Window")
-background = pygame.image.load("Room.gif")#Loading my background image
-screen.blit(background,[0,0])#blitting my background to screen
-pygame.display.flip()#flipping screen
-
-for aTrial in range(maxTrial):
- start = time()#starting timer
-
- font = pygame.font.SysFont("cmr10", 100) #creating my font object
- d = DrawableFontObject("hello world", font) #creating my DrawableFontObject object using my previously made font object
-
- group1=Scene(d) #creating my scene
- groups=[group1] #creating my array of scenes
- #printing time to load images and stuff
- print (time()-start) ,
- print " -- Time to load"
-
- #setting up timer stuff
- clock = pygame.time.Clock()
- clock.tick()
- start = time()
- #loop that goes through and upodates my objects
- for frame in range(FRAME):
- dirtyList=[]
- d.changeText(str(frame))#updates my text for my DFO
- for image in range(numImages):
- groups[image].update(clock.get_time())#calls the update function for my DFO
- clock.tick()#ticks clock
- dirtyList.extend(groups[image].draw(screen))#adding stuff that has been updated to my dirty list
-
- pygame.display.update(dirtyList)#updates the screen with the dirty list
- for image in range(numImages):
- groups[image].clear(screen, background)#clears stuff behind images based on given background image.
diff --git a/devtools/Dave's Test Kit/Room.gif b/devtools/Dave's Test Kit/Room.gif Binary files differdeleted file mode 100644 index 798ebf1..0000000 --- a/devtools/Dave's Test Kit/Room.gif +++ /dev/null diff --git a/devtools/Dave's Test Kit/Scene.py b/devtools/Dave's Test Kit/Scene.py deleted file mode 100644 index 7aec48c..0000000 --- a/devtools/Dave's Test Kit/Scene.py +++ /dev/null @@ -1,199 +0,0 @@ -import pygame
-from pygame.sprite import RenderUpdates
-
-class Scene(pygame.sprite.RenderUpdates):
-
- def __init__(self, sprites):
-
- self._spritelist = []
- self._spritelist.append([sprites, sprites.getXPos(), sprites.getYPos()])
- RenderUpdates.__init__(self, sprites)
-
- self.xPos = 0
- self.yPos = 0
- self.xSize = 0
- self.ySize = 0
-
- self.calcPosition()
- self.calcSize()
- self.setRelativePositions()
-
- def calcPosition(self):
-
- lowestX = 9000
- lowestY = 9000
-
- cnt = 0
- while cnt < len(self._spritelist):
- if self._spritelist[cnt][0].getXPos() < lowestX: lowestX = self._spritelist[cnt][0].getXPos()
- if self._spritelist[cnt][0].getYPos() < lowestY: lowestY = self._spritelist[cnt][0].getYPos()
- cnt += 1
-
- self.xPos = lowestX
- self.yPos = lowestY
-
- def calcSize(self):
-
- highestX = 0
- highestY = 0
-
- cnt = 0
- while cnt < len(self._spritelist):
- if (self._spritelist[cnt][0].getXPos() + self._spritelist[cnt][0].getXSize()) > highestX: highestX = self._spritelist[cnt][0].getXPos() + self._spritelist[cnt][0].getXSize()
- if (self._spritelist[cnt][0].getYPos() + self._spritelist[cnt][0].getYSize()) > highestY: highestY = self._spritelist[cnt][0].getYPos() + self._spritelist[cnt][0].getYSize()
- cnt += 1
-
- self.xSize = highestX - self.xPos
- self.ySize = highestY - self.yPos
-
- def addObject(self, newDrawableObject):
- RenderUpdates.add_internal(self, newDrawableObject)
- self._spritelist.append([newDrawableObject, newDrawableObject.getXPos(), newDrawableObject.getYPos()])
-
- def addObjects(self, newDrawableObjects):
- for sprite in newDrawableObjects:
- RenderUpdates.add_internal(self, sprite)
- self._spritelist.append([sprite, sprite.getXPos(), sprite.getYPos()])
-
- def setRelativePositions(self):
-
- cnt = 0
- while cnt < len(self._spritelist):
- self._spritelist[cnt][1] = self._spritelist[cnt][0].getXPos() - self.xPos
- self._spritelist[cnt][2] = self._spritelist[cnt][0].getYPos() - self.yPos
- cnt += 1
-
- def removeObject(self, sprite):
-
- for i in self._spritelist:
- if i[0] == sprite:
- self._spritelist.remove(i)
- break
- RenderUpdates.remove_internal(self, sprite)
-
- def getObject(self, index):
-
- if index < len(self._spritelist):
- return self._spritelist[index][0]
-
- def getListSize(self):
-
- return len(self._spritelist)
-
- def getList(self):
-
- return list(self._spritelist)
-
- def moveObjects(self):
-
- cnt = 0
- while cnt < len(self._spritelist):
-
- self._spritelist[cnt][0].move()
- cnt += 1
-
- self.calcPosition()
- self.calcSize()
- self.setRelativePositions()
-
- def moveScene(self, xNudge = 0, yNudge = 0):
-
- cnt = 0
- while cnt < len(self._spritelist):
-
- self._spritelist[cnt][0].nudge(xNudge, yNudge)
- cnt += 1
-
- self.calcPosition()
-
- def setPosition(self, newXPos = None, newYPos = None):
-
- if newXPos != None: self.xPos = newXPos
- if newYPos != None: self.yPos = newYPos
-
- cnt = 0
- while cnt < len(self._spritelist):
-
- self._spritelist[cnt][0].setPosition(self.xPos + self._spritelist[cnt][1], self.yPos + self._spritelist[cnt][2])
- cnt += 1
-
- def getXPos(self):
- return self.xPos
-
- def getYPos(self):
- return self.yPos
-
- def getXSize(self):
- return self.xSize
-
- def getYSize(self):
- return self.ySize
-
- def scaleObjects(self, newXSize = None, newYSize = None):
-
- cnt = 0
- while cnt < len(self._spritelist):
- self._spritelist[cnt][0].scale(newXSize, newYSize)
- cnt += 1
-
- def scaleScene(self, newXSize = None, newYSize = None):
-
- self.calcPosition()
- self.calcSize()
-
- xScale = 1
- yScale = 1
-
- if newXSize != None: xScale = (newXSize * 1.0)/self.xSize
- if newYSize != None: yScale = (newYSize * 1.0)/self.ySize
-
- cnt = 0
- while cnt < len(self._spritelist):
- self._spritelist[cnt][0].scale(xScale * self._spritelist[cnt][0].getXSize(), yScale * self._spritelist[cnt][0].getYSize())
- self._spritelist[cnt][1] = xScale * self._spritelist[cnt][1]
- self._spritelist[cnt][2] = yScale * self._spritelist[cnt][2]
- cnt += 1
-
- self.calcPosition()
- self.calcSize()
- self.setPosition()
-
- def update(self, t):
-
- for s in self._spritelist: s[0].update(t);
-
- def draw(self, surface):
- spritedict = self.spritedict
- surface_blit = surface.blit
- dirty = self.lostsprites
- self.lostsprites = []
- dirty_append = dirty.append
- for s in self._spritelist:
- r = spritedict[s[0]]
- newrect = surface_blit(s[0].image, s[0].rect)
- if r is 0:
- dirty_append(newrect)
- else:
- if newrect.colliderect(r):
- dirty_append(newrect.union(r))
- else:
- dirty_append(newrect)
- dirty_append(r)
- spritedict[s[0]] = newrect
- return dirty
-
- def drawEntireScene(self, surface):
- spritedict = self.spritedict
- surface_blit = surface.blit
- dirty = self.lostsprites
- self.lostsprites = []
- dirty_append = dirty.append
- for s in self._spritelist:
- dirty_append(spritedict[s[0]])
- dirty_append(surface_blit(s[0].image, s[0].rect))
- return dirty
-
- def nextFrame(self):
- for cnt in range(len(self._spritelist)):
-
- self._spritelist[cnt][0].nextFrame()
diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/0 Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/0 Button.bmp Binary files differdeleted file mode 100755 index a36a681..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/0 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/1 Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/1 Button.bmp Binary files differdeleted file mode 100755 index 57630e3..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/1 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/2 Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/2 Button.bmp Binary files differdeleted file mode 100755 index 90af77a..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/2 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/3 Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/3 Button.bmp Binary files differdeleted file mode 100755 index 1751a4a..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/3 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/4 Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/4 Button.bmp Binary files differdeleted file mode 100755 index 1f292d1..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/4 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/5 Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/5 Button.bmp Binary files differdeleted file mode 100755 index fd8cc0e..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/5 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/6 Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/6 Button.bmp Binary files differdeleted file mode 100755 index df3a2eb..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/6 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/7 Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/7 Button.bmp Binary files differdeleted file mode 100755 index 51b0052..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/7 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/8 Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/8 Button.bmp Binary files differdeleted file mode 100755 index 9302c64..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/8 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/9 Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/9 Button.bmp Binary files differdeleted file mode 100755 index f5c6191..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/9 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/Attack Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/Attack Button.bmp Binary files differdeleted file mode 100755 index 6adee99..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/Attack Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/Battle Hand.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/Battle Hand.bmp Binary files differdeleted file mode 100755 index 80aef96..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/Battle Hand.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/Blank Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/Blank Button.bmp Binary files differdeleted file mode 100755 index cab745d..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/Blank Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/Clear Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/Clear Button.bmp Binary files differdeleted file mode 100755 index 1527b76..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/Clear Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/Enter Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/Enter Button.bmp Binary files differdeleted file mode 100755 index 1df130b..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/Enter Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/Hand.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/Hand.bmp Binary files differdeleted file mode 100755 index ad8c5ca..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/Hand.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/Item Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/Item Button.bmp Binary files differdeleted file mode 100755 index 0cad273..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/Item Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/Magic Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/Magic Button.bmp Binary files differdeleted file mode 100755 index aa7eb14..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/Magic Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/Pause Screen.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/Pause Screen.bmp Binary files differdeleted file mode 100755 index b3c34a8..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/Pause Screen.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/Special Button.bmp b/devtools/ImageTypeTest/BMPs 16-Bits/Special Button.bmp Binary files differdeleted file mode 100755 index a3c291a..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/Special Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/bounce.py b/devtools/ImageTypeTest/BMPs 16-Bits/bounce.py deleted file mode 100755 index 286205b..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.bmp") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.bmp"), - 2: pygame.image.load("3 Button.bmp"), - 3: pygame.image.load("4 Button.bmp"), - 4: pygame.image.load("5 Button.bmp"), - 5: pygame.image.load("6 Button.bmp"), - 6: pygame.image.load("7 Button.bmp"), - 7: pygame.image.load("8 Button.bmp"), - 8: pygame.image.load("9 Button.bmp"), - 9: pygame.image.load("1 Button.bmp") - } - ball = switcher.get(i,pygame.image.load("1 Button.bmp")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 156, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/ImageTypeTest/BMPs 16-Bits/ntest.py b/devtools/ImageTypeTest/BMPs 16-Bits/ntest.py deleted file mode 100755 index 22c019f..0000000 --- a/devtools/ImageTypeTest/BMPs 16-Bits/ntest.py +++ /dev/null @@ -1,103 +0,0 @@ -import sys, pygame, time -pygame.init() - -ft="bmp" -r=0 -i=1 -size = width, height = 600,400 - -print "Nightmare test - Authors Dave Silverman and Scott Mengel" -print "Set size to 600 x 400 px" -print "Running..." -speed1=speed2=speed3=speed4=[2, 2] -black = 0, 0, 0 - -screen = pygame.display.set_mode(size) - -ball1=ball2=ball3=ball4=pygame.image.load("1 Button.%s"%ft) - -ballrect1 = ball1.get_rect() -ballrect1 = ballrect1.move( 200, 0) - -ballrect2 = ball2.get_rect() -ballrect2 = ballrect2.move( 0, 200) - -ballrect3 = ball3.get_rect() -ballrect3 = ballrect3.move( 200, 200) - -ballrect4 = ball4.get_rect() -ballrect4 = ballrect4.move( 0, 0) - -# ballrect = ballrect.move( 0, 0) - -print "Ball Loaded, collision detection ready, Initiating Loop:" - -start=time.time() - -#----------------------------------------------------------------- - -def chngImg(thisBall): - switcher = { - 1: pygame.image.load("2 Button.%s"%ft), - 2: pygame.image.load("3 Button.%s"%ft), - 3: pygame.image.load("4 Button.%s"%ft), - 4: pygame.image.load("5 Button.%s"%ft), - 3: pygame.image.load("4 Button.%s"%ft), - 3: pygame.image.load("4 Button.%s"%ft), - 5: pygame.image.load("6 Button.%s"%ft), - 6: pygame.image.load("7 Button.%s"%ft), - 7: pygame.image.load("8 Button.%s"%ft), - 8: pygame.image.load("9 Button.%s"%ft), - 9: pygame.image.load("1 Button.%s"%ft) - } - return switcher.get(i,pygame.image.load("1 Button.%s"%ft)) - -#----------------------------------------------------------------- - -def collision(thisBallRect,thisSpeed): - if thisBallRect.left < 0 or thisBallRect.right > width: - return -thisSpeed[0],thisSpeed[1] - if thisBallRect.top < 0 or thisBallRect.bottom > height: - return thisSpeed[0],-thisSpeed[1] - else: return thisSpeed -#----------------------------------------------------------------- - -while 1: - ball1 = chngImg(ball1) - ball2 = chngImg(ball2) - ball3 = chngImg(ball3) - ball4 = chngImg(ball4) - - i=i+1 - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - speed1=collision(ballrect1,speed1) - ballrect1 = ballrect1.move(speed1) - - speed2=collision(ballrect2,speed2) - ballrect2 = ballrect2.move(speed2) - - speed3=collision(ballrect3,speed3) - ballrect3 = ballrect3.move(speed3) - - speed4=collision(ballrect4,speed4) - ballrect4 = ballrect4.move(speed4) - - screen.fill(black) - screen.blit(ball1, ballrect1) - screen.blit(ball2, ballrect2) - screen.blit(ball3, ballrect3) - screen.blit(ball4, ballrect4) - - pygame.display.flip() - - r=r+1 - - if r>500: break - -#----------------------------------------------------------------- - -print 1/((time.time()-start)/r) diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/0 Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/0 Button.bmp Binary files differdeleted file mode 100755 index 5fa6a3f..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/0 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/1 Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/1 Button.bmp Binary files differdeleted file mode 100755 index e910cec..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/1 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/2 Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/2 Button.bmp Binary files differdeleted file mode 100755 index 0545f38..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/2 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/3 Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/3 Button.bmp Binary files differdeleted file mode 100755 index a154b29..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/3 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/4 Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/4 Button.bmp Binary files differdeleted file mode 100755 index 4ab21f9..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/4 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/5 Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/5 Button.bmp Binary files differdeleted file mode 100755 index 0a55d39..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/5 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/6 Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/6 Button.bmp Binary files differdeleted file mode 100755 index ad3f1b1..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/6 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/7 Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/7 Button.bmp Binary files differdeleted file mode 100755 index 915ab5b..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/7 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/8 Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/8 Button.bmp Binary files differdeleted file mode 100755 index b36287d..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/8 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/9 Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/9 Button.bmp Binary files differdeleted file mode 100755 index 2cab5a4..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/9 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/Attack Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/Attack Button.bmp Binary files differdeleted file mode 100755 index 9553638..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/Attack Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/Battle Hand.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/Battle Hand.bmp Binary files differdeleted file mode 100755 index 281c528..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/Battle Hand.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/Blank Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/Blank Button.bmp Binary files differdeleted file mode 100755 index 62a7a75..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/Blank Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/Clear Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/Clear Button.bmp Binary files differdeleted file mode 100755 index a348a0e..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/Clear Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/Enter Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/Enter Button.bmp Binary files differdeleted file mode 100755 index ded46f3..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/Enter Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/Hand.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/Hand.bmp Binary files differdeleted file mode 100755 index 02c3566..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/Hand.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/Item Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/Item Button.bmp Binary files differdeleted file mode 100755 index 9302ae5..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/Item Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/Magic Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/Magic Button.bmp Binary files differdeleted file mode 100755 index e2f7e71..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/Magic Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/Pause Screen.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/Pause Screen.bmp Binary files differdeleted file mode 100755 index eb25e1a..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/Pause Screen.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/Special Button.bmp b/devtools/ImageTypeTest/BMPs 24-Bits/Special Button.bmp Binary files differdeleted file mode 100755 index b5cecab..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/Special Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 24-Bits/bounce.py b/devtools/ImageTypeTest/BMPs 24-Bits/bounce.py deleted file mode 100755 index 396bd1f..0000000 --- a/devtools/ImageTypeTest/BMPs 24-Bits/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.bmp") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.bmp"), - 2: pygame.image.load("3 Button.bmp"), - 3: pygame.image.load("4 Button.bmp"), - 4: pygame.image.load("5 Button.bmp"), - 5: pygame.image.load("6 Button.bmp"), - 6: pygame.image.load("7 Button.bmp"), - 7: pygame.image.load("8 Button.bmp"), - 8: pygame.image.load("9 Button.bmp"), - 9: pygame.image.load("1 Button.bmp") - } - ball = switcher.get(i,pygame.image.load("1 Button.bmp")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 153, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/0 Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/0 Button.bmp Binary files differdeleted file mode 100755 index c25785f..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/0 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/1 Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/1 Button.bmp Binary files differdeleted file mode 100755 index d4da79c..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/1 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/2 Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/2 Button.bmp Binary files differdeleted file mode 100755 index 1f14c34..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/2 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/3 Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/3 Button.bmp Binary files differdeleted file mode 100755 index 8ae5bf2..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/3 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/4 Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/4 Button.bmp Binary files differdeleted file mode 100755 index 1c5f912..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/4 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/5 Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/5 Button.bmp Binary files differdeleted file mode 100755 index 8d08d71..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/5 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/6 Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/6 Button.bmp Binary files differdeleted file mode 100755 index c9496e5..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/6 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/7 Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/7 Button.bmp Binary files differdeleted file mode 100755 index 2495c54..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/7 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/8 Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/8 Button.bmp Binary files differdeleted file mode 100755 index 0730613..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/8 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/9 Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/9 Button.bmp Binary files differdeleted file mode 100755 index 179a768..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/9 Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/Attack Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/Attack Button.bmp Binary files differdeleted file mode 100755 index 9331158..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/Attack Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/Battle Hand.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/Battle Hand.bmp Binary files differdeleted file mode 100755 index ea7c033..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/Battle Hand.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/Blank Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/Blank Button.bmp Binary files differdeleted file mode 100755 index 88e225a..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/Blank Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/Clear Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/Clear Button.bmp Binary files differdeleted file mode 100755 index a348a0e..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/Clear Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/Enter Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/Enter Button.bmp Binary files differdeleted file mode 100755 index 3914ff2..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/Enter Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/Hand.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/Hand.bmp Binary files differdeleted file mode 100755 index 0ba54af..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/Hand.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/Item Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/Item Button.bmp Binary files differdeleted file mode 100755 index 84523be..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/Item Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/Magic Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/Magic Button.bmp Binary files differdeleted file mode 100755 index 759086c..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/Magic Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/Pause Screen.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/Pause Screen.bmp Binary files differdeleted file mode 100755 index bec11f0..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/Pause Screen.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/Special Button.bmp b/devtools/ImageTypeTest/BMPs 32-Bits/Special Button.bmp Binary files differdeleted file mode 100755 index a17614d..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/Special Button.bmp +++ /dev/null diff --git a/devtools/ImageTypeTest/BMPs 32-Bits/bounce.py b/devtools/ImageTypeTest/BMPs 32-Bits/bounce.py deleted file mode 100755 index 396bd1f..0000000 --- a/devtools/ImageTypeTest/BMPs 32-Bits/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.bmp") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.bmp"), - 2: pygame.image.load("3 Button.bmp"), - 3: pygame.image.load("4 Button.bmp"), - 4: pygame.image.load("5 Button.bmp"), - 5: pygame.image.load("6 Button.bmp"), - 6: pygame.image.load("7 Button.bmp"), - 7: pygame.image.load("8 Button.bmp"), - 8: pygame.image.load("9 Button.bmp"), - 9: pygame.image.load("1 Button.bmp") - } - ball = switcher.get(i,pygame.image.load("1 Button.bmp")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 153, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/ImageTypeTest/GIFs Transparent/1 Button.gif b/devtools/ImageTypeTest/GIFs Transparent/1 Button.gif Binary files differdeleted file mode 100755 index 2aad244..0000000 --- a/devtools/ImageTypeTest/GIFs Transparent/1 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs Transparent/2 Button.gif b/devtools/ImageTypeTest/GIFs Transparent/2 Button.gif Binary files differdeleted file mode 100755 index ed22525..0000000 --- a/devtools/ImageTypeTest/GIFs Transparent/2 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs Transparent/3 Button.gif b/devtools/ImageTypeTest/GIFs Transparent/3 Button.gif Binary files differdeleted file mode 100755 index 246cd12..0000000 --- a/devtools/ImageTypeTest/GIFs Transparent/3 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs Transparent/4 Button.gif b/devtools/ImageTypeTest/GIFs Transparent/4 Button.gif Binary files differdeleted file mode 100755 index 722f240..0000000 --- a/devtools/ImageTypeTest/GIFs Transparent/4 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs Transparent/5 Button.gif b/devtools/ImageTypeTest/GIFs Transparent/5 Button.gif Binary files differdeleted file mode 100755 index 6a71348..0000000 --- a/devtools/ImageTypeTest/GIFs Transparent/5 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs Transparent/6 Button.gif b/devtools/ImageTypeTest/GIFs Transparent/6 Button.gif Binary files differdeleted file mode 100755 index 0dd2145..0000000 --- a/devtools/ImageTypeTest/GIFs Transparent/6 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs Transparent/7 Button.gif b/devtools/ImageTypeTest/GIFs Transparent/7 Button.gif Binary files differdeleted file mode 100755 index 1e9914b..0000000 --- a/devtools/ImageTypeTest/GIFs Transparent/7 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs Transparent/8 Button.gif b/devtools/ImageTypeTest/GIFs Transparent/8 Button.gif Binary files differdeleted file mode 100755 index 390124b..0000000 --- a/devtools/ImageTypeTest/GIFs Transparent/8 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs Transparent/9 Button.gif b/devtools/ImageTypeTest/GIFs Transparent/9 Button.gif Binary files differdeleted file mode 100755 index 61c8c3c..0000000 --- a/devtools/ImageTypeTest/GIFs Transparent/9 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs Transparent/bounce.py b/devtools/ImageTypeTest/GIFs Transparent/bounce.py deleted file mode 100755 index 50e57e2..0000000 --- a/devtools/ImageTypeTest/GIFs Transparent/bounce.py +++ /dev/null @@ -1,66 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -#size = width, height = 1200,900 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.gif") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.gif"), - 2: pygame.image.load("3 Button.gif"), - 3: pygame.image.load("4 Button.gif"), - 4: pygame.image.load("5 Button.gif"), - 5: pygame.image.load("6 Button.gif"), - 6: pygame.image.load("7 Button.gif"), - 7: pygame.image.load("8 Button.gif"), - 8: pygame.image.load("9 Button.gif"), - 9: pygame.image.load("1 Button.gif") - } - ball = switcher.get(i,pygame.image.load("1 Button.gif")) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/ImageTypeTest/GIFs/0 Button.gif b/devtools/ImageTypeTest/GIFs/0 Button.gif Binary files differdeleted file mode 100755 index 8795936..0000000 --- a/devtools/ImageTypeTest/GIFs/0 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/1 Button.gif b/devtools/ImageTypeTest/GIFs/1 Button.gif Binary files differdeleted file mode 100755 index 4a89216..0000000 --- a/devtools/ImageTypeTest/GIFs/1 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/2 Button.gif b/devtools/ImageTypeTest/GIFs/2 Button.gif Binary files differdeleted file mode 100755 index b5019d8..0000000 --- a/devtools/ImageTypeTest/GIFs/2 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/3 Button.gif b/devtools/ImageTypeTest/GIFs/3 Button.gif Binary files differdeleted file mode 100755 index a87ddc6..0000000 --- a/devtools/ImageTypeTest/GIFs/3 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/4 Button.gif b/devtools/ImageTypeTest/GIFs/4 Button.gif Binary files differdeleted file mode 100755 index 2a398e6..0000000 --- a/devtools/ImageTypeTest/GIFs/4 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/5 Button.gif b/devtools/ImageTypeTest/GIFs/5 Button.gif Binary files differdeleted file mode 100755 index 93e5b8d..0000000 --- a/devtools/ImageTypeTest/GIFs/5 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/6 Button.gif b/devtools/ImageTypeTest/GIFs/6 Button.gif Binary files differdeleted file mode 100755 index 0e73825..0000000 --- a/devtools/ImageTypeTest/GIFs/6 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/7 Button.gif b/devtools/ImageTypeTest/GIFs/7 Button.gif Binary files differdeleted file mode 100755 index 67dff34..0000000 --- a/devtools/ImageTypeTest/GIFs/7 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/8 Button.gif b/devtools/ImageTypeTest/GIFs/8 Button.gif Binary files differdeleted file mode 100755 index 4ca6786..0000000 --- a/devtools/ImageTypeTest/GIFs/8 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/9 Button.gif b/devtools/ImageTypeTest/GIFs/9 Button.gif Binary files differdeleted file mode 100755 index bca1e6e..0000000 --- a/devtools/ImageTypeTest/GIFs/9 Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/Attack Button.gif b/devtools/ImageTypeTest/GIFs/Attack Button.gif Binary files differdeleted file mode 100755 index b128c5c..0000000 --- a/devtools/ImageTypeTest/GIFs/Attack Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/Battle Hand.gif b/devtools/ImageTypeTest/GIFs/Battle Hand.gif Binary files differdeleted file mode 100755 index 9822d4c..0000000 --- a/devtools/ImageTypeTest/GIFs/Battle Hand.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/Blank Button.gif b/devtools/ImageTypeTest/GIFs/Blank Button.gif Binary files differdeleted file mode 100755 index 32bb8de..0000000 --- a/devtools/ImageTypeTest/GIFs/Blank Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/Buttons.gif b/devtools/ImageTypeTest/GIFs/Buttons.gif Binary files differdeleted file mode 100755 index 8795936..0000000 --- a/devtools/ImageTypeTest/GIFs/Buttons.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/Clear Button.gif b/devtools/ImageTypeTest/GIFs/Clear Button.gif Binary files differdeleted file mode 100755 index 1d20353..0000000 --- a/devtools/ImageTypeTest/GIFs/Clear Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/Enter Button.gif b/devtools/ImageTypeTest/GIFs/Enter Button.gif Binary files differdeleted file mode 100755 index 753b18d..0000000 --- a/devtools/ImageTypeTest/GIFs/Enter Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/Hand.gif b/devtools/ImageTypeTest/GIFs/Hand.gif Binary files differdeleted file mode 100755 index 6a9eb53..0000000 --- a/devtools/ImageTypeTest/GIFs/Hand.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/Item Button.gif b/devtools/ImageTypeTest/GIFs/Item Button.gif Binary files differdeleted file mode 100755 index d54e0c8..0000000 --- a/devtools/ImageTypeTest/GIFs/Item Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/Magic Button.gif b/devtools/ImageTypeTest/GIFs/Magic Button.gif Binary files differdeleted file mode 100755 index 39bb77a..0000000 --- a/devtools/ImageTypeTest/GIFs/Magic Button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/Pause Screen.gif b/devtools/ImageTypeTest/GIFs/Pause Screen.gif Binary files differdeleted file mode 100755 index 7bdfaf3..0000000 --- a/devtools/ImageTypeTest/GIFs/Pause Screen.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/Special button.gif b/devtools/ImageTypeTest/GIFs/Special button.gif Binary files differdeleted file mode 100755 index c20eb1c..0000000 --- a/devtools/ImageTypeTest/GIFs/Special button.gif +++ /dev/null diff --git a/devtools/ImageTypeTest/GIFs/bounce.py b/devtools/ImageTypeTest/GIFs/bounce.py deleted file mode 100755 index 6e0d2df..0000000 --- a/devtools/ImageTypeTest/GIFs/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.gif") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.gif"), - 2: pygame.image.load("3 Button.gif"), - 3: pygame.image.load("4 Button.gif"), - 4: pygame.image.load("5 Button.gif"), - 5: pygame.image.load("6 Button.gif"), - 6: pygame.image.load("7 Button.gif"), - 7: pygame.image.load("8 Button.gif"), - 8: pygame.image.load("9 Button.gif"), - 9: pygame.image.load("1 Button.gif") - } - ball = switcher.get(i,pygame.image.load("1 Button.gif")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 156, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/ImageTypeTest/GIFs/ntest.py b/devtools/ImageTypeTest/GIFs/ntest.py deleted file mode 100755 index ce64777..0000000 --- a/devtools/ImageTypeTest/GIFs/ntest.py +++ /dev/null @@ -1,103 +0,0 @@ -import sys, pygame, time -pygame.init() - -ft="gif" -r=0 -i=1 -size = width, height = 600,400 - -print "Nightmare test - Authors Dave Silverman and Scott Mengel" -print "Set size to 600 x 400 px" -print "Running..." -speed1=speed2=speed3=speed4=[2, 2] -black = 0, 0, 0 - -screen = pygame.display.set_mode(size) - -ball1=ball2=ball3=ball4=pygame.image.load("1 Button.%s"%ft) - -ballrect1 = ball1.get_rect() -ballrect1 = ballrect1.move( 200, 0) - -ballrect2 = ball2.get_rect() -ballrect2 = ballrect2.move( 0, 200) - -ballrect3 = ball3.get_rect() -ballrect3 = ballrect3.move( 200, 200) - -ballrect4 = ball4.get_rect() -ballrect4 = ballrect4.move( 0, 0) - -# ballrect = ballrect.move( 0, 0) - -print "Ball Loaded, collision detection ready, Initiating Loop:" - -start=time.time() - -#----------------------------------------------------------------- - -def chngImg(thisBall): - switcher = { - 1: pygame.image.load("2 Button.%s"%ft), - 2: pygame.image.load("3 Button.%s"%ft), - 3: pygame.image.load("4 Button.%s"%ft), - 4: pygame.image.load("5 Button.%s"%ft), - 3: pygame.image.load("4 Button.%s"%ft), - 3: pygame.image.load("4 Button.%s"%ft), - 5: pygame.image.load("6 Button.%s"%ft), - 6: pygame.image.load("7 Button.%s"%ft), - 7: pygame.image.load("8 Button.%s"%ft), - 8: pygame.image.load("9 Button.%s"%ft), - 9: pygame.image.load("1 Button.%s"%ft) - } - return switcher.get(i,pygame.image.load("1 Button.gif")) - -#----------------------------------------------------------------- - -def collision(thisBallRect,thisSpeed): - if thisBallRect.left < 0 or thisBallRect.right > width: - return -thisSpeed[0],thisSpeed[1] - if thisBallRect.top < 0 or thisBallRect.bottom > height: - return thisSpeed[0],-thisSpeed[1] - else: return thisSpeed -#----------------------------------------------------------------- - -while 1: - ball1 = chngImg(ball1) - ball2 = chngImg(ball2) - ball3 = chngImg(ball3) - ball4 = chngImg(ball4) - - i=i+1 - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - speed1=collision(ballrect1,speed1) - ballrect1 = ballrect1.move(speed1) - - speed2=collision(ballrect2,speed2) - ballrect2 = ballrect2.move(speed2) - - speed3=collision(ballrect3,speed3) - ballrect3 = ballrect3.move(speed3) - - speed4=collision(ballrect4,speed4) - ballrect4 = ballrect4.move(speed4) - - screen.fill(black) - screen.blit(ball1, ballrect1) - screen.blit(ball2, ballrect2) - screen.blit(ball3, ballrect3) - screen.blit(ball4, ballrect4) - - pygame.display.flip() - - r=r+1 - - if r>500: break - -#----------------------------------------------------------------- - -print 1/((time.time()-start)/r) diff --git a/devtools/ImageTypeTest/JPGs 1Low/0 Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/0 Button.jpg Binary files differdeleted file mode 100755 index 580e162..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/0 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/1 Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/1 Button.jpg Binary files differdeleted file mode 100755 index 30afadd..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/1 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/2 Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/2 Button.jpg Binary files differdeleted file mode 100755 index 7f52df0..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/2 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/3 Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/3 Button.jpg Binary files differdeleted file mode 100755 index 3aafa5e..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/3 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/4 Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/4 Button.jpg Binary files differdeleted file mode 100755 index f3c4233..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/4 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/5 Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/5 Button.jpg Binary files differdeleted file mode 100755 index cb2618d..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/5 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/6 Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/6 Button.jpg Binary files differdeleted file mode 100755 index e128bc7..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/6 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/7 Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/7 Button.jpg Binary files differdeleted file mode 100755 index 5d09da2..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/7 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/8 Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/8 Button.jpg Binary files differdeleted file mode 100755 index 5093b16..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/8 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/9 Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/9 Button.jpg Binary files differdeleted file mode 100755 index 28fe7d6..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/9 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/Attack Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/Attack Button.jpg Binary files differdeleted file mode 100755 index 96c0804..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/Attack Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/Battle Hand.jpg b/devtools/ImageTypeTest/JPGs 1Low/Battle Hand.jpg Binary files differdeleted file mode 100755 index 3fdba58..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/Battle Hand.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/Blank Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/Blank Button.jpg Binary files differdeleted file mode 100755 index 293e02b..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/Blank Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/Clear Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/Clear Button.jpg Binary files differdeleted file mode 100755 index daca420..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/Clear Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/Enter Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/Enter Button.jpg Binary files differdeleted file mode 100755 index dd63a59..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/Enter Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/Hand.jpg b/devtools/ImageTypeTest/JPGs 1Low/Hand.jpg Binary files differdeleted file mode 100755 index 8c136af..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/Hand.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/Item Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/Item Button.jpg Binary files differdeleted file mode 100755 index ad6afe8..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/Item Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/Magic Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/Magic Button.jpg Binary files differdeleted file mode 100755 index 756b4ab..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/Magic Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/Pause Screen.jpg b/devtools/ImageTypeTest/JPGs 1Low/Pause Screen.jpg Binary files differdeleted file mode 100755 index 21935ad..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/Pause Screen.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/Special Button.jpg b/devtools/ImageTypeTest/JPGs 1Low/Special Button.jpg Binary files differdeleted file mode 100755 index 15d87d6..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/Special Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 1Low/bounce.py b/devtools/ImageTypeTest/JPGs 1Low/bounce.py deleted file mode 100755 index 76c5fe7..0000000 --- a/devtools/ImageTypeTest/JPGs 1Low/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.jpg") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.jpg"), - 2: pygame.image.load("3 Button.jpg"), - 3: pygame.image.load("4 Button.jpg"), - 4: pygame.image.load("5 Button.jpg"), - 5: pygame.image.load("6 Button.jpg"), - 6: pygame.image.load("7 Button.jpg"), - 7: pygame.image.load("8 Button.jpg"), - 8: pygame.image.load("9 Button.jpg"), - 9: pygame.image.load("1 Button.jpg") - } - ball = switcher.get(i,pygame.image.load("1 Button.jpg")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 150, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/ImageTypeTest/JPGs 2Medium/0 Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/0 Button.jpg Binary files differdeleted file mode 100755 index c7088be..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/0 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/1 Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/1 Button.jpg Binary files differdeleted file mode 100755 index d0af126..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/1 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/2 Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/2 Button.jpg Binary files differdeleted file mode 100755 index e715054..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/2 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/3 Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/3 Button.jpg Binary files differdeleted file mode 100755 index 19890e1..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/3 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/4 Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/4 Button.jpg Binary files differdeleted file mode 100755 index e84480f..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/4 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/5 Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/5 Button.jpg Binary files differdeleted file mode 100755 index e84ff10..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/5 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/6 Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/6 Button.jpg Binary files differdeleted file mode 100755 index 89bc49f..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/6 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/7 Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/7 Button.jpg Binary files differdeleted file mode 100755 index 2bc2ee6..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/7 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/8 Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/8 Button.jpg Binary files differdeleted file mode 100755 index c76df24..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/8 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/9 Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/9 Button.jpg Binary files differdeleted file mode 100755 index ec8118b..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/9 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/Attack Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/Attack Button.jpg Binary files differdeleted file mode 100755 index 74c38a0..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/Attack Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/Battle Hand.jpg b/devtools/ImageTypeTest/JPGs 2Medium/Battle Hand.jpg Binary files differdeleted file mode 100755 index 8de0e2e..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/Battle Hand.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/Blank Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/Blank Button.jpg Binary files differdeleted file mode 100755 index 7dcbb64..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/Blank Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/Clear Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/Clear Button.jpg Binary files differdeleted file mode 100755 index 07254a9..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/Clear Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/Enter Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/Enter Button.jpg Binary files differdeleted file mode 100755 index 2852505..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/Enter Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/Hand.jpg b/devtools/ImageTypeTest/JPGs 2Medium/Hand.jpg Binary files differdeleted file mode 100755 index 6640319..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/Hand.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/Item Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/Item Button.jpg Binary files differdeleted file mode 100755 index 8fec85d..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/Item Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/Magic Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/Magic Button.jpg Binary files differdeleted file mode 100755 index e46d8a2..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/Magic Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/Pause Screen.jpg b/devtools/ImageTypeTest/JPGs 2Medium/Pause Screen.jpg Binary files differdeleted file mode 100755 index 2fd3263..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/Pause Screen.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/Special Button.jpg b/devtools/ImageTypeTest/JPGs 2Medium/Special Button.jpg Binary files differdeleted file mode 100755 index b721cb5..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/Special Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 2Medium/bounce.py b/devtools/ImageTypeTest/JPGs 2Medium/bounce.py deleted file mode 100755 index aaeab2e..0000000 --- a/devtools/ImageTypeTest/JPGs 2Medium/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.jpg") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.jpg"), - 2: pygame.image.load("3 Button.jpg"), - 3: pygame.image.load("4 Button.jpg"), - 4: pygame.image.load("5 Button.jpg"), - 5: pygame.image.load("6 Button.jpg"), - 6: pygame.image.load("7 Button.jpg"), - 7: pygame.image.load("8 Button.jpg"), - 8: pygame.image.load("9 Button.jpg"), - 9: pygame.image.load("1 Button.jpg") - } - ball = switcher.get(i,pygame.image.load("1 Button.jpg")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 156, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/ImageTypeTest/JPGs 3High/0 Button.jpg b/devtools/ImageTypeTest/JPGs 3High/0 Button.jpg Binary files differdeleted file mode 100755 index cb30b94..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/0 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/1 Button.jpg b/devtools/ImageTypeTest/JPGs 3High/1 Button.jpg Binary files differdeleted file mode 100755 index 3bb39de..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/1 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/2 Button.jpg b/devtools/ImageTypeTest/JPGs 3High/2 Button.jpg Binary files differdeleted file mode 100755 index c572485..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/2 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/3 Button.jpg b/devtools/ImageTypeTest/JPGs 3High/3 Button.jpg Binary files differdeleted file mode 100755 index fe66efd..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/3 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/4 Button.jpg b/devtools/ImageTypeTest/JPGs 3High/4 Button.jpg Binary files differdeleted file mode 100755 index f6f6ecd..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/4 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/5 Button.jpg b/devtools/ImageTypeTest/JPGs 3High/5 Button.jpg Binary files differdeleted file mode 100755 index 6c65f59..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/5 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/6 Button.jpg b/devtools/ImageTypeTest/JPGs 3High/6 Button.jpg Binary files differdeleted file mode 100755 index e7c0309..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/6 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/7 Button.jpg b/devtools/ImageTypeTest/JPGs 3High/7 Button.jpg Binary files differdeleted file mode 100755 index fbdf990..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/7 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/8 Button.jpg b/devtools/ImageTypeTest/JPGs 3High/8 Button.jpg Binary files differdeleted file mode 100755 index 589b12e..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/8 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/9 Button.jpg b/devtools/ImageTypeTest/JPGs 3High/9 Button.jpg Binary files differdeleted file mode 100755 index 02d2fb0..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/9 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/Attack Button.jpg b/devtools/ImageTypeTest/JPGs 3High/Attack Button.jpg Binary files differdeleted file mode 100755 index 62051db..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/Attack Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/Battle Hand.jpg b/devtools/ImageTypeTest/JPGs 3High/Battle Hand.jpg Binary files differdeleted file mode 100755 index 8286359..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/Battle Hand.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/Blank Button.jpg b/devtools/ImageTypeTest/JPGs 3High/Blank Button.jpg Binary files differdeleted file mode 100755 index 8b730fd..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/Blank Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/Clear Button.jpg b/devtools/ImageTypeTest/JPGs 3High/Clear Button.jpg Binary files differdeleted file mode 100755 index a476b7c..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/Clear Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/Enter Button.jpg b/devtools/ImageTypeTest/JPGs 3High/Enter Button.jpg Binary files differdeleted file mode 100755 index e1cb964..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/Enter Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/Hand.jpg b/devtools/ImageTypeTest/JPGs 3High/Hand.jpg Binary files differdeleted file mode 100755 index a4aeb75..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/Hand.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/Item Button.jpg b/devtools/ImageTypeTest/JPGs 3High/Item Button.jpg Binary files differdeleted file mode 100755 index 4f0d38a..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/Item Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/Magic Button.jpg b/devtools/ImageTypeTest/JPGs 3High/Magic Button.jpg Binary files differdeleted file mode 100755 index 06ad4c7..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/Magic Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/Pause Screen.jpg b/devtools/ImageTypeTest/JPGs 3High/Pause Screen.jpg Binary files differdeleted file mode 100755 index e9e87d4..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/Pause Screen.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/Special Button.jpg b/devtools/ImageTypeTest/JPGs 3High/Special Button.jpg Binary files differdeleted file mode 100755 index fe5a855..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/Special Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 3High/bounce.py b/devtools/ImageTypeTest/JPGs 3High/bounce.py deleted file mode 100755 index aaeab2e..0000000 --- a/devtools/ImageTypeTest/JPGs 3High/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.jpg") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.jpg"), - 2: pygame.image.load("3 Button.jpg"), - 3: pygame.image.load("4 Button.jpg"), - 4: pygame.image.load("5 Button.jpg"), - 5: pygame.image.load("6 Button.jpg"), - 6: pygame.image.load("7 Button.jpg"), - 7: pygame.image.load("8 Button.jpg"), - 8: pygame.image.load("9 Button.jpg"), - 9: pygame.image.load("1 Button.jpg") - } - ball = switcher.get(i,pygame.image.load("1 Button.jpg")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 156, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/ImageTypeTest/JPGs 4Max/0 Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/0 Button.jpg Binary files differdeleted file mode 100755 index 7f7680d..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/0 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/1 Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/1 Button.jpg Binary files differdeleted file mode 100755 index 8551018..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/1 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/2 Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/2 Button.jpg Binary files differdeleted file mode 100755 index 6421230..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/2 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/3 Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/3 Button.jpg Binary files differdeleted file mode 100755 index b32dbb8..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/3 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/4 Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/4 Button.jpg Binary files differdeleted file mode 100755 index 12bbf98..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/4 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/5 Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/5 Button.jpg Binary files differdeleted file mode 100755 index 25577d8..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/5 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/6 Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/6 Button.jpg Binary files differdeleted file mode 100755 index 86600b4..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/6 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/7 Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/7 Button.jpg Binary files differdeleted file mode 100755 index ed66268..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/7 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/8 Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/8 Button.jpg Binary files differdeleted file mode 100755 index a7d8ea7..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/8 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/9 Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/9 Button.jpg Binary files differdeleted file mode 100755 index 15c3d40..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/9 Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/Attack Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/Attack Button.jpg Binary files differdeleted file mode 100755 index 0e6c7d4..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/Attack Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/Battle Hand.jpg b/devtools/ImageTypeTest/JPGs 4Max/Battle Hand.jpg Binary files differdeleted file mode 100755 index c66747f..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/Battle Hand.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/Blank Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/Blank Button.jpg Binary files differdeleted file mode 100755 index 5b29ee1..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/Blank Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/Clear Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/Clear Button.jpg Binary files differdeleted file mode 100755 index 05a9f54..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/Clear Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/Enter Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/Enter Button.jpg Binary files differdeleted file mode 100755 index c53c9bb..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/Enter Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/Hand.jpg b/devtools/ImageTypeTest/JPGs 4Max/Hand.jpg Binary files differdeleted file mode 100755 index 5c34f67..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/Hand.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/Item Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/Item Button.jpg Binary files differdeleted file mode 100755 index cef3992..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/Item Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/Magic Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/Magic Button.jpg Binary files differdeleted file mode 100755 index 8b1b039..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/Magic Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/Pause Screen.jpg b/devtools/ImageTypeTest/JPGs 4Max/Pause Screen.jpg Binary files differdeleted file mode 100755 index 7fd0d65..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/Pause Screen.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/Special Button.jpg b/devtools/ImageTypeTest/JPGs 4Max/Special Button.jpg Binary files differdeleted file mode 100755 index 694884a..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/Special Button.jpg +++ /dev/null diff --git a/devtools/ImageTypeTest/JPGs 4Max/bounce.py b/devtools/ImageTypeTest/JPGs 4Max/bounce.py deleted file mode 100755 index db16274..0000000 --- a/devtools/ImageTypeTest/JPGs 4Max/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.jpg") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.jpg"), - 2: pygame.image.load("3 Button.jpg"), - 3: pygame.image.load("4 Button.jpg"), - 4: pygame.image.load("5 Button.jpg"), - 5: pygame.image.load("6 Button.jpg"), - 6: pygame.image.load("7 Button.jpg"), - 7: pygame.image.load("8 Button.jpg"), - 8: pygame.image.load("9 Button.jpg"), - 9: pygame.image.load("1 Button.jpg") - } - ball = switcher.get(i,pygame.image.load("1 Button.jpg")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 153, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/ImageTypeTest/PNGs Indexed/1 Button.png b/devtools/ImageTypeTest/PNGs Indexed/1 Button.png Binary files differdeleted file mode 100755 index 6faafa1..0000000 --- a/devtools/ImageTypeTest/PNGs Indexed/1 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Indexed/2 Button.png b/devtools/ImageTypeTest/PNGs Indexed/2 Button.png Binary files differdeleted file mode 100755 index 6abdc88..0000000 --- a/devtools/ImageTypeTest/PNGs Indexed/2 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Indexed/3 Button.png b/devtools/ImageTypeTest/PNGs Indexed/3 Button.png Binary files differdeleted file mode 100755 index 5481253..0000000 --- a/devtools/ImageTypeTest/PNGs Indexed/3 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Indexed/4 Button.png b/devtools/ImageTypeTest/PNGs Indexed/4 Button.png Binary files differdeleted file mode 100755 index 9da909e..0000000 --- a/devtools/ImageTypeTest/PNGs Indexed/4 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Indexed/5 Button.png b/devtools/ImageTypeTest/PNGs Indexed/5 Button.png Binary files differdeleted file mode 100755 index 2ce9ba6..0000000 --- a/devtools/ImageTypeTest/PNGs Indexed/5 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Indexed/6 Button.png b/devtools/ImageTypeTest/PNGs Indexed/6 Button.png Binary files differdeleted file mode 100755 index a280c37..0000000 --- a/devtools/ImageTypeTest/PNGs Indexed/6 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Indexed/7 Button.png b/devtools/ImageTypeTest/PNGs Indexed/7 Button.png Binary files differdeleted file mode 100755 index 3c91653..0000000 --- a/devtools/ImageTypeTest/PNGs Indexed/7 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Indexed/8 Button.png b/devtools/ImageTypeTest/PNGs Indexed/8 Button.png Binary files differdeleted file mode 100755 index c9acde9..0000000 --- a/devtools/ImageTypeTest/PNGs Indexed/8 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Indexed/9 Button.png b/devtools/ImageTypeTest/PNGs Indexed/9 Button.png Binary files differdeleted file mode 100755 index 7ffd035..0000000 --- a/devtools/ImageTypeTest/PNGs Indexed/9 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Indexed/bounce.py b/devtools/ImageTypeTest/PNGs Indexed/bounce.py deleted file mode 100755 index df34a0e..0000000 --- a/devtools/ImageTypeTest/PNGs Indexed/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.png") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.png"), - 2: pygame.image.load("3 Button.png"), - 3: pygame.image.load("4 Button.png"), - 4: pygame.image.load("5 Button.png"), - 5: pygame.image.load("6 Button.png"), - 6: pygame.image.load("7 Button.png"), - 7: pygame.image.load("8 Button.png"), - 8: pygame.image.load("9 Button.png"), - 9: pygame.image.load("1 Button.png") - } - ball = switcher.get(i,pygame.image.load("1 Button.png")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 153, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/ImageTypeTest/PNGs Transparent/1 Button.png b/devtools/ImageTypeTest/PNGs Transparent/1 Button.png Binary files differdeleted file mode 100755 index dab1239..0000000 --- a/devtools/ImageTypeTest/PNGs Transparent/1 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Transparent/2 Button.png b/devtools/ImageTypeTest/PNGs Transparent/2 Button.png Binary files differdeleted file mode 100755 index 56312a7..0000000 --- a/devtools/ImageTypeTest/PNGs Transparent/2 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Transparent/3 Button.png b/devtools/ImageTypeTest/PNGs Transparent/3 Button.png Binary files differdeleted file mode 100755 index 4ceb540..0000000 --- a/devtools/ImageTypeTest/PNGs Transparent/3 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Transparent/4 Button.png b/devtools/ImageTypeTest/PNGs Transparent/4 Button.png Binary files differdeleted file mode 100755 index 38d640a..0000000 --- a/devtools/ImageTypeTest/PNGs Transparent/4 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Transparent/5 Button.png b/devtools/ImageTypeTest/PNGs Transparent/5 Button.png Binary files differdeleted file mode 100755 index dcc14d4..0000000 --- a/devtools/ImageTypeTest/PNGs Transparent/5 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Transparent/6 Button.png b/devtools/ImageTypeTest/PNGs Transparent/6 Button.png Binary files differdeleted file mode 100755 index cb2f933..0000000 --- a/devtools/ImageTypeTest/PNGs Transparent/6 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Transparent/7 Button.png b/devtools/ImageTypeTest/PNGs Transparent/7 Button.png Binary files differdeleted file mode 100755 index 497ed6f..0000000 --- a/devtools/ImageTypeTest/PNGs Transparent/7 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Transparent/8 Button.png b/devtools/ImageTypeTest/PNGs Transparent/8 Button.png Binary files differdeleted file mode 100755 index 693ac1e..0000000 --- a/devtools/ImageTypeTest/PNGs Transparent/8 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Transparent/9 Button.png b/devtools/ImageTypeTest/PNGs Transparent/9 Button.png Binary files differdeleted file mode 100755 index e83b570..0000000 --- a/devtools/ImageTypeTest/PNGs Transparent/9 Button.png +++ /dev/null diff --git a/devtools/ImageTypeTest/PNGs Transparent/bounce.py b/devtools/ImageTypeTest/PNGs Transparent/bounce.py deleted file mode 100755 index 284947c..0000000 --- a/devtools/ImageTypeTest/PNGs Transparent/bounce.py +++ /dev/null @@ -1,65 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.png") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.png"), - 2: pygame.image.load("3 Button.png"), - 3: pygame.image.load("4 Button.png"), - 4: pygame.image.load("5 Button.png"), - 5: pygame.image.load("6 Button.png"), - 6: pygame.image.load("7 Button.png"), - 7: pygame.image.load("8 Button.png"), - 8: pygame.image.load("9 Button.png"), - 9: pygame.image.load("1 Button.png") - } - ball = switcher.get(i,pygame.image.load("1 Button.png")) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/ImageTypeTest/imageTest.py b/devtools/ImageTypeTest/imageTest.py deleted file mode 100644 index 71d39fd..0000000 --- a/devtools/ImageTypeTest/imageTest.py +++ /dev/null @@ -1,112 +0,0 @@ -import sys, pygame, time -pygame.init() - -print "Full Test - Authors Dave Silverman and Scott Mengel" -print "Set size to 600 x 400 px" -print "Running..." - -#-------------------------------------------------------------- -#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 n -colorkey=(255, 152, 0) - -ftArr=[ ["bmp","BMPs 16-Bits/"] , ["bmp","BMPs 24-Bits/"] , ["bmp","BMPs 32-Bits/"] , ["gif","GIFs/"] , ["gif","GIFs Transparent/"] , ["jpg","JPGs 1Low/"] , ["jpg","JPGs 2Medium/"] , ["jpg","JPGs 3High/"] , ["jpg","JPGs 4Max/"] , ["png","PNGs Indexed/"] , ["png","PNGs Transparent/"] ] - -screen = pygame.display.set_mode(size) #Screen Set 600x400 -background = 152, 251, 152 # pale green - -#The switch function -#------------------------------------------------------------- -def chngImg(): - cnt=make - while cnt>0: - switcher = { - 1: pygame.image.load("%s2 Button.%s"%(ft[1],ft[0])), - 2: pygame.image.load("%s3 Button.%s"%(ft[1],ft[0])), - 3: pygame.image.load("%s4 Button.%s"%(ft[1],ft[0])), - 4: pygame.image.load("%s5 Button.%s"%(ft[1],ft[0])), - 5: pygame.image.load("%s6 Button.%s"%(ft[1],ft[0])), - 6: pygame.image.load("%s7 Button.%s"%(ft[1],ft[0])), - 7: pygame.image.load("%s8 Button.%s"%(ft[1],ft[0])), - 8: pygame.image.load("%s9 Button.%s"%(ft[1],ft[0])), - 9: pygame.image.load("%s1 Button.%s"%(ft[1],ft[0])) - } - img[cnt,0]=switcher.get(i,pygame.image.load("%s1 Button.%s"%(ft[1],ft[0]))) - #img[cnt,0].set_colorkey(colorkey, pygame.RLEACCEL) - #img[cnt,0].resize(200,200) this is for resizing an image - #pygame.transform.scale(img[cnt,0],(200, 200)) - img[cnt,0] = pygame.transform.scale(img[cnt,0],(20, 20)) - cnt=cnt-1 -#----------------------------------------------------------------- -#Collision detection - -def collision(): - cnt=make - while cnt>0: - if img[cnt,1].left < 0 or img[cnt,1].right > width: - img[cnt,2]=[ -img[cnt,2][0], img[cnt,2][1] ] - if img[cnt,1].top < 0 or img[cnt,1].bottom > height: - img[cnt,2]=[ img[cnt,2][0], -img[cnt,2][1] ] - img[cnt,1] = img[cnt,1].move(img[cnt,2]) - screen.blit(img[cnt,0],img[cnt,1]) - cnt=cnt-1 - pygame.display.flip() -#----------------------------------------------------------------- -#----------------------------------------------------------------- -#----------------------------------------------------------------- -#----------------------------------------------------------------- -while 1: - cnt=make - ft=ftArr[t] - print "Testing "+ft[1]+"N Button."+ft[0] - trial=5 - while trial>0: - while cnt>0: - img[cnt,0]= pygame.image.load("%s1 Button.%s"%(ft[1],ft[0])) #image.load - img[cnt,0] = pygame.transform.scale(img[cnt,0],(20, 20)) - img[cnt,1]= img[cnt,0].get_rect() - img[cnt,2]= [2,2] #speed - m=cnt*40 # named m cause i wanted some m&ms - img[cnt,1]=img[cnt,1].move(m,m) #see? it wasn't as tastey though - cnt=cnt-1 - r=0 - start=time.time() -# ----------------------------------------------------------------- - while 1: - chngImg() - i=i+1 - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - -# speed1=collision(ballrect1,speed1) -# ballrect1 = ballrect1.move(speed1) - - collision() - screen.fill(background) - -# cnt=make -# while cnt>0: -# screen.blit(ball1, ballrect1) -# screen.blit(img[cnt,0],img[cnt,1]) -# cnt=cnt-1 -# -# pygame.display.flip() - - r=r+1 - if r>500: break - -# ----------------------------------------------------------------- -# ----------------------------------------------------------------- - - print 1/((time.time()-start)/r) - trial=trial-1 - t=t+1 diff --git a/devtools/ImageTypeTest/test.py b/devtools/ImageTypeTest/test.py deleted file mode 100755 index c06596a..0000000 --- a/devtools/ImageTypeTest/test.py +++ /dev/null @@ -1,109 +0,0 @@ -#! /usr/bin/env python -import sys, pygame, time -pygame.init() - -print "Full Test - Authors Dave Silverman and Scott Mengel" -print "Set size to 600 x 400 px" -print "Running..." - -#-------------------------------------------------------------- -#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 n -colorkey=(255, 152, 0) - -ftArr=[ ["bmp","BMPs 16-Bits/"] , ["bmp","BMPs 24-Bits/"] , ["bmp","BMPs 32-Bits/"] , ["gif","GIFs/"] , ["gif","GIFs Transparent/"] , ["jpg","JPGs 1Low/"] , ["jpg","JPGs 2Medium/"] , ["jpg","JPGs 3High/"] , ["jpg","JPGs 4Max/"] , ["png","PNGs Indexed/"] , ["png","PNGs Transparent/"] ] - -screen = pygame.display.set_mode(size) #Screen Set 600x400 -background = 152, 251, 152 # pale green - -#The switch function -#------------------------------------------------------------- -def chngImg(): - cnt=make - while cnt>0: - switcher = { - 1: pygame.image.load("%s2 Button.%s"%(ft[1],ft[0])), - 2: pygame.image.load("%s3 Button.%s"%(ft[1],ft[0])), - 3: pygame.image.load("%s4 Button.%s"%(ft[1],ft[0])), - 4: pygame.image.load("%s5 Button.%s"%(ft[1],ft[0])), - 5: pygame.image.load("%s6 Button.%s"%(ft[1],ft[0])), - 6: pygame.image.load("%s7 Button.%s"%(ft[1],ft[0])), - 7: pygame.image.load("%s8 Button.%s"%(ft[1],ft[0])), - 8: pygame.image.load("%s9 Button.%s"%(ft[1],ft[0])), - 9: pygame.image.load("%s1 Button.%s"%(ft[1],ft[0])) - } - img[cnt,0]=switcher.get(i,pygame.image.load("%s1 Button.%s"%(ft[1],ft[0]))) - #img[cnt,0].set_colorkey(colorkey, pygame.RLEACCEL) - cnt=cnt-1 -#----------------------------------------------------------------- -#Collision detection - -def collision(): - cnt=make - while cnt>0: - if img[cnt,1].left < 0 or img[cnt,1].right > width: - img[cnt,2]=[ -img[cnt,2][0], img[cnt,2][1] ] - if img[cnt,1].top < 0 or img[cnt,1].bottom > height: - img[cnt,2]=[ img[cnt,2][0], -img[cnt,2][1] ] - img[cnt,1] = img[cnt,1].move(img[cnt,2]) - screen.blit(img[cnt,0],img[cnt,1]) - cnt=cnt-1 - pygame.display.flip() -#----------------------------------------------------------------- -#----------------------------------------------------------------- -#----------------------------------------------------------------- -#----------------------------------------------------------------- -while 1: - cnt=make - ft=ftArr[t] - print "Testing "+ft[1]+"N Button."+ft[0] - trial=5 - while trial>0: - while cnt>0: - img[cnt,0]= pygame.image.load("%s1 Button.%s"%(ft[1],ft[0])) #image.load - img[cnt,1]= img[cnt,0].get_rect() - img[cnt,2]= [2,2] #speed - m=cnt*40 # named m cause i wanted some m&ms - img[cnt,1]=img[cnt,1].move(m,m) #see? it wasn't as tastey though - cnt=cnt-1 - r=0 - start=time.time() -# ----------------------------------------------------------------- - while 1: - chngImg() - i=i+1 - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - -# speed1=collision(ballrect1,speed1) -# ballrect1 = ballrect1.move(speed1) - - collision() - screen.fill(background) - -# cnt=make -# while cnt>0: -# screen.blit(ball1, ballrect1) -# screen.blit(img[cnt,0],img[cnt,1]) -# cnt=cnt-1 -# -# pygame.display.flip() - - r=r+1 - if r>500: break - -# ----------------------------------------------------------------- -# ----------------------------------------------------------------- - - print 1/((time.time()-start)/r) - trial=trial-1 - t=t+1 diff --git a/devtools/ScaleTypeTest/BMP16100/1.bmp b/devtools/ScaleTypeTest/BMP16100/1.bmp Binary files differdeleted file mode 100755 index 57630e3..0000000 --- a/devtools/ScaleTypeTest/BMP16100/1.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16100/2.bmp b/devtools/ScaleTypeTest/BMP16100/2.bmp Binary files differdeleted file mode 100755 index 90af77a..0000000 --- a/devtools/ScaleTypeTest/BMP16100/2.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16100/3.bmp b/devtools/ScaleTypeTest/BMP16100/3.bmp Binary files differdeleted file mode 100755 index 1751a4a..0000000 --- a/devtools/ScaleTypeTest/BMP16100/3.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16100/4.bmp b/devtools/ScaleTypeTest/BMP16100/4.bmp Binary files differdeleted file mode 100755 index 1f292d1..0000000 --- a/devtools/ScaleTypeTest/BMP16100/4.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16100/5.bmp b/devtools/ScaleTypeTest/BMP16100/5.bmp Binary files differdeleted file mode 100755 index fd8cc0e..0000000 --- a/devtools/ScaleTypeTest/BMP16100/5.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16100/6.bmp b/devtools/ScaleTypeTest/BMP16100/6.bmp Binary files differdeleted file mode 100755 index df3a2eb..0000000 --- a/devtools/ScaleTypeTest/BMP16100/6.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16100/7.bmp b/devtools/ScaleTypeTest/BMP16100/7.bmp Binary files differdeleted file mode 100755 index 51b0052..0000000 --- a/devtools/ScaleTypeTest/BMP16100/7.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16100/8.bmp b/devtools/ScaleTypeTest/BMP16100/8.bmp Binary files differdeleted file mode 100755 index 9302c64..0000000 --- a/devtools/ScaleTypeTest/BMP16100/8.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16100/9.bmp b/devtools/ScaleTypeTest/BMP16100/9.bmp Binary files differdeleted file mode 100755 index f5c6191..0000000 --- a/devtools/ScaleTypeTest/BMP16100/9.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16173/1.bmp b/devtools/ScaleTypeTest/BMP16173/1.bmp Binary files differdeleted file mode 100755 index 20c1d49..0000000 --- a/devtools/ScaleTypeTest/BMP16173/1.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16173/2.bmp b/devtools/ScaleTypeTest/BMP16173/2.bmp Binary files differdeleted file mode 100755 index cc1f8a0..0000000 --- a/devtools/ScaleTypeTest/BMP16173/2.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16173/3.bmp b/devtools/ScaleTypeTest/BMP16173/3.bmp Binary files differdeleted file mode 100755 index 9637106..0000000 --- a/devtools/ScaleTypeTest/BMP16173/3.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16173/4.bmp b/devtools/ScaleTypeTest/BMP16173/4.bmp Binary files differdeleted file mode 100755 index df62974..0000000 --- a/devtools/ScaleTypeTest/BMP16173/4.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16173/5.bmp b/devtools/ScaleTypeTest/BMP16173/5.bmp Binary files differdeleted file mode 100755 index fea0203..0000000 --- a/devtools/ScaleTypeTest/BMP16173/5.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16173/6.bmp b/devtools/ScaleTypeTest/BMP16173/6.bmp Binary files differdeleted file mode 100755 index 5309dfc..0000000 --- a/devtools/ScaleTypeTest/BMP16173/6.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16173/7.bmp b/devtools/ScaleTypeTest/BMP16173/7.bmp Binary files differdeleted file mode 100755 index 268cde2..0000000 --- a/devtools/ScaleTypeTest/BMP16173/7.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16173/8.bmp b/devtools/ScaleTypeTest/BMP16173/8.bmp Binary files differdeleted file mode 100755 index 2fcfd96..0000000 --- a/devtools/ScaleTypeTest/BMP16173/8.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16173/9.bmp b/devtools/ScaleTypeTest/BMP16173/9.bmp Binary files differdeleted file mode 100755 index 461900e..0000000 --- a/devtools/ScaleTypeTest/BMP16173/9.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16200/1.bmp b/devtools/ScaleTypeTest/BMP16200/1.bmp Binary files differdeleted file mode 100755 index 8606ffc..0000000 --- a/devtools/ScaleTypeTest/BMP16200/1.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16200/2.bmp b/devtools/ScaleTypeTest/BMP16200/2.bmp Binary files differdeleted file mode 100755 index 6010f26..0000000 --- a/devtools/ScaleTypeTest/BMP16200/2.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16200/3.bmp b/devtools/ScaleTypeTest/BMP16200/3.bmp Binary files differdeleted file mode 100755 index 6782d68..0000000 --- a/devtools/ScaleTypeTest/BMP16200/3.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16200/4.bmp b/devtools/ScaleTypeTest/BMP16200/4.bmp Binary files differdeleted file mode 100755 index d2a2a7c..0000000 --- a/devtools/ScaleTypeTest/BMP16200/4.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16200/5.bmp b/devtools/ScaleTypeTest/BMP16200/5.bmp Binary files differdeleted file mode 100755 index 863ee74..0000000 --- a/devtools/ScaleTypeTest/BMP16200/5.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16200/6.bmp b/devtools/ScaleTypeTest/BMP16200/6.bmp Binary files differdeleted file mode 100755 index 277191b..0000000 --- a/devtools/ScaleTypeTest/BMP16200/6.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16200/7.bmp b/devtools/ScaleTypeTest/BMP16200/7.bmp Binary files differdeleted file mode 100755 index 4507dd2..0000000 --- a/devtools/ScaleTypeTest/BMP16200/7.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16200/8.bmp b/devtools/ScaleTypeTest/BMP16200/8.bmp Binary files differdeleted file mode 100755 index 0c23be3..0000000 --- a/devtools/ScaleTypeTest/BMP16200/8.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16200/9.bmp b/devtools/ScaleTypeTest/BMP16200/9.bmp Binary files differdeleted file mode 100755 index d4fbd1f..0000000 --- a/devtools/ScaleTypeTest/BMP16200/9.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16400/0.bmp b/devtools/ScaleTypeTest/BMP16400/0.bmp Binary files differdeleted file mode 100755 index ff89462..0000000 --- a/devtools/ScaleTypeTest/BMP16400/0.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16400/1.bmp b/devtools/ScaleTypeTest/BMP16400/1.bmp Binary files differdeleted file mode 100755 index 5a8bb85..0000000 --- a/devtools/ScaleTypeTest/BMP16400/1.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16400/2.bmp b/devtools/ScaleTypeTest/BMP16400/2.bmp Binary files differdeleted file mode 100755 index 73f8ac4..0000000 --- a/devtools/ScaleTypeTest/BMP16400/2.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16400/3.bmp b/devtools/ScaleTypeTest/BMP16400/3.bmp Binary files differdeleted file mode 100755 index d762fd4..0000000 --- a/devtools/ScaleTypeTest/BMP16400/3.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16400/4.bmp b/devtools/ScaleTypeTest/BMP16400/4.bmp Binary files differdeleted file mode 100755 index 5fb771b..0000000 --- a/devtools/ScaleTypeTest/BMP16400/4.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16400/5.bmp b/devtools/ScaleTypeTest/BMP16400/5.bmp Binary files differdeleted file mode 100755 index 9516331..0000000 --- a/devtools/ScaleTypeTest/BMP16400/5.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16400/6.bmp b/devtools/ScaleTypeTest/BMP16400/6.bmp Binary files differdeleted file mode 100755 index ae2e12c..0000000 --- a/devtools/ScaleTypeTest/BMP16400/6.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16400/7.bmp b/devtools/ScaleTypeTest/BMP16400/7.bmp Binary files differdeleted file mode 100755 index fedb857..0000000 --- a/devtools/ScaleTypeTest/BMP16400/7.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16400/8.bmp b/devtools/ScaleTypeTest/BMP16400/8.bmp Binary files differdeleted file mode 100755 index 3620d19..0000000 --- a/devtools/ScaleTypeTest/BMP16400/8.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP16400/9.bmp b/devtools/ScaleTypeTest/BMP16400/9.bmp Binary files differdeleted file mode 100755 index c6a07ea..0000000 --- a/devtools/ScaleTypeTest/BMP16400/9.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24100/1.bmp b/devtools/ScaleTypeTest/BMP24100/1.bmp Binary files differdeleted file mode 100755 index e910cec..0000000 --- a/devtools/ScaleTypeTest/BMP24100/1.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24100/2.bmp b/devtools/ScaleTypeTest/BMP24100/2.bmp Binary files differdeleted file mode 100755 index 0545f38..0000000 --- a/devtools/ScaleTypeTest/BMP24100/2.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24100/3.bmp b/devtools/ScaleTypeTest/BMP24100/3.bmp Binary files differdeleted file mode 100755 index a154b29..0000000 --- a/devtools/ScaleTypeTest/BMP24100/3.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24100/4.bmp b/devtools/ScaleTypeTest/BMP24100/4.bmp Binary files differdeleted file mode 100755 index 4ab21f9..0000000 --- a/devtools/ScaleTypeTest/BMP24100/4.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24100/5.bmp b/devtools/ScaleTypeTest/BMP24100/5.bmp Binary files differdeleted file mode 100755 index 0a55d39..0000000 --- a/devtools/ScaleTypeTest/BMP24100/5.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24100/6.bmp b/devtools/ScaleTypeTest/BMP24100/6.bmp Binary files differdeleted file mode 100755 index ad3f1b1..0000000 --- a/devtools/ScaleTypeTest/BMP24100/6.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24100/7.bmp b/devtools/ScaleTypeTest/BMP24100/7.bmp Binary files differdeleted file mode 100755 index 915ab5b..0000000 --- a/devtools/ScaleTypeTest/BMP24100/7.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24100/8.bmp b/devtools/ScaleTypeTest/BMP24100/8.bmp Binary files differdeleted file mode 100755 index b36287d..0000000 --- a/devtools/ScaleTypeTest/BMP24100/8.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24100/9.bmp b/devtools/ScaleTypeTest/BMP24100/9.bmp Binary files differdeleted file mode 100755 index 2cab5a4..0000000 --- a/devtools/ScaleTypeTest/BMP24100/9.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24173/1.bmp b/devtools/ScaleTypeTest/BMP24173/1.bmp Binary files differdeleted file mode 100755 index 664fd2b..0000000 --- a/devtools/ScaleTypeTest/BMP24173/1.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24173/2.bmp b/devtools/ScaleTypeTest/BMP24173/2.bmp Binary files differdeleted file mode 100755 index c8a9844..0000000 --- a/devtools/ScaleTypeTest/BMP24173/2.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24173/3.bmp b/devtools/ScaleTypeTest/BMP24173/3.bmp Binary files differdeleted file mode 100755 index 673f712..0000000 --- a/devtools/ScaleTypeTest/BMP24173/3.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24173/4.bmp b/devtools/ScaleTypeTest/BMP24173/4.bmp Binary files differdeleted file mode 100755 index ef386f2..0000000 --- a/devtools/ScaleTypeTest/BMP24173/4.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24173/5.bmp b/devtools/ScaleTypeTest/BMP24173/5.bmp Binary files differdeleted file mode 100755 index c13f5b9..0000000 --- a/devtools/ScaleTypeTest/BMP24173/5.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24173/6.bmp b/devtools/ScaleTypeTest/BMP24173/6.bmp Binary files differdeleted file mode 100755 index e27051a..0000000 --- a/devtools/ScaleTypeTest/BMP24173/6.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24173/7.bmp b/devtools/ScaleTypeTest/BMP24173/7.bmp Binary files differdeleted file mode 100755 index 0196a04..0000000 --- a/devtools/ScaleTypeTest/BMP24173/7.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24173/8.bmp b/devtools/ScaleTypeTest/BMP24173/8.bmp Binary files differdeleted file mode 100755 index 3978667..0000000 --- a/devtools/ScaleTypeTest/BMP24173/8.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24173/9.bmp b/devtools/ScaleTypeTest/BMP24173/9.bmp Binary files differdeleted file mode 100755 index 9a73428..0000000 --- a/devtools/ScaleTypeTest/BMP24173/9.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24200/1.bmp b/devtools/ScaleTypeTest/BMP24200/1.bmp Binary files differdeleted file mode 100755 index 8cd2247..0000000 --- a/devtools/ScaleTypeTest/BMP24200/1.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24200/2.bmp b/devtools/ScaleTypeTest/BMP24200/2.bmp Binary files differdeleted file mode 100755 index ae60ecd..0000000 --- a/devtools/ScaleTypeTest/BMP24200/2.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24200/3.bmp b/devtools/ScaleTypeTest/BMP24200/3.bmp Binary files differdeleted file mode 100755 index 079ecd0..0000000 --- a/devtools/ScaleTypeTest/BMP24200/3.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24200/4.bmp b/devtools/ScaleTypeTest/BMP24200/4.bmp Binary files differdeleted file mode 100755 index e38f511..0000000 --- a/devtools/ScaleTypeTest/BMP24200/4.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24200/5.bmp b/devtools/ScaleTypeTest/BMP24200/5.bmp Binary files differdeleted file mode 100755 index a02ff49..0000000 --- a/devtools/ScaleTypeTest/BMP24200/5.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24200/6.bmp b/devtools/ScaleTypeTest/BMP24200/6.bmp Binary files differdeleted file mode 100755 index caef3c3..0000000 --- a/devtools/ScaleTypeTest/BMP24200/6.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24200/7.bmp b/devtools/ScaleTypeTest/BMP24200/7.bmp Binary files differdeleted file mode 100755 index 85758c2..0000000 --- a/devtools/ScaleTypeTest/BMP24200/7.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24200/8.bmp b/devtools/ScaleTypeTest/BMP24200/8.bmp Binary files differdeleted file mode 100755 index c42b1e0..0000000 --- a/devtools/ScaleTypeTest/BMP24200/8.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24200/9.bmp b/devtools/ScaleTypeTest/BMP24200/9.bmp Binary files differdeleted file mode 100755 index 2a8cdde..0000000 --- a/devtools/ScaleTypeTest/BMP24200/9.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24400/1.bmp b/devtools/ScaleTypeTest/BMP24400/1.bmp Binary files differdeleted file mode 100755 index 9dc4d7d..0000000 --- a/devtools/ScaleTypeTest/BMP24400/1.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24400/2.bmp b/devtools/ScaleTypeTest/BMP24400/2.bmp Binary files differdeleted file mode 100755 index e5d6c59..0000000 --- a/devtools/ScaleTypeTest/BMP24400/2.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24400/3.bmp b/devtools/ScaleTypeTest/BMP24400/3.bmp Binary files differdeleted file mode 100755 index a36fc67..0000000 --- a/devtools/ScaleTypeTest/BMP24400/3.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24400/4.bmp b/devtools/ScaleTypeTest/BMP24400/4.bmp Binary files differdeleted file mode 100755 index d0f7ee1..0000000 --- a/devtools/ScaleTypeTest/BMP24400/4.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24400/5.bmp b/devtools/ScaleTypeTest/BMP24400/5.bmp Binary files differdeleted file mode 100755 index 1376efb..0000000 --- a/devtools/ScaleTypeTest/BMP24400/5.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24400/6.bmp b/devtools/ScaleTypeTest/BMP24400/6.bmp Binary files differdeleted file mode 100755 index a7e1ba8..0000000 --- a/devtools/ScaleTypeTest/BMP24400/6.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24400/7.bmp b/devtools/ScaleTypeTest/BMP24400/7.bmp Binary files differdeleted file mode 100755 index 7750f50..0000000 --- a/devtools/ScaleTypeTest/BMP24400/7.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24400/8.bmp b/devtools/ScaleTypeTest/BMP24400/8.bmp Binary files differdeleted file mode 100755 index 9afd90b..0000000 --- a/devtools/ScaleTypeTest/BMP24400/8.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/BMP24400/9.bmp b/devtools/ScaleTypeTest/BMP24400/9.bmp Binary files differdeleted file mode 100755 index 7132958..0000000 --- a/devtools/ScaleTypeTest/BMP24400/9.bmp +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF100/1.gif b/devtools/ScaleTypeTest/GIF100/1.gif Binary files differdeleted file mode 100755 index 4a89216..0000000 --- a/devtools/ScaleTypeTest/GIF100/1.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF100/2.gif b/devtools/ScaleTypeTest/GIF100/2.gif Binary files differdeleted file mode 100755 index b5019d8..0000000 --- a/devtools/ScaleTypeTest/GIF100/2.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF100/3.gif b/devtools/ScaleTypeTest/GIF100/3.gif Binary files differdeleted file mode 100755 index a87ddc6..0000000 --- a/devtools/ScaleTypeTest/GIF100/3.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF100/4.gif b/devtools/ScaleTypeTest/GIF100/4.gif Binary files differdeleted file mode 100755 index 2a398e6..0000000 --- a/devtools/ScaleTypeTest/GIF100/4.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF100/5.gif b/devtools/ScaleTypeTest/GIF100/5.gif Binary files differdeleted file mode 100755 index 93e5b8d..0000000 --- a/devtools/ScaleTypeTest/GIF100/5.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF100/6.gif b/devtools/ScaleTypeTest/GIF100/6.gif Binary files differdeleted file mode 100755 index 0e73825..0000000 --- a/devtools/ScaleTypeTest/GIF100/6.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF100/7.gif b/devtools/ScaleTypeTest/GIF100/7.gif Binary files differdeleted file mode 100755 index 061669a..0000000 --- a/devtools/ScaleTypeTest/GIF100/7.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF100/8.gif b/devtools/ScaleTypeTest/GIF100/8.gif Binary files differdeleted file mode 100755 index 90dcfda..0000000 --- a/devtools/ScaleTypeTest/GIF100/8.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF100/9.gif b/devtools/ScaleTypeTest/GIF100/9.gif Binary files differdeleted file mode 100755 index aa194d9..0000000 --- a/devtools/ScaleTypeTest/GIF100/9.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF173/1.gif b/devtools/ScaleTypeTest/GIF173/1.gif Binary files differdeleted file mode 100755 index 3323f2e..0000000 --- a/devtools/ScaleTypeTest/GIF173/1.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF173/2.gif b/devtools/ScaleTypeTest/GIF173/2.gif Binary files differdeleted file mode 100755 index d5426f2..0000000 --- a/devtools/ScaleTypeTest/GIF173/2.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF173/3.gif b/devtools/ScaleTypeTest/GIF173/3.gif Binary files differdeleted file mode 100755 index dda1828..0000000 --- a/devtools/ScaleTypeTest/GIF173/3.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF173/4.gif b/devtools/ScaleTypeTest/GIF173/4.gif Binary files differdeleted file mode 100755 index ff5e222..0000000 --- a/devtools/ScaleTypeTest/GIF173/4.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF173/5.gif b/devtools/ScaleTypeTest/GIF173/5.gif Binary files differdeleted file mode 100755 index d028b0a..0000000 --- a/devtools/ScaleTypeTest/GIF173/5.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF173/6.gif b/devtools/ScaleTypeTest/GIF173/6.gif Binary files differdeleted file mode 100755 index cf606bb..0000000 --- a/devtools/ScaleTypeTest/GIF173/6.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF173/7.gif b/devtools/ScaleTypeTest/GIF173/7.gif Binary files differdeleted file mode 100755 index f1232cc..0000000 --- a/devtools/ScaleTypeTest/GIF173/7.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF173/8.gif b/devtools/ScaleTypeTest/GIF173/8.gif Binary files differdeleted file mode 100755 index 5069472..0000000 --- a/devtools/ScaleTypeTest/GIF173/8.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF173/9.gif b/devtools/ScaleTypeTest/GIF173/9.gif Binary files differdeleted file mode 100755 index a288e81..0000000 --- a/devtools/ScaleTypeTest/GIF173/9.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF200/1.gif b/devtools/ScaleTypeTest/GIF200/1.gif Binary files differdeleted file mode 100755 index fe61a8c..0000000 --- a/devtools/ScaleTypeTest/GIF200/1.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF200/2.gif b/devtools/ScaleTypeTest/GIF200/2.gif Binary files differdeleted file mode 100755 index edf0e73..0000000 --- a/devtools/ScaleTypeTest/GIF200/2.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF200/3.gif b/devtools/ScaleTypeTest/GIF200/3.gif Binary files differdeleted file mode 100755 index f4449f4..0000000 --- a/devtools/ScaleTypeTest/GIF200/3.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF200/4.gif b/devtools/ScaleTypeTest/GIF200/4.gif Binary files differdeleted file mode 100755 index f9c6344..0000000 --- a/devtools/ScaleTypeTest/GIF200/4.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF200/5.gif b/devtools/ScaleTypeTest/GIF200/5.gif Binary files differdeleted file mode 100755 index 604fba4..0000000 --- a/devtools/ScaleTypeTest/GIF200/5.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF200/6.gif b/devtools/ScaleTypeTest/GIF200/6.gif Binary files differdeleted file mode 100755 index 63e85d6..0000000 --- a/devtools/ScaleTypeTest/GIF200/6.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF200/7.gif b/devtools/ScaleTypeTest/GIF200/7.gif Binary files differdeleted file mode 100755 index 9a7afd9..0000000 --- a/devtools/ScaleTypeTest/GIF200/7.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF200/8.gif b/devtools/ScaleTypeTest/GIF200/8.gif Binary files differdeleted file mode 100755 index 05fb50d..0000000 --- a/devtools/ScaleTypeTest/GIF200/8.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF200/9.gif b/devtools/ScaleTypeTest/GIF200/9.gif Binary files differdeleted file mode 100755 index 6694073..0000000 --- a/devtools/ScaleTypeTest/GIF200/9.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF400/1.gif b/devtools/ScaleTypeTest/GIF400/1.gif Binary files differdeleted file mode 100755 index 7020dbb..0000000 --- a/devtools/ScaleTypeTest/GIF400/1.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF400/2.gif b/devtools/ScaleTypeTest/GIF400/2.gif Binary files differdeleted file mode 100755 index 3c59c20..0000000 --- a/devtools/ScaleTypeTest/GIF400/2.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF400/3.gif b/devtools/ScaleTypeTest/GIF400/3.gif Binary files differdeleted file mode 100755 index f0c489b..0000000 --- a/devtools/ScaleTypeTest/GIF400/3.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF400/4.gif b/devtools/ScaleTypeTest/GIF400/4.gif Binary files differdeleted file mode 100755 index afa0654..0000000 --- a/devtools/ScaleTypeTest/GIF400/4.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF400/5.gif b/devtools/ScaleTypeTest/GIF400/5.gif Binary files differdeleted file mode 100755 index 58526be..0000000 --- a/devtools/ScaleTypeTest/GIF400/5.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF400/6.gif b/devtools/ScaleTypeTest/GIF400/6.gif Binary files differdeleted file mode 100755 index 81065e2..0000000 --- a/devtools/ScaleTypeTest/GIF400/6.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF400/7.gif b/devtools/ScaleTypeTest/GIF400/7.gif Binary files differdeleted file mode 100755 index 2eb5844..0000000 --- a/devtools/ScaleTypeTest/GIF400/7.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF400/8.gif b/devtools/ScaleTypeTest/GIF400/8.gif Binary files differdeleted file mode 100755 index 7b46a83..0000000 --- a/devtools/ScaleTypeTest/GIF400/8.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIF400/9.gif b/devtools/ScaleTypeTest/GIF400/9.gif Binary files differdeleted file mode 100755 index f148495..0000000 --- a/devtools/ScaleTypeTest/GIF400/9.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT100/1.gif b/devtools/ScaleTypeTest/GIFT100/1.gif Binary files differdeleted file mode 100755 index 2aad244..0000000 --- a/devtools/ScaleTypeTest/GIFT100/1.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT100/2.gif b/devtools/ScaleTypeTest/GIFT100/2.gif Binary files differdeleted file mode 100755 index ed22525..0000000 --- a/devtools/ScaleTypeTest/GIFT100/2.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT100/3.gif b/devtools/ScaleTypeTest/GIFT100/3.gif Binary files differdeleted file mode 100755 index 246cd12..0000000 --- a/devtools/ScaleTypeTest/GIFT100/3.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT100/4.gif b/devtools/ScaleTypeTest/GIFT100/4.gif Binary files differdeleted file mode 100755 index 722f240..0000000 --- a/devtools/ScaleTypeTest/GIFT100/4.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT100/5.gif b/devtools/ScaleTypeTest/GIFT100/5.gif Binary files differdeleted file mode 100755 index 6a71348..0000000 --- a/devtools/ScaleTypeTest/GIFT100/5.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT100/6.gif b/devtools/ScaleTypeTest/GIFT100/6.gif Binary files differdeleted file mode 100755 index 0dd2145..0000000 --- a/devtools/ScaleTypeTest/GIFT100/6.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT100/7.gif b/devtools/ScaleTypeTest/GIFT100/7.gif Binary files differdeleted file mode 100755 index 1e9914b..0000000 --- a/devtools/ScaleTypeTest/GIFT100/7.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT100/8.gif b/devtools/ScaleTypeTest/GIFT100/8.gif Binary files differdeleted file mode 100755 index 390124b..0000000 --- a/devtools/ScaleTypeTest/GIFT100/8.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT100/9.gif b/devtools/ScaleTypeTest/GIFT100/9.gif Binary files differdeleted file mode 100755 index 61c8c3c..0000000 --- a/devtools/ScaleTypeTest/GIFT100/9.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT173/1.gif b/devtools/ScaleTypeTest/GIFT173/1.gif Binary files differdeleted file mode 100755 index 844143b..0000000 --- a/devtools/ScaleTypeTest/GIFT173/1.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT173/2.gif b/devtools/ScaleTypeTest/GIFT173/2.gif Binary files differdeleted file mode 100755 index 0d2f0c1..0000000 --- a/devtools/ScaleTypeTest/GIFT173/2.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT173/3.gif b/devtools/ScaleTypeTest/GIFT173/3.gif Binary files differdeleted file mode 100755 index bc24472..0000000 --- a/devtools/ScaleTypeTest/GIFT173/3.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT173/4.gif b/devtools/ScaleTypeTest/GIFT173/4.gif Binary files differdeleted file mode 100755 index bb49322..0000000 --- a/devtools/ScaleTypeTest/GIFT173/4.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT173/5.gif b/devtools/ScaleTypeTest/GIFT173/5.gif Binary files differdeleted file mode 100755 index 6253999..0000000 --- a/devtools/ScaleTypeTest/GIFT173/5.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT173/6.gif b/devtools/ScaleTypeTest/GIFT173/6.gif Binary files differdeleted file mode 100755 index 8b56643..0000000 --- a/devtools/ScaleTypeTest/GIFT173/6.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT173/7.gif b/devtools/ScaleTypeTest/GIFT173/7.gif Binary files differdeleted file mode 100755 index 2cfd2e2..0000000 --- a/devtools/ScaleTypeTest/GIFT173/7.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT173/8.gif b/devtools/ScaleTypeTest/GIFT173/8.gif Binary files differdeleted file mode 100755 index 9541df0..0000000 --- a/devtools/ScaleTypeTest/GIFT173/8.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT173/9.gif b/devtools/ScaleTypeTest/GIFT173/9.gif Binary files differdeleted file mode 100755 index 035f1fc..0000000 --- a/devtools/ScaleTypeTest/GIFT173/9.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT200/1.gif b/devtools/ScaleTypeTest/GIFT200/1.gif Binary files differdeleted file mode 100755 index a8c7fdc..0000000 --- a/devtools/ScaleTypeTest/GIFT200/1.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT200/2.gif b/devtools/ScaleTypeTest/GIFT200/2.gif Binary files differdeleted file mode 100755 index 239d0eb..0000000 --- a/devtools/ScaleTypeTest/GIFT200/2.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT200/3.gif b/devtools/ScaleTypeTest/GIFT200/3.gif Binary files differdeleted file mode 100755 index fcbff82..0000000 --- a/devtools/ScaleTypeTest/GIFT200/3.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT200/4.gif b/devtools/ScaleTypeTest/GIFT200/4.gif Binary files differdeleted file mode 100755 index d25e187..0000000 --- a/devtools/ScaleTypeTest/GIFT200/4.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT200/5.gif b/devtools/ScaleTypeTest/GIFT200/5.gif Binary files differdeleted file mode 100755 index 78c0add..0000000 --- a/devtools/ScaleTypeTest/GIFT200/5.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT200/6.gif b/devtools/ScaleTypeTest/GIFT200/6.gif Binary files differdeleted file mode 100755 index 8dd53f7..0000000 --- a/devtools/ScaleTypeTest/GIFT200/6.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT200/7.gif b/devtools/ScaleTypeTest/GIFT200/7.gif Binary files differdeleted file mode 100755 index d807073..0000000 --- a/devtools/ScaleTypeTest/GIFT200/7.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT200/8.gif b/devtools/ScaleTypeTest/GIFT200/8.gif Binary files differdeleted file mode 100755 index 88c7a01..0000000 --- a/devtools/ScaleTypeTest/GIFT200/8.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT200/9.gif b/devtools/ScaleTypeTest/GIFT200/9.gif Binary files differdeleted file mode 100755 index 37813cf..0000000 --- a/devtools/ScaleTypeTest/GIFT200/9.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT400/1.gif b/devtools/ScaleTypeTest/GIFT400/1.gif Binary files differdeleted file mode 100755 index 3678c97..0000000 --- a/devtools/ScaleTypeTest/GIFT400/1.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT400/2.gif b/devtools/ScaleTypeTest/GIFT400/2.gif Binary files differdeleted file mode 100755 index 6670dbf..0000000 --- a/devtools/ScaleTypeTest/GIFT400/2.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT400/3.gif b/devtools/ScaleTypeTest/GIFT400/3.gif Binary files differdeleted file mode 100755 index 2791314..0000000 --- a/devtools/ScaleTypeTest/GIFT400/3.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT400/4.gif b/devtools/ScaleTypeTest/GIFT400/4.gif Binary files differdeleted file mode 100755 index a955f57..0000000 --- a/devtools/ScaleTypeTest/GIFT400/4.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT400/5.gif b/devtools/ScaleTypeTest/GIFT400/5.gif Binary files differdeleted file mode 100755 index 0200481..0000000 --- a/devtools/ScaleTypeTest/GIFT400/5.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT400/6.gif b/devtools/ScaleTypeTest/GIFT400/6.gif Binary files differdeleted file mode 100755 index 59f284e..0000000 --- a/devtools/ScaleTypeTest/GIFT400/6.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT400/7.gif b/devtools/ScaleTypeTest/GIFT400/7.gif Binary files differdeleted file mode 100755 index 9c69ca0..0000000 --- a/devtools/ScaleTypeTest/GIFT400/7.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT400/8.gif b/devtools/ScaleTypeTest/GIFT400/8.gif Binary files differdeleted file mode 100755 index 044b3cc..0000000 --- a/devtools/ScaleTypeTest/GIFT400/8.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/GIFT400/9.gif b/devtools/ScaleTypeTest/GIFT400/9.gif Binary files differdeleted file mode 100755 index 68d365e..0000000 --- a/devtools/ScaleTypeTest/GIFT400/9.gif +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG100/1.png b/devtools/ScaleTypeTest/PNG100/1.png Binary files differdeleted file mode 100755 index 663ca83..0000000 --- a/devtools/ScaleTypeTest/PNG100/1.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG100/2.png b/devtools/ScaleTypeTest/PNG100/2.png Binary files differdeleted file mode 100755 index 6f44ab5..0000000 --- a/devtools/ScaleTypeTest/PNG100/2.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG100/3.png b/devtools/ScaleTypeTest/PNG100/3.png Binary files differdeleted file mode 100755 index c49ab7e..0000000 --- a/devtools/ScaleTypeTest/PNG100/3.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG100/4.png b/devtools/ScaleTypeTest/PNG100/4.png Binary files differdeleted file mode 100755 index 63eb7e2..0000000 --- a/devtools/ScaleTypeTest/PNG100/4.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG100/5.png b/devtools/ScaleTypeTest/PNG100/5.png Binary files differdeleted file mode 100755 index 2aaa600..0000000 --- a/devtools/ScaleTypeTest/PNG100/5.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG100/6.png b/devtools/ScaleTypeTest/PNG100/6.png Binary files differdeleted file mode 100755 index 8fa9737..0000000 --- a/devtools/ScaleTypeTest/PNG100/6.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG100/7.png b/devtools/ScaleTypeTest/PNG100/7.png Binary files differdeleted file mode 100755 index 1de0311..0000000 --- a/devtools/ScaleTypeTest/PNG100/7.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG100/8.png b/devtools/ScaleTypeTest/PNG100/8.png Binary files differdeleted file mode 100755 index 7d6332a..0000000 --- a/devtools/ScaleTypeTest/PNG100/8.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG100/9.png b/devtools/ScaleTypeTest/PNG100/9.png Binary files differdeleted file mode 100755 index 5a8b0ea..0000000 --- a/devtools/ScaleTypeTest/PNG100/9.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG173/1.png b/devtools/ScaleTypeTest/PNG173/1.png Binary files differdeleted file mode 100755 index 0fe2c13..0000000 --- a/devtools/ScaleTypeTest/PNG173/1.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG173/2.png b/devtools/ScaleTypeTest/PNG173/2.png Binary files differdeleted file mode 100755 index 63e8040..0000000 --- a/devtools/ScaleTypeTest/PNG173/2.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG173/3.png b/devtools/ScaleTypeTest/PNG173/3.png Binary files differdeleted file mode 100755 index 8474896..0000000 --- a/devtools/ScaleTypeTest/PNG173/3.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG173/4.png b/devtools/ScaleTypeTest/PNG173/4.png Binary files differdeleted file mode 100755 index b135920..0000000 --- a/devtools/ScaleTypeTest/PNG173/4.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG173/5.png b/devtools/ScaleTypeTest/PNG173/5.png Binary files differdeleted file mode 100755 index 2f017f8..0000000 --- a/devtools/ScaleTypeTest/PNG173/5.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG173/6.png b/devtools/ScaleTypeTest/PNG173/6.png Binary files differdeleted file mode 100755 index af0182f..0000000 --- a/devtools/ScaleTypeTest/PNG173/6.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG173/7.png b/devtools/ScaleTypeTest/PNG173/7.png Binary files differdeleted file mode 100755 index 2e5d2ab..0000000 --- a/devtools/ScaleTypeTest/PNG173/7.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG173/8.png b/devtools/ScaleTypeTest/PNG173/8.png Binary files differdeleted file mode 100755 index 8fa5983..0000000 --- a/devtools/ScaleTypeTest/PNG173/8.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG173/9.png b/devtools/ScaleTypeTest/PNG173/9.png Binary files differdeleted file mode 100755 index 3b2a56c..0000000 --- a/devtools/ScaleTypeTest/PNG173/9.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG200/1.png b/devtools/ScaleTypeTest/PNG200/1.png Binary files differdeleted file mode 100755 index 4af1285..0000000 --- a/devtools/ScaleTypeTest/PNG200/1.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG200/2.png b/devtools/ScaleTypeTest/PNG200/2.png Binary files differdeleted file mode 100755 index f67a2e7..0000000 --- a/devtools/ScaleTypeTest/PNG200/2.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG200/3.png b/devtools/ScaleTypeTest/PNG200/3.png Binary files differdeleted file mode 100755 index 56a5270..0000000 --- a/devtools/ScaleTypeTest/PNG200/3.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG200/4.png b/devtools/ScaleTypeTest/PNG200/4.png Binary files differdeleted file mode 100755 index aa999f5..0000000 --- a/devtools/ScaleTypeTest/PNG200/4.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG200/5.png b/devtools/ScaleTypeTest/PNG200/5.png Binary files differdeleted file mode 100755 index 55896b7..0000000 --- a/devtools/ScaleTypeTest/PNG200/5.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG200/6.png b/devtools/ScaleTypeTest/PNG200/6.png Binary files differdeleted file mode 100755 index 9a88cd0..0000000 --- a/devtools/ScaleTypeTest/PNG200/6.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG200/7.png b/devtools/ScaleTypeTest/PNG200/7.png Binary files differdeleted file mode 100755 index 6f4f7fb..0000000 --- a/devtools/ScaleTypeTest/PNG200/7.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG200/8.png b/devtools/ScaleTypeTest/PNG200/8.png Binary files differdeleted file mode 100755 index 4cea904..0000000 --- a/devtools/ScaleTypeTest/PNG200/8.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG200/9.png b/devtools/ScaleTypeTest/PNG200/9.png Binary files differdeleted file mode 100755 index 244821b..0000000 --- a/devtools/ScaleTypeTest/PNG200/9.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG400/1.png b/devtools/ScaleTypeTest/PNG400/1.png Binary files differdeleted file mode 100755 index 153de32..0000000 --- a/devtools/ScaleTypeTest/PNG400/1.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG400/2.png b/devtools/ScaleTypeTest/PNG400/2.png Binary files differdeleted file mode 100755 index 1c85c4a..0000000 --- a/devtools/ScaleTypeTest/PNG400/2.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG400/3.png b/devtools/ScaleTypeTest/PNG400/3.png Binary files differdeleted file mode 100755 index 55b6284..0000000 --- a/devtools/ScaleTypeTest/PNG400/3.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG400/4.png b/devtools/ScaleTypeTest/PNG400/4.png Binary files differdeleted file mode 100755 index c9968fa..0000000 --- a/devtools/ScaleTypeTest/PNG400/4.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG400/5.png b/devtools/ScaleTypeTest/PNG400/5.png Binary files differdeleted file mode 100755 index 9a7c99d..0000000 --- a/devtools/ScaleTypeTest/PNG400/5.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG400/6.png b/devtools/ScaleTypeTest/PNG400/6.png Binary files differdeleted file mode 100755 index 2319fec..0000000 --- a/devtools/ScaleTypeTest/PNG400/6.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG400/7.png b/devtools/ScaleTypeTest/PNG400/7.png Binary files differdeleted file mode 100755 index a6afb01..0000000 --- a/devtools/ScaleTypeTest/PNG400/7.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG400/8.png b/devtools/ScaleTypeTest/PNG400/8.png Binary files differdeleted file mode 100755 index e8ab7e1..0000000 --- a/devtools/ScaleTypeTest/PNG400/8.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNG400/9.png b/devtools/ScaleTypeTest/PNG400/9.png Binary files differdeleted file mode 100755 index d3d9e32..0000000 --- a/devtools/ScaleTypeTest/PNG400/9.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT100/1.png b/devtools/ScaleTypeTest/PNGT100/1.png Binary files differdeleted file mode 100755 index dab1239..0000000 --- a/devtools/ScaleTypeTest/PNGT100/1.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT100/2.png b/devtools/ScaleTypeTest/PNGT100/2.png Binary files differdeleted file mode 100755 index 56312a7..0000000 --- a/devtools/ScaleTypeTest/PNGT100/2.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT100/3.png b/devtools/ScaleTypeTest/PNGT100/3.png Binary files differdeleted file mode 100755 index 4ceb540..0000000 --- a/devtools/ScaleTypeTest/PNGT100/3.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT100/4.png b/devtools/ScaleTypeTest/PNGT100/4.png Binary files differdeleted file mode 100755 index 38d640a..0000000 --- a/devtools/ScaleTypeTest/PNGT100/4.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT100/5.png b/devtools/ScaleTypeTest/PNGT100/5.png Binary files differdeleted file mode 100755 index dcc14d4..0000000 --- a/devtools/ScaleTypeTest/PNGT100/5.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT100/6.png b/devtools/ScaleTypeTest/PNGT100/6.png Binary files differdeleted file mode 100755 index cb2f933..0000000 --- a/devtools/ScaleTypeTest/PNGT100/6.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT100/7.png b/devtools/ScaleTypeTest/PNGT100/7.png Binary files differdeleted file mode 100755 index 497ed6f..0000000 --- a/devtools/ScaleTypeTest/PNGT100/7.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT100/8.png b/devtools/ScaleTypeTest/PNGT100/8.png Binary files differdeleted file mode 100755 index 693ac1e..0000000 --- a/devtools/ScaleTypeTest/PNGT100/8.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT100/9.png b/devtools/ScaleTypeTest/PNGT100/9.png Binary files differdeleted file mode 100755 index e83b570..0000000 --- a/devtools/ScaleTypeTest/PNGT100/9.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT173/1.png b/devtools/ScaleTypeTest/PNGT173/1.png Binary files differdeleted file mode 100755 index 3154f54..0000000 --- a/devtools/ScaleTypeTest/PNGT173/1.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT173/2.png b/devtools/ScaleTypeTest/PNGT173/2.png Binary files differdeleted file mode 100755 index 2daffd5..0000000 --- a/devtools/ScaleTypeTest/PNGT173/2.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT173/3.png b/devtools/ScaleTypeTest/PNGT173/3.png Binary files differdeleted file mode 100755 index 7341a7e..0000000 --- a/devtools/ScaleTypeTest/PNGT173/3.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT173/4.png b/devtools/ScaleTypeTest/PNGT173/4.png Binary files differdeleted file mode 100755 index 1114200..0000000 --- a/devtools/ScaleTypeTest/PNGT173/4.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT173/5.png b/devtools/ScaleTypeTest/PNGT173/5.png Binary files differdeleted file mode 100755 index 03233a3..0000000 --- a/devtools/ScaleTypeTest/PNGT173/5.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT173/6.png b/devtools/ScaleTypeTest/PNGT173/6.png Binary files differdeleted file mode 100755 index 9a1212e..0000000 --- a/devtools/ScaleTypeTest/PNGT173/6.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT173/7.png b/devtools/ScaleTypeTest/PNGT173/7.png Binary files differdeleted file mode 100755 index ed5470c..0000000 --- a/devtools/ScaleTypeTest/PNGT173/7.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT173/8.png b/devtools/ScaleTypeTest/PNGT173/8.png Binary files differdeleted file mode 100755 index 218790e..0000000 --- a/devtools/ScaleTypeTest/PNGT173/8.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT173/9.png b/devtools/ScaleTypeTest/PNGT173/9.png Binary files differdeleted file mode 100755 index 7f26021..0000000 --- a/devtools/ScaleTypeTest/PNGT173/9.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT200/1.png b/devtools/ScaleTypeTest/PNGT200/1.png Binary files differdeleted file mode 100755 index 173526e..0000000 --- a/devtools/ScaleTypeTest/PNGT200/1.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT200/2.png b/devtools/ScaleTypeTest/PNGT200/2.png Binary files differdeleted file mode 100755 index 3448294..0000000 --- a/devtools/ScaleTypeTest/PNGT200/2.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT200/3.png b/devtools/ScaleTypeTest/PNGT200/3.png Binary files differdeleted file mode 100755 index 6b07141..0000000 --- a/devtools/ScaleTypeTest/PNGT200/3.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT200/4.png b/devtools/ScaleTypeTest/PNGT200/4.png Binary files differdeleted file mode 100755 index 7b0f5b0..0000000 --- a/devtools/ScaleTypeTest/PNGT200/4.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT200/5.png b/devtools/ScaleTypeTest/PNGT200/5.png Binary files differdeleted file mode 100755 index 0cf114c..0000000 --- a/devtools/ScaleTypeTest/PNGT200/5.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT200/6.png b/devtools/ScaleTypeTest/PNGT200/6.png Binary files differdeleted file mode 100755 index 0278da2..0000000 --- a/devtools/ScaleTypeTest/PNGT200/6.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT200/7.png b/devtools/ScaleTypeTest/PNGT200/7.png Binary files differdeleted file mode 100755 index 4017909..0000000 --- a/devtools/ScaleTypeTest/PNGT200/7.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT200/8.png b/devtools/ScaleTypeTest/PNGT200/8.png Binary files differdeleted file mode 100755 index 226abf9..0000000 --- a/devtools/ScaleTypeTest/PNGT200/8.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT200/9.png b/devtools/ScaleTypeTest/PNGT200/9.png Binary files differdeleted file mode 100755 index b27ab95..0000000 --- a/devtools/ScaleTypeTest/PNGT200/9.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT400/1.png b/devtools/ScaleTypeTest/PNGT400/1.png Binary files differdeleted file mode 100755 index f3cf1e2..0000000 --- a/devtools/ScaleTypeTest/PNGT400/1.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT400/2.png b/devtools/ScaleTypeTest/PNGT400/2.png Binary files differdeleted file mode 100755 index 7c97bc6..0000000 --- a/devtools/ScaleTypeTest/PNGT400/2.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT400/3.png b/devtools/ScaleTypeTest/PNGT400/3.png Binary files differdeleted file mode 100755 index 97a4014..0000000 --- a/devtools/ScaleTypeTest/PNGT400/3.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT400/4.png b/devtools/ScaleTypeTest/PNGT400/4.png Binary files differdeleted file mode 100755 index 9784d69..0000000 --- a/devtools/ScaleTypeTest/PNGT400/4.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT400/5.png b/devtools/ScaleTypeTest/PNGT400/5.png Binary files differdeleted file mode 100755 index 4615722..0000000 --- a/devtools/ScaleTypeTest/PNGT400/5.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT400/6.png b/devtools/ScaleTypeTest/PNGT400/6.png Binary files differdeleted file mode 100755 index 1ccb2d1..0000000 --- a/devtools/ScaleTypeTest/PNGT400/6.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT400/7.png b/devtools/ScaleTypeTest/PNGT400/7.png Binary files differdeleted file mode 100755 index ff0d53b..0000000 --- a/devtools/ScaleTypeTest/PNGT400/7.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT400/8.png b/devtools/ScaleTypeTest/PNGT400/8.png Binary files differdeleted file mode 100755 index 69ed548..0000000 --- a/devtools/ScaleTypeTest/PNGT400/8.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/PNGT400/9.png b/devtools/ScaleTypeTest/PNGT400/9.png Binary files differdeleted file mode 100755 index 5f538b6..0000000 --- a/devtools/ScaleTypeTest/PNGT400/9.png +++ /dev/null diff --git a/devtools/ScaleTypeTest/scaleTest.py b/devtools/ScaleTypeTest/scaleTest.py deleted file mode 100755 index 42212db..0000000 --- a/devtools/ScaleTypeTest/scaleTest.py +++ /dev/null @@ -1,121 +0,0 @@ -#! /usr/bin/env python -import pygame, time -pygame.init() - -print "Scale Test - Authors Dave Silverman and Scott Mengel" -print "Set size window to 600 x 400 px" -print "Running..." - -#-------------------------------------------------------------- -#CONSTANTS AND VARIABLES - -make=input("How many images would you like to load?\n>") -trial=input("How many runs per trial?\n>") -sizeTo=input("What would you like to resize to? Seperate with a comma, eg: x,y\n>" ) - -img={} -ft="" #filetype -r=0 #frame refreshes -i=1 #cycles images -size = width, height = 600,400 #screen sizes -t=0 #trial number n -colorkey=(255, 152, 0) - -ftArr=[ ["bmp","BMP16100/"] , - ["bmp","BMP16173/"] , - ["bmp","BMP16200/"] , - ["bmp","BMP16400/"] , - ["bmp","BMP24100/"] , - ["bmp","BMP24173/"] , - ["bmp","BMP24200/"] , - ["bmp","BMP24400/"] , - ["gif","GIF100/"] , - ["gif","GIF173/"] , - ["gif","GIF200/"] , - ["gif","GIF400/"] , - ["gif","GIFT100/"] , - ["gif","GIFT173/"] , - ["gif","GIFT200/"] , - ["gif","GIFT400/"] , - ["png","PNG100/"] , - ["png","PNG173/"] , - ["png","PNG200/"] , - ["png","PNG400/"] , - ["png","PNGT100/"] , - ["png","PNGT173/"] , - ["png","PNGT200/"] , - ["png","PNGT400/"] ] - -screen = pygame.display.set_mode(size) #Screen Set 600x400 -background = 152, 251, 152 # pale green - -#23456789123456789212345678931234567894123456789512345678961234567897123456789* - -# This is the beginning of the actual test loops; this program is a very rough -# learning exercise which we desire to polish to such a state that it can be -# used to accurately benchmark the XO laptop's speed capabilities -while 1: - cnt=make - ft=ftArr[t] - print "Testing: "+ft[1]+" extension "+ft[0] - trialthis=trial - start=time.time() -# This timer will reflect the time taken to load and resize images in memory - switcher = { -# This is also where we need advise regarding implementing convert() - 1: pygame.transform.scale( pygame.image.load("%s2.%s"%(ft[1],ft[0])).convert(),(sizeTo[0],sizeTo[1] )), - 2: pygame.transform.scale( pygame.image.load("%s3.%s"%(ft[1],ft[0])).convert(),(sizeTo[0],sizeTo[1] )), - 3: pygame.transform.scale( pygame.image.load("%s4.%s"%(ft[1],ft[0])).convert(),(sizeTo[0],sizeTo[1] )), - 4: pygame.transform.scale( pygame.image.load("%s5.%s"%(ft[1],ft[0])).convert(),(sizeTo[0],sizeTo[1] )), - 5: pygame.transform.scale( pygame.image.load("%s6.%s"%(ft[1],ft[0])).convert(),(sizeTo[0],sizeTo[1] )), - 6: pygame.transform.scale( pygame.image.load("%s7.%s"%(ft[1],ft[0])).convert(),(sizeTo[0],sizeTo[1] )), - 7: pygame.transform.scale( pygame.image.load("%s8.%s"%(ft[1],ft[0])).convert(),(sizeTo[0],sizeTo[1] )), - 8: pygame.transform.scale( pygame.image.load("%s9.%s"%(ft[1],ft[0])).convert(),(sizeTo[0],sizeTo[1] )), - 9: pygame.transform.scale( pygame.image.load("%s1.%s"%(ft[1],ft[0])).convert(),(sizeTo[0],sizeTo[1] )) - } - print "Time taken to load this test at ", - print sizeTo - print " pixels was " - print time.time()-start -# Here ends the loading section, and hereafter we jump into the main loop - while trialthis>0: - while cnt>0: -# establish the initial state for the images of the next trial - img[cnt,0]= pygame.image.load("%s1.%s"%(ft[1],ft[0])) - img[cnt,0]= pygame.transform.scale(img[cnt,0],(sizeTo[0], sizeTo[1])) - img[cnt,1]= img[cnt,0].get_rect() - img[cnt,2]= [2,2] #speed - m=cnt*40 -# Here I move images to avoid indistinguishable stacks of image rectangles - img[cnt,1]=img[cnt,1].move(m,m) - cnt=cnt-1 - r=0 - start=time.time() - - while 1: -# This loop is the 'main event' so to speak, as it is the section that is -# measured in terms of frames per second - - cnt=make # For each 'ball' icon loaded - while cnt>0: # Cycle and check if the 'ball' should bounce off the wall - print cnt - img[cnt,0]=switcher.get(i,None) - if img[cnt,1].left < 0 or img[cnt,1].right > width: - img[cnt,2]=[ -img[cnt,2][0], img[cnt,2][1] ] - if img[cnt,1].top < 0 or img[cnt,1].bottom > height: - img[cnt,2]=[ img[cnt,2][0], -img[cnt,2][1] ] - img[cnt,1] = img[cnt,1].move(img[cnt,2]) -# Move the 'ball' image accordingly, plot the change - screen.blit(img[cnt,0],img[cnt,1]) - cnt=cnt-1 - pygame.display.flip() -# "Make it so, number two," on those changes above - i=i+1 - if i>9: i=1 - screen.fill(background) - r=r+1 - if r>500: break -# After 500 frames, we print the average frame rate to the terminal - print 1/((time.time()-start)/r) - trialthis=trialthis-1 - t=t+1 diff --git a/devtools/ScaleTypeTest/scaleTest.py~ b/devtools/ScaleTypeTest/scaleTest.py~ deleted file mode 100644 index 76e87e0..0000000 --- a/devtools/ScaleTypeTest/scaleTest.py~ +++ /dev/null @@ -1,133 +0,0 @@ -#! /usr/bin/env python -import pygame, time -pygame.init() - -print "Scale Test - Authors Dave Silverman and Scott Mengel" -print "Set size window to 600 x 400 px" -print "Running..." - - - -#-------------------------------------------------------------- -#CONSTANTS AND VARIABLES - -make=input("How many images would you like to load?\n>") -trial=input("How many runs per trial?\n>") -sizeTo=input("What would you like to resize to? Seperate with a comma, eg: x,y\n>" ) - -img={} -ft="" #filetype -r=0 #frame refreshes -i=1 #cycles images -size = width, height = 600,400 #screen sizes -t=0 #trial number n -colorkey=(255, 152, 0) - -ftArr=[ ["bmp","BMP16100/"] , ["bmp","BMP16173/"] , ["bmp","BMP16200/"] , ["bmp","BMP16400/"] ,["bmp","BMP24100/"] , ["bmp","BMP24173/"] , ["bmp","BMP24200/"] , ["bmp","BMP24400/"] , ["gif","GIF100/"] , ["gif","GIF173/"] , ["gif","GIF200/"] , ["gif","GIF400/"] , ["gif","GIFT100/"] , ["gif","GIFT173/"] , ["gif","GIFT200/"] , ["gif","GIFT400/"] , ["png","PNG100/"] , ["png","PNG173/"] , ["png","PNG200/"] , ["png","PNG400/"] , ["png","PNGT100/"] , ["png","PNGT173/"] , ["png","PNGT200/"] , ["png","PNGT400/"] ] - -screen = pygame.display.set_mode(size) #Screen Set 600x400 -background = 152, 251, 152 # pale green - - -#------------------------------------------------------------- -#The switch function - -def chngImg(): - cnt=make - while cnt>0: - """switcher = { - 1: pygame.transform.scale( pygame.image.load( "%s2.%s"%( ft[1],ft[0] ) ) ,(sizeTo[0],sizeTo[1] ), - 2: pygame.transform.scale( pygame.image.load("%s3.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] ), - 3: pygame.transform.scale( pygame.image.load("%s4.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] ), - 4: pygame.transform.scale( pygame.image.load("%s5.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] ), - 5: pygame.transform.scale( pygame.image.load("%s6.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] ), - 6: pygame.transform.scale( pygame.image.load("%s7.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] ), - 7: pygame.transform.scale( pygame.image.load("%s8.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] ), - 8: pygame.transform.scale( pygame.image.load("%s9.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] ), - 9: pygame.transform.scale( pygame.image.load("%s1.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] ) - } - """ - img[cnt,0]=switcher.get(i,pygame.image.load("%s1.%s"%(ft[1],ft[0]))) -# img[cnt,0] = pygame.transform.scale(img[cnt,0],(sizeTo[0], sizeTo[1])) - cnt=cnt-1 - -#----------------------------------------------------------------- -#- Collision detection ------------------------------------------- - -def collision(): - cnt=make - while cnt>0: - if img[cnt,1].left < 0 or img[cnt,1].right > width: - img[cnt,2]=[ -img[cnt,2][0], img[cnt,2][1] ] - if img[cnt,1].top < 0 or img[cnt,1].bottom > height: - img[cnt,2]=[ img[cnt,2][0], -img[cnt,2][1] ] - img[cnt,1] = img[cnt,1].move(img[cnt,2]) - screen.blit(img[cnt,0],img[cnt,1]) - cnt=cnt-1 - pygame.display.flip() - - -#----------------------------------------------------------------- -#- Number of dashed lined relates to loops ----------------------- - -while 1: - cnt=make - ft=ftArr[t] - print "Testing: "+ft[1]+" extension "+ft[0] - trialthis=trial - start=time.time() - switcher = { - 1: pygame.transform.scale( pygame.image.load( "%s2.%s"%( ft[1],ft[0] ) ),(sizeTo[0],sizeTo[1] )), - 2: pygame.transform.scale( pygame.image.load("%s3.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] )), - 3: pygame.transform.scale( pygame.image.load("%s4.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] )), - 4: pygame.transform.scale( pygame.image.load("%s5.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] )), - 5: pygame.transform.scale( pygame.image.load("%s6.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] )), - 6: pygame.transform.scale( pygame.image.load("%s7.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] )), - 7: pygame.transform.scale( pygame.image.load("%s8.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] )), - 8: pygame.transform.scale( pygame.image.load("%s9.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] )), - 9: pygame.transform.scale( pygame.image.load("%s1.%s"%(ft[1],ft[0])),(sizeTo[0],sizeTo[1] )) - } - print "Time taken to load this test at ", - print sizeTo - print " pixels was " - print time.time()-start - -#----------------------------------------------------------------- - while trialthis>0: - - #------------------------------------------------------------- - while cnt>0: - img[cnt,0]= pygame.image.load("%s1.%s"%(ft[1],ft[0])) #image.load - img[cnt,0] = pygame.transform.scale(img[cnt,0],(sizeTo[0], sizeTo[1])) - img[cnt,1]= img[cnt,0].get_rect() - img[cnt,2]= [2,2] #speed - m=cnt*40 # named m cause i wanted some m&ms - img[cnt,1]=img[cnt,1].move(m,m) #see? it wasn't as tastey though - cnt=cnt-1 - - #------------------------------------------------------------- - r=0 - start=time.time() - - #------------------------------------------------------------- - while 1: - chngImg() - i=i+1 - if i>9: i=1 - - collision() - screen.fill(background) - - r=r+1 - if r>500: break - - #------------------------------------------------------------- - print 1/((time.time()-start)/r) - trialthis=trialthis-1 - -#----------------------------------------------------------------- - t=t+1 - print "" - -#----------------------------------------------------------------- -#----------------------------------------------------------------- diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/0 Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/0 Button.bmp Binary files differdeleted file mode 100755 index a36a681..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/0 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/1 Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/1 Button.bmp Binary files differdeleted file mode 100755 index 57630e3..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/1 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/2 Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/2 Button.bmp Binary files differdeleted file mode 100755 index 90af77a..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/2 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/3 Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/3 Button.bmp Binary files differdeleted file mode 100755 index 1751a4a..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/3 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/4 Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/4 Button.bmp Binary files differdeleted file mode 100755 index 1f292d1..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/4 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/5 Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/5 Button.bmp Binary files differdeleted file mode 100755 index fd8cc0e..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/5 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/6 Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/6 Button.bmp Binary files differdeleted file mode 100755 index df3a2eb..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/6 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/7 Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/7 Button.bmp Binary files differdeleted file mode 100755 index 51b0052..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/7 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/8 Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/8 Button.bmp Binary files differdeleted file mode 100755 index 9302c64..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/8 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/9 Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/9 Button.bmp Binary files differdeleted file mode 100755 index f5c6191..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/9 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/Attack Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/Attack Button.bmp Binary files differdeleted file mode 100755 index 6adee99..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/Attack Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/Battle Hand.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/Battle Hand.bmp Binary files differdeleted file mode 100755 index 80aef96..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/Battle Hand.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/Blank Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/Blank Button.bmp Binary files differdeleted file mode 100755 index cab745d..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/Blank Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/Clear Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/Clear Button.bmp Binary files differdeleted file mode 100755 index 1527b76..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/Clear Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/Enter Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/Enter Button.bmp Binary files differdeleted file mode 100755 index 1df130b..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/Enter Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/Hand.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/Hand.bmp Binary files differdeleted file mode 100755 index ad8c5ca..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/Hand.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/Item Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/Item Button.bmp Binary files differdeleted file mode 100755 index 0cad273..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/Item Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/Magic Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/Magic Button.bmp Binary files differdeleted file mode 100755 index aa7eb14..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/Magic Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/Pause Screen.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/Pause Screen.bmp Binary files differdeleted file mode 100755 index b3c34a8..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/Pause Screen.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/Special Button.bmp b/devtools/SpriteTypeTest/BMPs 16-Bits/Special Button.bmp Binary files differdeleted file mode 100755 index a3c291a..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/Special Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/bounce.py b/devtools/SpriteTypeTest/BMPs 16-Bits/bounce.py deleted file mode 100755 index 286205b..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.bmp") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.bmp"), - 2: pygame.image.load("3 Button.bmp"), - 3: pygame.image.load("4 Button.bmp"), - 4: pygame.image.load("5 Button.bmp"), - 5: pygame.image.load("6 Button.bmp"), - 6: pygame.image.load("7 Button.bmp"), - 7: pygame.image.load("8 Button.bmp"), - 8: pygame.image.load("9 Button.bmp"), - 9: pygame.image.load("1 Button.bmp") - } - ball = switcher.get(i,pygame.image.load("1 Button.bmp")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 156, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/SpriteTypeTest/BMPs 16-Bits/ntest.py b/devtools/SpriteTypeTest/BMPs 16-Bits/ntest.py deleted file mode 100755 index 22c019f..0000000 --- a/devtools/SpriteTypeTest/BMPs 16-Bits/ntest.py +++ /dev/null @@ -1,103 +0,0 @@ -import sys, pygame, time -pygame.init() - -ft="bmp" -r=0 -i=1 -size = width, height = 600,400 - -print "Nightmare test - Authors Dave Silverman and Scott Mengel" -print "Set size to 600 x 400 px" -print "Running..." -speed1=speed2=speed3=speed4=[2, 2] -black = 0, 0, 0 - -screen = pygame.display.set_mode(size) - -ball1=ball2=ball3=ball4=pygame.image.load("1 Button.%s"%ft) - -ballrect1 = ball1.get_rect() -ballrect1 = ballrect1.move( 200, 0) - -ballrect2 = ball2.get_rect() -ballrect2 = ballrect2.move( 0, 200) - -ballrect3 = ball3.get_rect() -ballrect3 = ballrect3.move( 200, 200) - -ballrect4 = ball4.get_rect() -ballrect4 = ballrect4.move( 0, 0) - -# ballrect = ballrect.move( 0, 0) - -print "Ball Loaded, collision detection ready, Initiating Loop:" - -start=time.time() - -#----------------------------------------------------------------- - -def chngImg(thisBall): - switcher = { - 1: pygame.image.load("2 Button.%s"%ft), - 2: pygame.image.load("3 Button.%s"%ft), - 3: pygame.image.load("4 Button.%s"%ft), - 4: pygame.image.load("5 Button.%s"%ft), - 3: pygame.image.load("4 Button.%s"%ft), - 3: pygame.image.load("4 Button.%s"%ft), - 5: pygame.image.load("6 Button.%s"%ft), - 6: pygame.image.load("7 Button.%s"%ft), - 7: pygame.image.load("8 Button.%s"%ft), - 8: pygame.image.load("9 Button.%s"%ft), - 9: pygame.image.load("1 Button.%s"%ft) - } - return switcher.get(i,pygame.image.load("1 Button.%s"%ft)) - -#----------------------------------------------------------------- - -def collision(thisBallRect,thisSpeed): - if thisBallRect.left < 0 or thisBallRect.right > width: - return -thisSpeed[0],thisSpeed[1] - if thisBallRect.top < 0 or thisBallRect.bottom > height: - return thisSpeed[0],-thisSpeed[1] - else: return thisSpeed -#----------------------------------------------------------------- - -while 1: - ball1 = chngImg(ball1) - ball2 = chngImg(ball2) - ball3 = chngImg(ball3) - ball4 = chngImg(ball4) - - i=i+1 - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - speed1=collision(ballrect1,speed1) - ballrect1 = ballrect1.move(speed1) - - speed2=collision(ballrect2,speed2) - ballrect2 = ballrect2.move(speed2) - - speed3=collision(ballrect3,speed3) - ballrect3 = ballrect3.move(speed3) - - speed4=collision(ballrect4,speed4) - ballrect4 = ballrect4.move(speed4) - - screen.fill(black) - screen.blit(ball1, ballrect1) - screen.blit(ball2, ballrect2) - screen.blit(ball3, ballrect3) - screen.blit(ball4, ballrect4) - - pygame.display.flip() - - r=r+1 - - if r>500: break - -#----------------------------------------------------------------- - -print 1/((time.time()-start)/r) diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/0 Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/0 Button.bmp Binary files differdeleted file mode 100755 index 5fa6a3f..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/0 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/1 Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/1 Button.bmp Binary files differdeleted file mode 100755 index e910cec..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/1 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/2 Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/2 Button.bmp Binary files differdeleted file mode 100755 index 0545f38..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/2 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/3 Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/3 Button.bmp Binary files differdeleted file mode 100755 index a154b29..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/3 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/4 Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/4 Button.bmp Binary files differdeleted file mode 100755 index 4ab21f9..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/4 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/5 Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/5 Button.bmp Binary files differdeleted file mode 100755 index 0a55d39..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/5 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/6 Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/6 Button.bmp Binary files differdeleted file mode 100755 index ad3f1b1..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/6 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/7 Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/7 Button.bmp Binary files differdeleted file mode 100755 index 915ab5b..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/7 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/8 Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/8 Button.bmp Binary files differdeleted file mode 100755 index b36287d..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/8 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/9 Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/9 Button.bmp Binary files differdeleted file mode 100755 index 2cab5a4..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/9 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/Attack Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/Attack Button.bmp Binary files differdeleted file mode 100755 index 9553638..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/Attack Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/Battle Hand.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/Battle Hand.bmp Binary files differdeleted file mode 100755 index 281c528..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/Battle Hand.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/Blank Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/Blank Button.bmp Binary files differdeleted file mode 100755 index 62a7a75..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/Blank Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/Clear Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/Clear Button.bmp Binary files differdeleted file mode 100755 index a348a0e..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/Clear Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/Enter Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/Enter Button.bmp Binary files differdeleted file mode 100755 index ded46f3..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/Enter Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/Hand.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/Hand.bmp Binary files differdeleted file mode 100755 index 02c3566..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/Hand.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/Item Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/Item Button.bmp Binary files differdeleted file mode 100755 index 9302ae5..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/Item Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/Magic Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/Magic Button.bmp Binary files differdeleted file mode 100755 index e2f7e71..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/Magic Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/Pause Screen.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/Pause Screen.bmp Binary files differdeleted file mode 100755 index eb25e1a..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/Pause Screen.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/Special Button.bmp b/devtools/SpriteTypeTest/BMPs 24-Bits/Special Button.bmp Binary files differdeleted file mode 100755 index b5cecab..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/Special Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 24-Bits/bounce.py b/devtools/SpriteTypeTest/BMPs 24-Bits/bounce.py deleted file mode 100755 index 396bd1f..0000000 --- a/devtools/SpriteTypeTest/BMPs 24-Bits/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.bmp") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.bmp"), - 2: pygame.image.load("3 Button.bmp"), - 3: pygame.image.load("4 Button.bmp"), - 4: pygame.image.load("5 Button.bmp"), - 5: pygame.image.load("6 Button.bmp"), - 6: pygame.image.load("7 Button.bmp"), - 7: pygame.image.load("8 Button.bmp"), - 8: pygame.image.load("9 Button.bmp"), - 9: pygame.image.load("1 Button.bmp") - } - ball = switcher.get(i,pygame.image.load("1 Button.bmp")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 153, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/0 Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/0 Button.bmp Binary files differdeleted file mode 100755 index c25785f..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/0 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/1 Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/1 Button.bmp Binary files differdeleted file mode 100755 index d4da79c..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/1 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/2 Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/2 Button.bmp Binary files differdeleted file mode 100755 index 1f14c34..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/2 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/3 Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/3 Button.bmp Binary files differdeleted file mode 100755 index 8ae5bf2..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/3 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/4 Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/4 Button.bmp Binary files differdeleted file mode 100755 index 1c5f912..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/4 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/5 Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/5 Button.bmp Binary files differdeleted file mode 100755 index 8d08d71..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/5 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/6 Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/6 Button.bmp Binary files differdeleted file mode 100755 index c9496e5..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/6 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/7 Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/7 Button.bmp Binary files differdeleted file mode 100755 index 2495c54..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/7 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/8 Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/8 Button.bmp Binary files differdeleted file mode 100755 index 0730613..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/8 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/9 Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/9 Button.bmp Binary files differdeleted file mode 100755 index 179a768..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/9 Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/Attack Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/Attack Button.bmp Binary files differdeleted file mode 100755 index 9331158..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/Attack Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/Battle Hand.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/Battle Hand.bmp Binary files differdeleted file mode 100755 index ea7c033..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/Battle Hand.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/Blank Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/Blank Button.bmp Binary files differdeleted file mode 100755 index 88e225a..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/Blank Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/Clear Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/Clear Button.bmp Binary files differdeleted file mode 100755 index a348a0e..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/Clear Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/Enter Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/Enter Button.bmp Binary files differdeleted file mode 100755 index 3914ff2..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/Enter Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/Hand.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/Hand.bmp Binary files differdeleted file mode 100755 index 0ba54af..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/Hand.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/Item Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/Item Button.bmp Binary files differdeleted file mode 100755 index 84523be..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/Item Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/Magic Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/Magic Button.bmp Binary files differdeleted file mode 100755 index 759086c..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/Magic Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/Pause Screen.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/Pause Screen.bmp Binary files differdeleted file mode 100755 index bec11f0..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/Pause Screen.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/Special Button.bmp b/devtools/SpriteTypeTest/BMPs 32-Bits/Special Button.bmp Binary files differdeleted file mode 100755 index a17614d..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/Special Button.bmp +++ /dev/null diff --git a/devtools/SpriteTypeTest/BMPs 32-Bits/bounce.py b/devtools/SpriteTypeTest/BMPs 32-Bits/bounce.py deleted file mode 100755 index 396bd1f..0000000 --- a/devtools/SpriteTypeTest/BMPs 32-Bits/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.bmp") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.bmp"), - 2: pygame.image.load("3 Button.bmp"), - 3: pygame.image.load("4 Button.bmp"), - 4: pygame.image.load("5 Button.bmp"), - 5: pygame.image.load("6 Button.bmp"), - 6: pygame.image.load("7 Button.bmp"), - 7: pygame.image.load("8 Button.bmp"), - 8: pygame.image.load("9 Button.bmp"), - 9: pygame.image.load("1 Button.bmp") - } - ball = switcher.get(i,pygame.image.load("1 Button.bmp")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 153, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/SpriteTypeTest/GIFs Transparent/1 Button.gif b/devtools/SpriteTypeTest/GIFs Transparent/1 Button.gif Binary files differdeleted file mode 100755 index 2aad244..0000000 --- a/devtools/SpriteTypeTest/GIFs Transparent/1 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs Transparent/2 Button.gif b/devtools/SpriteTypeTest/GIFs Transparent/2 Button.gif Binary files differdeleted file mode 100755 index ed22525..0000000 --- a/devtools/SpriteTypeTest/GIFs Transparent/2 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs Transparent/3 Button.gif b/devtools/SpriteTypeTest/GIFs Transparent/3 Button.gif Binary files differdeleted file mode 100755 index 246cd12..0000000 --- a/devtools/SpriteTypeTest/GIFs Transparent/3 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs Transparent/4 Button.gif b/devtools/SpriteTypeTest/GIFs Transparent/4 Button.gif Binary files differdeleted file mode 100755 index 722f240..0000000 --- a/devtools/SpriteTypeTest/GIFs Transparent/4 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs Transparent/5 Button.gif b/devtools/SpriteTypeTest/GIFs Transparent/5 Button.gif Binary files differdeleted file mode 100755 index 6a71348..0000000 --- a/devtools/SpriteTypeTest/GIFs Transparent/5 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs Transparent/6 Button.gif b/devtools/SpriteTypeTest/GIFs Transparent/6 Button.gif Binary files differdeleted file mode 100755 index 0dd2145..0000000 --- a/devtools/SpriteTypeTest/GIFs Transparent/6 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs Transparent/7 Button.gif b/devtools/SpriteTypeTest/GIFs Transparent/7 Button.gif Binary files differdeleted file mode 100755 index 1e9914b..0000000 --- a/devtools/SpriteTypeTest/GIFs Transparent/7 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs Transparent/8 Button.gif b/devtools/SpriteTypeTest/GIFs Transparent/8 Button.gif Binary files differdeleted file mode 100755 index 390124b..0000000 --- a/devtools/SpriteTypeTest/GIFs Transparent/8 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs Transparent/9 Button.gif b/devtools/SpriteTypeTest/GIFs Transparent/9 Button.gif Binary files differdeleted file mode 100755 index 61c8c3c..0000000 --- a/devtools/SpriteTypeTest/GIFs Transparent/9 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs Transparent/bounce.py b/devtools/SpriteTypeTest/GIFs Transparent/bounce.py deleted file mode 100755 index 50e57e2..0000000 --- a/devtools/SpriteTypeTest/GIFs Transparent/bounce.py +++ /dev/null @@ -1,66 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -#size = width, height = 1200,900 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.gif") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.gif"), - 2: pygame.image.load("3 Button.gif"), - 3: pygame.image.load("4 Button.gif"), - 4: pygame.image.load("5 Button.gif"), - 5: pygame.image.load("6 Button.gif"), - 6: pygame.image.load("7 Button.gif"), - 7: pygame.image.load("8 Button.gif"), - 8: pygame.image.load("9 Button.gif"), - 9: pygame.image.load("1 Button.gif") - } - ball = switcher.get(i,pygame.image.load("1 Button.gif")) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/SpriteTypeTest/GIFs/0 Button.gif b/devtools/SpriteTypeTest/GIFs/0 Button.gif Binary files differdeleted file mode 100755 index 8795936..0000000 --- a/devtools/SpriteTypeTest/GIFs/0 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/1 Button.gif b/devtools/SpriteTypeTest/GIFs/1 Button.gif Binary files differdeleted file mode 100755 index 4a89216..0000000 --- a/devtools/SpriteTypeTest/GIFs/1 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/2 Button.gif b/devtools/SpriteTypeTest/GIFs/2 Button.gif Binary files differdeleted file mode 100755 index b5019d8..0000000 --- a/devtools/SpriteTypeTest/GIFs/2 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/3 Button.gif b/devtools/SpriteTypeTest/GIFs/3 Button.gif Binary files differdeleted file mode 100755 index a87ddc6..0000000 --- a/devtools/SpriteTypeTest/GIFs/3 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/4 Button.gif b/devtools/SpriteTypeTest/GIFs/4 Button.gif Binary files differdeleted file mode 100755 index 2a398e6..0000000 --- a/devtools/SpriteTypeTest/GIFs/4 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/5 Button.gif b/devtools/SpriteTypeTest/GIFs/5 Button.gif Binary files differdeleted file mode 100755 index 93e5b8d..0000000 --- a/devtools/SpriteTypeTest/GIFs/5 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/6 Button.gif b/devtools/SpriteTypeTest/GIFs/6 Button.gif Binary files differdeleted file mode 100755 index 0e73825..0000000 --- a/devtools/SpriteTypeTest/GIFs/6 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/7 Button.gif b/devtools/SpriteTypeTest/GIFs/7 Button.gif Binary files differdeleted file mode 100755 index 67dff34..0000000 --- a/devtools/SpriteTypeTest/GIFs/7 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/8 Button.gif b/devtools/SpriteTypeTest/GIFs/8 Button.gif Binary files differdeleted file mode 100755 index 4ca6786..0000000 --- a/devtools/SpriteTypeTest/GIFs/8 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/9 Button.gif b/devtools/SpriteTypeTest/GIFs/9 Button.gif Binary files differdeleted file mode 100755 index bca1e6e..0000000 --- a/devtools/SpriteTypeTest/GIFs/9 Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/Attack Button.gif b/devtools/SpriteTypeTest/GIFs/Attack Button.gif Binary files differdeleted file mode 100755 index b128c5c..0000000 --- a/devtools/SpriteTypeTest/GIFs/Attack Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/Battle Hand.gif b/devtools/SpriteTypeTest/GIFs/Battle Hand.gif Binary files differdeleted file mode 100755 index 9822d4c..0000000 --- a/devtools/SpriteTypeTest/GIFs/Battle Hand.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/Blank Button.gif b/devtools/SpriteTypeTest/GIFs/Blank Button.gif Binary files differdeleted file mode 100755 index 32bb8de..0000000 --- a/devtools/SpriteTypeTest/GIFs/Blank Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/Buttons.gif b/devtools/SpriteTypeTest/GIFs/Buttons.gif Binary files differdeleted file mode 100755 index 8795936..0000000 --- a/devtools/SpriteTypeTest/GIFs/Buttons.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/Clear Button.gif b/devtools/SpriteTypeTest/GIFs/Clear Button.gif Binary files differdeleted file mode 100755 index 1d20353..0000000 --- a/devtools/SpriteTypeTest/GIFs/Clear Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/Enter Button.gif b/devtools/SpriteTypeTest/GIFs/Enter Button.gif Binary files differdeleted file mode 100755 index 753b18d..0000000 --- a/devtools/SpriteTypeTest/GIFs/Enter Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/Hand.gif b/devtools/SpriteTypeTest/GIFs/Hand.gif Binary files differdeleted file mode 100755 index 6a9eb53..0000000 --- a/devtools/SpriteTypeTest/GIFs/Hand.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/Item Button.gif b/devtools/SpriteTypeTest/GIFs/Item Button.gif Binary files differdeleted file mode 100755 index d54e0c8..0000000 --- a/devtools/SpriteTypeTest/GIFs/Item Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/Magic Button.gif b/devtools/SpriteTypeTest/GIFs/Magic Button.gif Binary files differdeleted file mode 100755 index 39bb77a..0000000 --- a/devtools/SpriteTypeTest/GIFs/Magic Button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/Pause Screen.gif b/devtools/SpriteTypeTest/GIFs/Pause Screen.gif Binary files differdeleted file mode 100755 index 7bdfaf3..0000000 --- a/devtools/SpriteTypeTest/GIFs/Pause Screen.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/Special button.gif b/devtools/SpriteTypeTest/GIFs/Special button.gif Binary files differdeleted file mode 100755 index c20eb1c..0000000 --- a/devtools/SpriteTypeTest/GIFs/Special button.gif +++ /dev/null diff --git a/devtools/SpriteTypeTest/GIFs/bounce.py b/devtools/SpriteTypeTest/GIFs/bounce.py deleted file mode 100755 index 6e0d2df..0000000 --- a/devtools/SpriteTypeTest/GIFs/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.gif") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.gif"), - 2: pygame.image.load("3 Button.gif"), - 3: pygame.image.load("4 Button.gif"), - 4: pygame.image.load("5 Button.gif"), - 5: pygame.image.load("6 Button.gif"), - 6: pygame.image.load("7 Button.gif"), - 7: pygame.image.load("8 Button.gif"), - 8: pygame.image.load("9 Button.gif"), - 9: pygame.image.load("1 Button.gif") - } - ball = switcher.get(i,pygame.image.load("1 Button.gif")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 156, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/SpriteTypeTest/GIFs/ntest.py b/devtools/SpriteTypeTest/GIFs/ntest.py deleted file mode 100755 index ce64777..0000000 --- a/devtools/SpriteTypeTest/GIFs/ntest.py +++ /dev/null @@ -1,103 +0,0 @@ -import sys, pygame, time -pygame.init() - -ft="gif" -r=0 -i=1 -size = width, height = 600,400 - -print "Nightmare test - Authors Dave Silverman and Scott Mengel" -print "Set size to 600 x 400 px" -print "Running..." -speed1=speed2=speed3=speed4=[2, 2] -black = 0, 0, 0 - -screen = pygame.display.set_mode(size) - -ball1=ball2=ball3=ball4=pygame.image.load("1 Button.%s"%ft) - -ballrect1 = ball1.get_rect() -ballrect1 = ballrect1.move( 200, 0) - -ballrect2 = ball2.get_rect() -ballrect2 = ballrect2.move( 0, 200) - -ballrect3 = ball3.get_rect() -ballrect3 = ballrect3.move( 200, 200) - -ballrect4 = ball4.get_rect() -ballrect4 = ballrect4.move( 0, 0) - -# ballrect = ballrect.move( 0, 0) - -print "Ball Loaded, collision detection ready, Initiating Loop:" - -start=time.time() - -#----------------------------------------------------------------- - -def chngImg(thisBall): - switcher = { - 1: pygame.image.load("2 Button.%s"%ft), - 2: pygame.image.load("3 Button.%s"%ft), - 3: pygame.image.load("4 Button.%s"%ft), - 4: pygame.image.load("5 Button.%s"%ft), - 3: pygame.image.load("4 Button.%s"%ft), - 3: pygame.image.load("4 Button.%s"%ft), - 5: pygame.image.load("6 Button.%s"%ft), - 6: pygame.image.load("7 Button.%s"%ft), - 7: pygame.image.load("8 Button.%s"%ft), - 8: pygame.image.load("9 Button.%s"%ft), - 9: pygame.image.load("1 Button.%s"%ft) - } - return switcher.get(i,pygame.image.load("1 Button.gif")) - -#----------------------------------------------------------------- - -def collision(thisBallRect,thisSpeed): - if thisBallRect.left < 0 or thisBallRect.right > width: - return -thisSpeed[0],thisSpeed[1] - if thisBallRect.top < 0 or thisBallRect.bottom > height: - return thisSpeed[0],-thisSpeed[1] - else: return thisSpeed -#----------------------------------------------------------------- - -while 1: - ball1 = chngImg(ball1) - ball2 = chngImg(ball2) - ball3 = chngImg(ball3) - ball4 = chngImg(ball4) - - i=i+1 - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - speed1=collision(ballrect1,speed1) - ballrect1 = ballrect1.move(speed1) - - speed2=collision(ballrect2,speed2) - ballrect2 = ballrect2.move(speed2) - - speed3=collision(ballrect3,speed3) - ballrect3 = ballrect3.move(speed3) - - speed4=collision(ballrect4,speed4) - ballrect4 = ballrect4.move(speed4) - - screen.fill(black) - screen.blit(ball1, ballrect1) - screen.blit(ball2, ballrect2) - screen.blit(ball3, ballrect3) - screen.blit(ball4, ballrect4) - - pygame.display.flip() - - r=r+1 - - if r>500: break - -#----------------------------------------------------------------- - -print 1/((time.time()-start)/r) diff --git a/devtools/SpriteTypeTest/JPGs 1Low/0 Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/0 Button.jpg Binary files differdeleted file mode 100755 index 580e162..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/0 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/1 Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/1 Button.jpg Binary files differdeleted file mode 100755 index 30afadd..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/1 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/2 Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/2 Button.jpg Binary files differdeleted file mode 100755 index 7f52df0..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/2 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/3 Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/3 Button.jpg Binary files differdeleted file mode 100755 index 3aafa5e..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/3 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/4 Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/4 Button.jpg Binary files differdeleted file mode 100755 index f3c4233..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/4 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/5 Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/5 Button.jpg Binary files differdeleted file mode 100755 index cb2618d..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/5 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/6 Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/6 Button.jpg Binary files differdeleted file mode 100755 index e128bc7..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/6 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/7 Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/7 Button.jpg Binary files differdeleted file mode 100755 index 5d09da2..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/7 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/8 Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/8 Button.jpg Binary files differdeleted file mode 100755 index 5093b16..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/8 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/9 Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/9 Button.jpg Binary files differdeleted file mode 100755 index 28fe7d6..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/9 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/Attack Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/Attack Button.jpg Binary files differdeleted file mode 100755 index 96c0804..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/Attack Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/Battle Hand.jpg b/devtools/SpriteTypeTest/JPGs 1Low/Battle Hand.jpg Binary files differdeleted file mode 100755 index 3fdba58..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/Battle Hand.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/Blank Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/Blank Button.jpg Binary files differdeleted file mode 100755 index 293e02b..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/Blank Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/Clear Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/Clear Button.jpg Binary files differdeleted file mode 100755 index daca420..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/Clear Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/Enter Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/Enter Button.jpg Binary files differdeleted file mode 100755 index dd63a59..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/Enter Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/Hand.jpg b/devtools/SpriteTypeTest/JPGs 1Low/Hand.jpg Binary files differdeleted file mode 100755 index 8c136af..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/Hand.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/Item Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/Item Button.jpg Binary files differdeleted file mode 100755 index ad6afe8..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/Item Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/Magic Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/Magic Button.jpg Binary files differdeleted file mode 100755 index 756b4ab..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/Magic Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/Pause Screen.jpg b/devtools/SpriteTypeTest/JPGs 1Low/Pause Screen.jpg Binary files differdeleted file mode 100755 index 21935ad..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/Pause Screen.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/Special Button.jpg b/devtools/SpriteTypeTest/JPGs 1Low/Special Button.jpg Binary files differdeleted file mode 100755 index 15d87d6..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/Special Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 1Low/bounce.py b/devtools/SpriteTypeTest/JPGs 1Low/bounce.py deleted file mode 100755 index 76c5fe7..0000000 --- a/devtools/SpriteTypeTest/JPGs 1Low/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.jpg") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.jpg"), - 2: pygame.image.load("3 Button.jpg"), - 3: pygame.image.load("4 Button.jpg"), - 4: pygame.image.load("5 Button.jpg"), - 5: pygame.image.load("6 Button.jpg"), - 6: pygame.image.load("7 Button.jpg"), - 7: pygame.image.load("8 Button.jpg"), - 8: pygame.image.load("9 Button.jpg"), - 9: pygame.image.load("1 Button.jpg") - } - ball = switcher.get(i,pygame.image.load("1 Button.jpg")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 150, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/0 Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/0 Button.jpg Binary files differdeleted file mode 100755 index c7088be..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/0 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/1 Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/1 Button.jpg Binary files differdeleted file mode 100755 index d0af126..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/1 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/2 Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/2 Button.jpg Binary files differdeleted file mode 100755 index e715054..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/2 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/3 Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/3 Button.jpg Binary files differdeleted file mode 100755 index 19890e1..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/3 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/4 Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/4 Button.jpg Binary files differdeleted file mode 100755 index e84480f..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/4 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/5 Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/5 Button.jpg Binary files differdeleted file mode 100755 index e84ff10..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/5 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/6 Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/6 Button.jpg Binary files differdeleted file mode 100755 index 89bc49f..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/6 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/7 Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/7 Button.jpg Binary files differdeleted file mode 100755 index 2bc2ee6..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/7 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/8 Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/8 Button.jpg Binary files differdeleted file mode 100755 index c76df24..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/8 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/9 Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/9 Button.jpg Binary files differdeleted file mode 100755 index ec8118b..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/9 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/Attack Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/Attack Button.jpg Binary files differdeleted file mode 100755 index 74c38a0..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/Attack Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/Battle Hand.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/Battle Hand.jpg Binary files differdeleted file mode 100755 index 8de0e2e..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/Battle Hand.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/Blank Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/Blank Button.jpg Binary files differdeleted file mode 100755 index 7dcbb64..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/Blank Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/Clear Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/Clear Button.jpg Binary files differdeleted file mode 100755 index 07254a9..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/Clear Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/Enter Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/Enter Button.jpg Binary files differdeleted file mode 100755 index 2852505..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/Enter Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/Hand.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/Hand.jpg Binary files differdeleted file mode 100755 index 6640319..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/Hand.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/Item Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/Item Button.jpg Binary files differdeleted file mode 100755 index 8fec85d..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/Item Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/Magic Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/Magic Button.jpg Binary files differdeleted file mode 100755 index e46d8a2..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/Magic Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/Pause Screen.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/Pause Screen.jpg Binary files differdeleted file mode 100755 index 2fd3263..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/Pause Screen.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/Special Button.jpg b/devtools/SpriteTypeTest/JPGs 2Medium/Special Button.jpg Binary files differdeleted file mode 100755 index b721cb5..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/Special Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 2Medium/bounce.py b/devtools/SpriteTypeTest/JPGs 2Medium/bounce.py deleted file mode 100755 index aaeab2e..0000000 --- a/devtools/SpriteTypeTest/JPGs 2Medium/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.jpg") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.jpg"), - 2: pygame.image.load("3 Button.jpg"), - 3: pygame.image.load("4 Button.jpg"), - 4: pygame.image.load("5 Button.jpg"), - 5: pygame.image.load("6 Button.jpg"), - 6: pygame.image.load("7 Button.jpg"), - 7: pygame.image.load("8 Button.jpg"), - 8: pygame.image.load("9 Button.jpg"), - 9: pygame.image.load("1 Button.jpg") - } - ball = switcher.get(i,pygame.image.load("1 Button.jpg")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 156, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/SpriteTypeTest/JPGs 3High/0 Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/0 Button.jpg Binary files differdeleted file mode 100755 index cb30b94..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/0 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/1 Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/1 Button.jpg Binary files differdeleted file mode 100755 index 3bb39de..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/1 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/2 Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/2 Button.jpg Binary files differdeleted file mode 100755 index c572485..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/2 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/3 Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/3 Button.jpg Binary files differdeleted file mode 100755 index fe66efd..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/3 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/4 Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/4 Button.jpg Binary files differdeleted file mode 100755 index f6f6ecd..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/4 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/5 Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/5 Button.jpg Binary files differdeleted file mode 100755 index 6c65f59..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/5 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/6 Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/6 Button.jpg Binary files differdeleted file mode 100755 index e7c0309..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/6 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/7 Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/7 Button.jpg Binary files differdeleted file mode 100755 index fbdf990..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/7 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/8 Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/8 Button.jpg Binary files differdeleted file mode 100755 index 589b12e..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/8 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/9 Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/9 Button.jpg Binary files differdeleted file mode 100755 index 02d2fb0..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/9 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/Attack Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/Attack Button.jpg Binary files differdeleted file mode 100755 index 62051db..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/Attack Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/Battle Hand.jpg b/devtools/SpriteTypeTest/JPGs 3High/Battle Hand.jpg Binary files differdeleted file mode 100755 index 8286359..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/Battle Hand.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/Blank Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/Blank Button.jpg Binary files differdeleted file mode 100755 index 8b730fd..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/Blank Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/Clear Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/Clear Button.jpg Binary files differdeleted file mode 100755 index a476b7c..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/Clear Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/Enter Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/Enter Button.jpg Binary files differdeleted file mode 100755 index e1cb964..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/Enter Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/Hand.jpg b/devtools/SpriteTypeTest/JPGs 3High/Hand.jpg Binary files differdeleted file mode 100755 index a4aeb75..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/Hand.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/Item Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/Item Button.jpg Binary files differdeleted file mode 100755 index 4f0d38a..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/Item Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/Magic Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/Magic Button.jpg Binary files differdeleted file mode 100755 index 06ad4c7..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/Magic Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/Pause Screen.jpg b/devtools/SpriteTypeTest/JPGs 3High/Pause Screen.jpg Binary files differdeleted file mode 100755 index e9e87d4..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/Pause Screen.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/Special Button.jpg b/devtools/SpriteTypeTest/JPGs 3High/Special Button.jpg Binary files differdeleted file mode 100755 index fe5a855..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/Special Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 3High/bounce.py b/devtools/SpriteTypeTest/JPGs 3High/bounce.py deleted file mode 100755 index aaeab2e..0000000 --- a/devtools/SpriteTypeTest/JPGs 3High/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.jpg") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.jpg"), - 2: pygame.image.load("3 Button.jpg"), - 3: pygame.image.load("4 Button.jpg"), - 4: pygame.image.load("5 Button.jpg"), - 5: pygame.image.load("6 Button.jpg"), - 6: pygame.image.load("7 Button.jpg"), - 7: pygame.image.load("8 Button.jpg"), - 8: pygame.image.load("9 Button.jpg"), - 9: pygame.image.load("1 Button.jpg") - } - ball = switcher.get(i,pygame.image.load("1 Button.jpg")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 156, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/SpriteTypeTest/JPGs 4Max/0 Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/0 Button.jpg Binary files differdeleted file mode 100755 index 7f7680d..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/0 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/1 Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/1 Button.jpg Binary files differdeleted file mode 100755 index 8551018..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/1 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/2 Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/2 Button.jpg Binary files differdeleted file mode 100755 index 6421230..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/2 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/3 Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/3 Button.jpg Binary files differdeleted file mode 100755 index b32dbb8..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/3 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/4 Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/4 Button.jpg Binary files differdeleted file mode 100755 index 12bbf98..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/4 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/5 Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/5 Button.jpg Binary files differdeleted file mode 100755 index 25577d8..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/5 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/6 Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/6 Button.jpg Binary files differdeleted file mode 100755 index 86600b4..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/6 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/7 Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/7 Button.jpg Binary files differdeleted file mode 100755 index ed66268..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/7 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/8 Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/8 Button.jpg Binary files differdeleted file mode 100755 index a7d8ea7..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/8 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/9 Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/9 Button.jpg Binary files differdeleted file mode 100755 index 15c3d40..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/9 Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/Attack Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/Attack Button.jpg Binary files differdeleted file mode 100755 index 0e6c7d4..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/Attack Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/Battle Hand.jpg b/devtools/SpriteTypeTest/JPGs 4Max/Battle Hand.jpg Binary files differdeleted file mode 100755 index c66747f..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/Battle Hand.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/Blank Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/Blank Button.jpg Binary files differdeleted file mode 100755 index 5b29ee1..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/Blank Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/Clear Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/Clear Button.jpg Binary files differdeleted file mode 100755 index 05a9f54..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/Clear Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/Enter Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/Enter Button.jpg Binary files differdeleted file mode 100755 index c53c9bb..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/Enter Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/Hand.jpg b/devtools/SpriteTypeTest/JPGs 4Max/Hand.jpg Binary files differdeleted file mode 100755 index 5c34f67..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/Hand.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/Item Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/Item Button.jpg Binary files differdeleted file mode 100755 index cef3992..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/Item Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/Magic Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/Magic Button.jpg Binary files differdeleted file mode 100755 index 8b1b039..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/Magic Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/Pause Screen.jpg b/devtools/SpriteTypeTest/JPGs 4Max/Pause Screen.jpg Binary files differdeleted file mode 100755 index 7fd0d65..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/Pause Screen.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/Special Button.jpg b/devtools/SpriteTypeTest/JPGs 4Max/Special Button.jpg Binary files differdeleted file mode 100755 index 694884a..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/Special Button.jpg +++ /dev/null diff --git a/devtools/SpriteTypeTest/JPGs 4Max/bounce.py b/devtools/SpriteTypeTest/JPGs 4Max/bounce.py deleted file mode 100755 index db16274..0000000 --- a/devtools/SpriteTypeTest/JPGs 4Max/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.jpg") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.jpg"), - 2: pygame.image.load("3 Button.jpg"), - 3: pygame.image.load("4 Button.jpg"), - 4: pygame.image.load("5 Button.jpg"), - 5: pygame.image.load("6 Button.jpg"), - 6: pygame.image.load("7 Button.jpg"), - 7: pygame.image.load("8 Button.jpg"), - 8: pygame.image.load("9 Button.jpg"), - 9: pygame.image.load("1 Button.jpg") - } - ball = switcher.get(i,pygame.image.load("1 Button.jpg")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 153, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/SpriteTypeTest/PNGs Indexed/1 Button.png b/devtools/SpriteTypeTest/PNGs Indexed/1 Button.png Binary files differdeleted file mode 100755 index 6faafa1..0000000 --- a/devtools/SpriteTypeTest/PNGs Indexed/1 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Indexed/2 Button.png b/devtools/SpriteTypeTest/PNGs Indexed/2 Button.png Binary files differdeleted file mode 100755 index 6abdc88..0000000 --- a/devtools/SpriteTypeTest/PNGs Indexed/2 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Indexed/3 Button.png b/devtools/SpriteTypeTest/PNGs Indexed/3 Button.png Binary files differdeleted file mode 100755 index 5481253..0000000 --- a/devtools/SpriteTypeTest/PNGs Indexed/3 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Indexed/4 Button.png b/devtools/SpriteTypeTest/PNGs Indexed/4 Button.png Binary files differdeleted file mode 100755 index 9da909e..0000000 --- a/devtools/SpriteTypeTest/PNGs Indexed/4 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Indexed/5 Button.png b/devtools/SpriteTypeTest/PNGs Indexed/5 Button.png Binary files differdeleted file mode 100755 index 2ce9ba6..0000000 --- a/devtools/SpriteTypeTest/PNGs Indexed/5 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Indexed/6 Button.png b/devtools/SpriteTypeTest/PNGs Indexed/6 Button.png Binary files differdeleted file mode 100755 index a280c37..0000000 --- a/devtools/SpriteTypeTest/PNGs Indexed/6 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Indexed/7 Button.png b/devtools/SpriteTypeTest/PNGs Indexed/7 Button.png Binary files differdeleted file mode 100755 index 3c91653..0000000 --- a/devtools/SpriteTypeTest/PNGs Indexed/7 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Indexed/8 Button.png b/devtools/SpriteTypeTest/PNGs Indexed/8 Button.png Binary files differdeleted file mode 100755 index c9acde9..0000000 --- a/devtools/SpriteTypeTest/PNGs Indexed/8 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Indexed/9 Button.png b/devtools/SpriteTypeTest/PNGs Indexed/9 Button.png Binary files differdeleted file mode 100755 index 7ffd035..0000000 --- a/devtools/SpriteTypeTest/PNGs Indexed/9 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Indexed/bounce.py b/devtools/SpriteTypeTest/PNGs Indexed/bounce.py deleted file mode 100755 index df34a0e..0000000 --- a/devtools/SpriteTypeTest/PNGs Indexed/bounce.py +++ /dev/null @@ -1,70 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.png") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.png"), - 2: pygame.image.load("3 Button.png"), - 3: pygame.image.load("4 Button.png"), - 4: pygame.image.load("5 Button.png"), - 5: pygame.image.load("6 Button.png"), - 6: pygame.image.load("7 Button.png"), - 7: pygame.image.load("8 Button.png"), - 8: pygame.image.load("9 Button.png"), - 9: pygame.image.load("1 Button.png") - } - ball = switcher.get(i,pygame.image.load("1 Button.png")) - - #ball = pygame.Surface(rect.size).convert() - #ball.blit(self.sheet, (0,0), rect) - colorkey = (255, 153, 0) - ball.set_colorkey(colorkey, pygame.RLEACCEL) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/SpriteTypeTest/PNGs Transparent/1 Button.png b/devtools/SpriteTypeTest/PNGs Transparent/1 Button.png Binary files differdeleted file mode 100755 index dab1239..0000000 --- a/devtools/SpriteTypeTest/PNGs Transparent/1 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Transparent/2 Button.png b/devtools/SpriteTypeTest/PNGs Transparent/2 Button.png Binary files differdeleted file mode 100755 index 56312a7..0000000 --- a/devtools/SpriteTypeTest/PNGs Transparent/2 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Transparent/3 Button.png b/devtools/SpriteTypeTest/PNGs Transparent/3 Button.png Binary files differdeleted file mode 100755 index 4ceb540..0000000 --- a/devtools/SpriteTypeTest/PNGs Transparent/3 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Transparent/4 Button.png b/devtools/SpriteTypeTest/PNGs Transparent/4 Button.png Binary files differdeleted file mode 100755 index 38d640a..0000000 --- a/devtools/SpriteTypeTest/PNGs Transparent/4 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Transparent/5 Button.png b/devtools/SpriteTypeTest/PNGs Transparent/5 Button.png Binary files differdeleted file mode 100755 index dcc14d4..0000000 --- a/devtools/SpriteTypeTest/PNGs Transparent/5 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Transparent/6 Button.png b/devtools/SpriteTypeTest/PNGs Transparent/6 Button.png Binary files differdeleted file mode 100755 index cb2f933..0000000 --- a/devtools/SpriteTypeTest/PNGs Transparent/6 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Transparent/7 Button.png b/devtools/SpriteTypeTest/PNGs Transparent/7 Button.png Binary files differdeleted file mode 100755 index 497ed6f..0000000 --- a/devtools/SpriteTypeTest/PNGs Transparent/7 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Transparent/8 Button.png b/devtools/SpriteTypeTest/PNGs Transparent/8 Button.png Binary files differdeleted file mode 100755 index 693ac1e..0000000 --- a/devtools/SpriteTypeTest/PNGs Transparent/8 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Transparent/9 Button.png b/devtools/SpriteTypeTest/PNGs Transparent/9 Button.png Binary files differdeleted file mode 100755 index e83b570..0000000 --- a/devtools/SpriteTypeTest/PNGs Transparent/9 Button.png +++ /dev/null diff --git a/devtools/SpriteTypeTest/PNGs Transparent/bounce.py b/devtools/SpriteTypeTest/PNGs Transparent/bounce.py deleted file mode 100755 index 284947c..0000000 --- a/devtools/SpriteTypeTest/PNGs Transparent/bounce.py +++ /dev/null @@ -1,65 +0,0 @@ -import sys, pygame, time -pygame.init() - -size = width, height = 600,400 -print "\n\n ---- ---- ---- ---- ---- ---- \nFiltype test - Authors Dave Silverman and Scott Mengel" -print "Set size to 1200 x 900 px" -speed = [2, 2] -black = 255, 255, 255 - -screen = pygame.display.set_mode(size) - -ball = pygame.image.load("1 Button.png") -ballrect = ball.get_rect() -i=1 -print "Ball Loaded, collision detection ready, Initiating Loop:" - -# R is the Renewed time -# init is the time started -# tt is the test time, gathered by adding the previous test time with -#the new elapsed time which is test.time()'s difference from init - -r=0 - -start = time.time() - -while 1: - # Homemade switcher for the purpose of selecting which img to load - switcher = { - 1: pygame.image.load("2 Button.png"), - 2: pygame.image.load("3 Button.png"), - 3: pygame.image.load("4 Button.png"), - 4: pygame.image.load("5 Button.png"), - 5: pygame.image.load("6 Button.png"), - 6: pygame.image.load("7 Button.png"), - 7: pygame.image.load("8 Button.png"), - 8: pygame.image.load("9 Button.png"), - 9: pygame.image.load("1 Button.png") - } - ball = switcher.get(i,pygame.image.load("1 Button.png")) - - i=i+1 - - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - - ballrect = ballrect.move(speed) - - if ballrect.left < 0 or ballrect.right > width: - speed[0] = -speed[0] - if ballrect.top < 0 or ballrect.bottom > height: - speed[1] = -speed[1] - - screen.fill(black) - screen.blit(ball, ballrect) - pygame.display.flip() - - r=r+1 - - val=1/((time.time()-start)/r) - print val - print r - if r > 500: - sys.exit(0) diff --git a/devtools/SpriteTypeTest/spriteTest.py b/devtools/SpriteTypeTest/spriteTest.py deleted file mode 100755 index 8030578..0000000 --- a/devtools/SpriteTypeTest/spriteTest.py +++ /dev/null @@ -1,115 +0,0 @@ -#! /usr/bin/env python -import pygame, time -pygame.init() - -print "\n-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --\n" -print "Sprite Test - Authors Dave Silverman and Scott Mengel" -print "Set size to 600 x 400 px" -print "Running..." - - - -#-------------------------------------------------------------- -#CONSTANTS AND VARIABLES - -make=input("How many images would you like to load? ") -trial=input("How many runs per trial? ") -sprite={} -ft="" #filetype -r=0 #frame refreshes -i=1 #cycles images -size = width, height = 600,400 #screen sizes -t=0 #trial number n -colorkey=(255, 152, 0) - -ftArr=[ ["bmp","BMPs 16-Bits/"] , ["bmp","BMPs 24-Bits/"] , ["bmp","BMPs 32-Bits/"] , ["gif","GIFs/"] , ["gif","GIFs Transparent/"] , ["jpg","JPGs 1Low/"] , ["jpg","JPGs 2Medium/"] , ["jpg","JPGs 3High/"] , ["jpg","JPGs 4Max/"] , ["png","PNGs Indexed/"] , ["png","PNGs Transparent/"] ] - -screen = pygame.display.set_mode(size) #Screen Set 600x400 -background = 152, 251, 152 # pale green - - -#------------------------------------------------------------- -#The switch function - -def chngSprite(): - cnt=make - while cnt>0: - switcher = { - 1: pygame.image.load("%s2 Button.%s"%(ft[1],ft[0])), - 2: pygame.image.load("%s3 Button.%s"%(ft[1],ft[0])), - 3: pygame.image.load("%s4 Button.%s"%(ft[1],ft[0])), - 4: pygame.image.load("%s5 Button.%s"%(ft[1],ft[0])), - 5: pygame.image.load("%s6 Button.%s"%(ft[1],ft[0])), - 6: pygame.image.load("%s7 Button.%s"%(ft[1],ft[0])), - 7: pygame.image.load("%s8 Button.%s"%(ft[1],ft[0])), - 8: pygame.image.load("%s9 Button.%s"%(ft[1],ft[0])), - 9: pygame.image.load("%s1 Button.%s"%(ft[1],ft[0])) - } - sprite[cnt,0]=switcher.get(i,pygame.image.load("%s1 Button.%s"%(ft[1],ft[0]))) - sprite[cnt,0] = pygame.transform.scale(sprite[cnt,0],(20, 20)) - cnt=cnt-1 - - -#----------------------------------------------------------------- -#- Collision detection ------------------------------------------- - -def collision(): - cnt=make - while cnt>0: - if sprite[cnt,1].left < 0 or sprite[cnt,1].right > width: - sprite[cnt,2]=[ -sprite[cnt,2][0], sprite[cnt,2][1] ] - if sprite[cnt,1].top < 0 or sprite[cnt,1].bottom > height: - sprite[cnt,2]=[ sprite[cnt,2][0], -sprite[cnt,2][1] ] - sprite[cnt,1] = sprite[cnt,1].move(sprite[cnt,2]) - screen.blit(sprite[cnt,0],sprite[cnt,1]) - cnt=cnt-1 - pygame.display.flip() - - -#----------------------------------------------------------------- -#- Number of dashed lined relates to loops ----------------------- - -while 1: - cnt=make - ft=ftArr[t] - print "Testing "+ft[1]+"N Button."+ft[0] - trialthis=trial - -#----------------------------------------------------------------- - while trialthis>0: - - #------------------------------------------------------------- - while cnt>0: - sprite[cnt,0]= pygame.image.load("%s1 Button.%s"%(ft[1],ft[0])) #image.load - sprite[cnt,0] = pygame.transform.scale(sprite[cnt,0],(20, 20)) - sprite[cnt,1]= sprite[cnt,0].get_rect() - sprite[cnt,2]= [2,2] #speed - m=cnt*40 # named m cause i wanted some m&ms - sprite[cnt,1]=sprite[cnt,1].move(m,m) #see? it wasn't as tastey though - cnt=cnt-1 - - #------------------------------------------------------------- - r=0 - start=time.time() - - #------------------------------------------------------------- - while 1: - chngSprite() - i=i+1 - if i>9: i=1 - - collision() - screen.fill(background) - - r=r+1 - if r>500: break - - #------------------------------------------------------------- - print 1/((time.time()-start)/r) - trial=trial-1 - -#----------------------------------------------------------------- - t=t+1 - -#----------------------------------------------------------------- -#----------------------------------------------------------------- diff --git a/devtools/scaleTest.py b/devtools/scaleTest.py deleted file mode 100644 index 71d39fd..0000000 --- a/devtools/scaleTest.py +++ /dev/null @@ -1,112 +0,0 @@ -import sys, pygame, time -pygame.init() - -print "Full Test - Authors Dave Silverman and Scott Mengel" -print "Set size to 600 x 400 px" -print "Running..." - -#-------------------------------------------------------------- -#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 n -colorkey=(255, 152, 0) - -ftArr=[ ["bmp","BMPs 16-Bits/"] , ["bmp","BMPs 24-Bits/"] , ["bmp","BMPs 32-Bits/"] , ["gif","GIFs/"] , ["gif","GIFs Transparent/"] , ["jpg","JPGs 1Low/"] , ["jpg","JPGs 2Medium/"] , ["jpg","JPGs 3High/"] , ["jpg","JPGs 4Max/"] , ["png","PNGs Indexed/"] , ["png","PNGs Transparent/"] ] - -screen = pygame.display.set_mode(size) #Screen Set 600x400 -background = 152, 251, 152 # pale green - -#The switch function -#------------------------------------------------------------- -def chngImg(): - cnt=make - while cnt>0: - switcher = { - 1: pygame.image.load("%s2 Button.%s"%(ft[1],ft[0])), - 2: pygame.image.load("%s3 Button.%s"%(ft[1],ft[0])), - 3: pygame.image.load("%s4 Button.%s"%(ft[1],ft[0])), - 4: pygame.image.load("%s5 Button.%s"%(ft[1],ft[0])), - 5: pygame.image.load("%s6 Button.%s"%(ft[1],ft[0])), - 6: pygame.image.load("%s7 Button.%s"%(ft[1],ft[0])), - 7: pygame.image.load("%s8 Button.%s"%(ft[1],ft[0])), - 8: pygame.image.load("%s9 Button.%s"%(ft[1],ft[0])), - 9: pygame.image.load("%s1 Button.%s"%(ft[1],ft[0])) - } - img[cnt,0]=switcher.get(i,pygame.image.load("%s1 Button.%s"%(ft[1],ft[0]))) - #img[cnt,0].set_colorkey(colorkey, pygame.RLEACCEL) - #img[cnt,0].resize(200,200) this is for resizing an image - #pygame.transform.scale(img[cnt,0],(200, 200)) - img[cnt,0] = pygame.transform.scale(img[cnt,0],(20, 20)) - cnt=cnt-1 -#----------------------------------------------------------------- -#Collision detection - -def collision(): - cnt=make - while cnt>0: - if img[cnt,1].left < 0 or img[cnt,1].right > width: - img[cnt,2]=[ -img[cnt,2][0], img[cnt,2][1] ] - if img[cnt,1].top < 0 or img[cnt,1].bottom > height: - img[cnt,2]=[ img[cnt,2][0], -img[cnt,2][1] ] - img[cnt,1] = img[cnt,1].move(img[cnt,2]) - screen.blit(img[cnt,0],img[cnt,1]) - cnt=cnt-1 - pygame.display.flip() -#----------------------------------------------------------------- -#----------------------------------------------------------------- -#----------------------------------------------------------------- -#----------------------------------------------------------------- -while 1: - cnt=make - ft=ftArr[t] - print "Testing "+ft[1]+"N Button."+ft[0] - trial=5 - while trial>0: - while cnt>0: - img[cnt,0]= pygame.image.load("%s1 Button.%s"%(ft[1],ft[0])) #image.load - img[cnt,0] = pygame.transform.scale(img[cnt,0],(20, 20)) - img[cnt,1]= img[cnt,0].get_rect() - img[cnt,2]= [2,2] #speed - m=cnt*40 # named m cause i wanted some m&ms - img[cnt,1]=img[cnt,1].move(m,m) #see? it wasn't as tastey though - cnt=cnt-1 - r=0 - start=time.time() -# ----------------------------------------------------------------- - while 1: - chngImg() - i=i+1 - if i>9: i=1 - - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() - -# speed1=collision(ballrect1,speed1) -# ballrect1 = ballrect1.move(speed1) - - collision() - screen.fill(background) - -# cnt=make -# while cnt>0: -# screen.blit(ball1, ballrect1) -# screen.blit(img[cnt,0],img[cnt,1]) -# cnt=cnt-1 -# -# pygame.display.flip() - - r=r+1 - if r>500: break - -# ----------------------------------------------------------------- -# ----------------------------------------------------------------- - - print 1/((time.time()-start)/r) - trial=trial-1 - t=t+1 |