Merge branch 'animationrework' of git+ssh://git.fedorahosted.org/git/fortune_hunter into animationrework

3 files changed, 28 insertions, 133 deletions

diff --git a/MAFH2/drawableobject/DynamicDrawableObject.py b/MAFH2/drawableobject/DynamicDrawableObject.py
deleted file mode 100755
index aaf518b..0000000
--- a/MAFH2/drawableobject/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 = 2, 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 updateAnim(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/MAFH2/drawableobject/__init__.py b/MAFH2/drawableobject/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/MAFH2/drawableobject/__init__.py
+++ /dev/null
diff --git a/MAFH2/fortuneengine/Scene.py b/MAFH2/fortuneengine/Scene.py
index 13827d3..47b73e8 100644
--- a/MAFH2/fortuneengine/Scene.py
+++ b/MAFH2/fortuneengine/Scene.py
@@ -22,12 +22,10 @@ class Scene(pygame.sprite.RenderUpdates):
     

        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

+

+       for i in range(len(self._spritelist)):

+           if self._spritelist[i][0].getXPos() < lowestX: lowestX = self._spritelist[i][0].getXPos()

+           if self._spritelist[i][0].getYPos() < lowestY: lowestY = self._spritelist[i][0].getYPos()

 

        self.xPos = lowestX

        self.yPos = lowestY

@@ -37,11 +35,9 @@ class Scene(pygame.sprite.RenderUpdates):
        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

+       for i in range(len(self._spritelist)):

+           if (self._spritelist[i][0].getXPos() + self._spritelist[i][0].getXSize()) > highestX: highestX = self._spritelist[i][0].getXPos() + self._spritelist[i][0].getXSize()

+           if (self._spritelist[i][0].getYPos() + self._spritelist[i][0].getYSize()) > highestY: highestY = self._spritelist[i][0].getYPos() + self._spritelist[i][0].getYSize()

 

        self.xSize = highestX - self.xPos

        self.ySize = highestY - self.yPos

@@ -57,11 +53,9 @@ class Scene(pygame.sprite.RenderUpdates):
 

     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

+       for i in range(len(self._spritelist)):

+           self._spritelist[i][1] = self._spritelist[i][0].getXPos() - self.xPos

+           self._spritelist[i][2] = self._spritelist[i][0].getYPos() - self.yPos

 

     def removeObject(self, sprite):

 

@@ -86,11 +80,8 @@ class Scene(pygame.sprite.RenderUpdates):
 

     def moveObjects(self):

 

-       cnt = 0

-       while cnt < len(self._spritelist):

-

-          self._spritelist[cnt][0].move()

-          cnt += 1

+       for i in range(len(self._spritelist)):

+          self._spritelist[i][0].move()

 

        self.calcPosition()

        self.calcSize()

@@ -98,11 +89,11 @@ class Scene(pygame.sprite.RenderUpdates):
 

     def moveScene(self, xNudge = 0, yNudge = 0):

 

-       cnt = 0

-       while cnt < len(self._spritelist):

+       

+       for i in range(len(self._spritelist)):

 

-          self._spritelist[cnt][0].nudge(xNudge, yNudge)

-          cnt += 1

+          self._spritelist[i][0].nudge(xNudge, yNudge)

+          

 

        self.calcPosition()

 

@@ -111,11 +102,9 @@ class Scene(pygame.sprite.RenderUpdates):
        if newXPos != None: self.xPos = newXPos

        if newYPos != None: self.yPos = newYPos

 

-       cnt = 0

-       while cnt < len(self._spritelist):

+       for i in range(len(self._spritelist)):

 

-          self._spritelist[cnt][0].setPosition(self.xPos + self._spritelist[cnt][1], self.yPos + self._spritelist[cnt][2])

-          cnt += 1

+          self._spritelist[i][0].setPosition(self.xPos + self._spritelist[i][1], self.yPos + self._spritelist[i][2])

 

     def getXPos(self):

        return self.xPos

@@ -131,10 +120,9 @@ class Scene(pygame.sprite.RenderUpdates):
 

     def scaleObjects(self, newXSize = None, newYSize = None):

 

-       cnt = 0

-       while cnt < len(self._spritelist):

-           self._spritelist[cnt][0].scale(newXSize, newYSize)

-           cnt += 1

+       

+       for i in range(len(self._spritelist)):

+           self._spritelist[i][0].scale(newXSize, newYSize)

 

     def scaleScene(self, newXSize = None, newYSize = None):

 

@@ -146,13 +134,11 @@ class Scene(pygame.sprite.RenderUpdates):
 

        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

+       

+       for i in range(len(self._spritelist)):

+           self._spritelist[i][0].scale(xScale * self._spritelist[iaw][0].getXSize(), yScale * self._spritelist[i][0].getYSize())

+           self._spritelist[i][1] = xScale * self._spritelist[i][1]

+           self._spritelist[i][2] = yScale * self._spritelist[i][2]

 

        self.calcPosition()

        self.calcSize()

@@ -195,8 +181,6 @@ class Scene(pygame.sprite.RenderUpdates):
 

     def nextFrame(self):

 

-       cnt = 0

-       while cnt < len(self._spritelist):

+       for i in range(len(self._spritelist)):

 

-          self._spritelist[cnt][0].nextFrame()

-          cnt += 1

+          self._spritelist[i][0].nextFrame()