diff options
| author | slm <jtmengel@gmail.com> | 2010-07-27 14:28:02 (GMT) |
|---|---|---|
| committer | slm <jtmengel@gmail.com> | 2010-07-27 14:28:02 (GMT) |
| commit | 3fd7b06a705d034f5a5d909c3bf10ddd04b3d0ed (patch) | |
| tree | 6afc7749a681074188968aa46169b88323a34e69 /devtools/CompleteTestKit | |
| parent | eb961448c83c77f89402c59b2860cfd8986236f8 (diff) | |
| parent | 3fc7af4570a6eec82f62e0dba1b766107ebb6514 (diff) | |
Merge branch 'animationrework' of ssh://jtmengel@git.fedorahosted.org/git/fortune_hunter into animationrework
Diffstat (limited to 'devtools/CompleteTestKit')
| -rw-r--r-- | devtools/CompleteTestKit/DynamicDrawableObject2.py | 11 | ||||
| -rw-r--r-- | devtools/CompleteTestKit/dirtyTest2.py | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/devtools/CompleteTestKit/DynamicDrawableObject2.py b/devtools/CompleteTestKit/DynamicDrawableObject2.py index 1ce8db2..e330c36 100644 --- a/devtools/CompleteTestKit/DynamicDrawableObject2.py +++ b/devtools/CompleteTestKit/DynamicDrawableObject2.py @@ -51,21 +51,28 @@ class DynamicDrawableObject(DrawableObject, pygame.sprite.Sprite): #if self.animations[cnt] == self._current_anim:
+ print 1
timePassed = t + self._last_update
if timePassed > self._delay:
+ print 2
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
-
+ print 3
self._frame = self.animations.get(self._current_anim)[0]
+ print 4
self._frame += timePassed/self._delay
+ print 5
while self._frame >= self.animations.get(self._current_anim)[1]:
-
+ print 6
framesPast = self._frame - self.animations.get(self._current_anim)[1]
self._frame = framesPast - 1 + self.animations.get(self._current_anim)[0]
+ print 7
self.image = self._images[self._frame]
+ print 8
self._last_update = timePassed%self._delay
+ print 9
self._last_update = timePassed
def nextFrame(self):
diff --git a/devtools/CompleteTestKit/dirtyTest2.py b/devtools/CompleteTestKit/dirtyTest2.py index 536ad6f..7ff6f5c 100644 --- a/devtools/CompleteTestKit/dirtyTest2.py +++ b/devtools/CompleteTestKit/dirtyTest2.py @@ -78,9 +78,12 @@ for aTrial in range(maxTrial): start = time()
for frame in range(FRAME):
dirtyList=[]
+ print "Made dirty list"
for image in range(numImages):
+ print "In range numImages"
#move / collision detection
groups[image].update(time())
+ print "updated"
#individually blit each image group - add to list for update
dirtyList.extend(groups[image].draw(screen))
print frame
|