diff options
| author | davesilver <nibor123@gmail.com> | 2010-08-03 16:48:56 (GMT) |
|---|---|---|
| committer | davesilver <nibor123@gmail.com> | 2010-08-03 16:48:56 (GMT) |
| commit | 63d65564248359ae67995f21426dd7ba24d8c746 (patch) | |
| tree | ca6ce265ea778e0128475b054b30bd4a29485c2c /devtools | |
| parent | 6d2b38088bb779ce9333b4f33797bda412202f08 (diff) | |
Working on integration
Diffstat (limited to 'devtools')
20 files changed, 91 insertions, 16 deletions
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 differnew file mode 100644 index 0000000..57630e3 --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/1.bmp 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 differnew file mode 100644 index 0000000..90af77a --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/2.bmp 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 differnew file mode 100644 index 0000000..1751a4a --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/3.bmp 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 differnew file mode 100644 index 0000000..1f292d1 --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/4.bmp 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 differnew file mode 100644 index 0000000..fd8cc0e --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/5.bmp 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 differnew file mode 100644 index 0000000..df3a2eb --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/6.bmp 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 differnew file mode 100644 index 0000000..51b0052 --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/7.bmp 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 differnew file mode 100644 index 0000000..9302c64 --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/8.bmp 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 differnew file mode 100644 index 0000000..f5c6191 --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a1/9.bmp 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 differnew file mode 100644 index 0000000..4def064 --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/1.bmp 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 differnew file mode 100644 index 0000000..3750af4 --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/2.bmp 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 differnew file mode 100644 index 0000000..636c6f3 --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/3.bmp 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 differnew file mode 100644 index 0000000..646b407 --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/4.bmp 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 differnew file mode 100644 index 0000000..11a9bf5 --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/5.bmp 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 differnew file mode 100644 index 0000000..ca1ba7b --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/6.bmp 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 differnew file mode 100644 index 0000000..9375c15 --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/7.bmp 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 differnew file mode 100644 index 0000000..53b66f9 --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/8.bmp 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 differnew file mode 100644 index 0000000..088558c --- /dev/null +++ b/devtools/Dave's Test Kit/Animation Styles/IndividualFrames/bmp16/a2/9.bmp diff --git a/devtools/Dave's Test Kit/DODirtyTest.py b/devtools/Dave's Test Kit/DODirtyTest.py new file mode 100644 index 0000000..4e13590 --- /dev/null +++ b/devtools/Dave's Test Kit/DODirtyTest.py @@ -0,0 +1,78 @@ +#! /usr/bin/env python
+import pygame
+from pygame.locals import *
+from time import time
+from Scene import Scene
+from DrawableObject import DrawableObject
+from DynamicDrawableObject import DynamicDrawableObject
+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
+
+#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()#starting timer
+
+ d = DynamicDrawableObject(surfaceList,'') #creating my DynamicDrawableObject object using my previously made images list
+
+ 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/FontDirtyTest.py b/devtools/Dave's Test Kit/FontDirtyTest.py index d1b6605..22a6661 100644 --- a/devtools/Dave's Test Kit/FontDirtyTest.py +++ b/devtools/Dave's Test Kit/FontDirtyTest.py @@ -31,30 +31,27 @@ 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 DrawableFoneObject object using my previously made font object
- #d.goToAnim("anim1")#going to the first animation. MUST DO THIS STEP
-
+ d = DrawableFontObject("hello world", font) #creating my DrawableFontObject object using my previously made font object
- group1=Scene(d)
- groups=[group1]
+ 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))
+ d.changeText(str(frame))#updates my text for my DFO
for image in range(numImages):
- #move / collision detection
- groups[image].update(clock.get_time())
- clock.tick()
- #individually blit each image group - add to list for update
- dirtyList.extend(groups[image].draw(screen))
-
- #draw the images flip/update
- pygame.display.update(dirtyList)
+ 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)
+ groups[image].clear(screen, background)#clears stuff behind images based on given background image.
|
