Adding the basic Scene file. No functionality so far. Updating the DO and DDO files.

3 files changed, 37 insertions, 23 deletions

diff --git a/DrawableObjectTests/DrawableObject.py b/DrawableObjectTests/DrawableObject.py
index 9f10765..be58f45 100755
--- a/DrawableObjectTests/DrawableObject.py
+++ b/DrawableObjectTests/DrawableObject.py
@@ -13,6 +13,7 @@ class DrawableObject(pygame.sprite.Sprite):
         self._last_update = 0

         self._frame = 0

         self.animations = {}

+        self._current_anim = ""

         self.xPos = x

         self.yPos = y

         self.xSpeed = xVelocity

@@ -43,6 +44,7 @@ class DrawableObject(pygame.sprite.Sprite):
         while cnt < len(animations):

            

            if animations[cnt] == animName:

+             self._current_anim = animName

              self._frame = self.animations[animName][0]

              self.image = self._images[self._frame]

              cnt = len(animations)

@@ -52,7 +54,14 @@ class DrawableObject(pygame.sprite.Sprite):
 

         self.xPos += self.xSpeed

         self.yPos += self.ySpeed

-        

+

+        self.image[0].get_rect().move(self.xPos,self.yPos)

+

+    def nudge(self, currentXSpeed = 0, currentYSpeed = 0):

+

+        self.xPos += self.currentXSpeed

+        self.yPos += self.currentYSpeed

+

         self.image[0].get_rect().move(self.xPos,self.yPos)

 

     def scale(self, newXSize, newYSize):

@@ -86,17 +95,17 @@ class DrawableObject(pygame.sprite.Sprite):
     

     def setPosition(self, x = None, y = None):

     

-       if x != None:  self.xPos = x

-       if y != None:  self.yPos = y

-    

+       if x != None and x >= 0:  self.xPos = x

+       if y != None and y >= 0:  self.yPos = y

+

     def getXPos(self):

-    

+

        return self.xPos

 

     def getYPos(self):

 

        return self.yPos

-       

+

     def setSpeed(self, xVelocity = None, yVelocity = None):

 

        if xVelocity != None:  self.xSpeed = xVelocity

@@ -112,9 +121,9 @@ class DrawableObject(pygame.sprite.Sprite):
        

     def update(self, t):

 

-    def updateAnimation(self, t, animName):

+    def updateCurrnetAnimation(self, t):

 

     def nextFrame(self):

 

-    def nextAnimFrame(self, animName):

+    def nextCurrentAnimFrame(self):

 

diff --git a/DrawableObjectTests/DynamicDrawableObject.py b/DrawableObjectTests/DynamicDrawableObject.py
index 9f2fedf..f8d929d 100755
--- a/DrawableObjectTests/DynamicDrawableObject.py
+++ b/DrawableObjectTests/DynamicDrawableObject.py
@@ -1,5 +1,5 @@
 import pygame

-from DrawableObject import DrawableObject 

+from DrawableObject import DrawableObject

 

 class DynamicDrawableObject(DrawableObject, pygame.sprite.Sprite):

 

@@ -26,25 +26,25 @@ class DynamicDrawableObject(DrawableObject, pygame.sprite.Sprite):
             self._last_update = timePassed%self._delay

         self._last_update = timePassed

 

-    def updateAnimation(self, t, animName):

+    def updateCurrentAnimation(self, t):

 

         cnt = 0

         while cnt < len(animations):

            

-           if animations[cnt] == animName:

+           if animations[cnt] == self._current_anim:

         

               timePassed = t + self._last_update

               if timePassed > self._delay:

 

-                  if self._frame < self.animations.get(animName)[0] or self._frame > self.animations.get(animName)[1]: #checking if I am in the animation and putting me there if I am not

+                  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(animName)[0]

+                    self._frame = self.animations.get(self._current_anim)[0]

 

                   self._frame += timePassed/self._delay

-                  while self._frame >= self.animations.get(animName)[1]:

+                  while self._frame >= self.animations.get(self._current_anim)[1]:

       

-                    framesPast = self._frame - self.animations.get(animName)[1]

-                    self._frame = framesPast - 1 + self.animations.get(animName)[0]

+                    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

@@ -64,23 +64,23 @@ class DynamicDrawableObject(DrawableObject, pygame.sprite.Sprite):
 

         self.image = self._images[self._frame]

 

-    def nextAnimFrame(self, animName):

+    def nextCurrentAnimFrame(self):

 

         cnt = 0

         while cnt < len(animations):

            

-           if animations[cnt] == animName:

+           if animations[cnt] == self._current_anim:

               

-              if self._frame < self.animations[animName][0] or self._frame > self.animations[animName][1]:

+              if self._frame < self.animations[self._current_anim][0] or self._frame > self.animations[self._current_anim][1]:

                   

-                  self._frame = self.animations[animName][0]

+                  self._frame = self.animations[self._current_anim][0]

               else:

                   self._frame += 1

 

-              if self._frame > self.animations[animName][1]:

+              if self._frame > self.animations[self._current_anim][1]:

       

-                  framesPast = self._frame - self.animations[animName][1]

-                  self._frame = framesPast - 1 + self.animations[animName][0]

+                  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/DrawableObjectTests/Scene.py b/DrawableObjectTests/Scene.py
new file mode 100644
index 0000000..38ef8cc
--- /dev/null
+++ b/DrawableObjectTests/Scene.py
@@ -0,0 +1,5 @@
+import pygame

+

+class Scene:

+

+    def __init__(self, filename):