Changeset 143:deac6a4008e7 for nagslang

Timestamp:

09/02/13 20:35:41 (8 years ago)

Author:

Neil Muller <drnlmuller@…>

Branch:

default

Phase:

public

Message:

Hook up protagnist animations

Location:

nagslang

Files:

• game_object.py (modified) (3 diffs)
• protagonist.py (modified) (3 diffs)
• screens/area.py (modified) (1 diff)

nagslang/game_object.py

@@ -151 +151 @@
             self._render_shape(surface, pos, angle)
 
+    def animate(self):
+        # Used by time animatations to advance the clock
+        pass
+
 
 def image_pos(image, pos):
@@ -184 +188 @@
         surface.blit(image, image_pos(image, pos))
         super(FacingImageRenderer, self).render(surface)
+
+
+class AnimatedFacingImageRenderer(FacingImageRenderer):
+    def __init__(self, left_images, right_images):
+        self._images = {
+            'left': left_images,
+            'right': right_images,
+        }
+        self._frame = 0
+        self._moving = False
+
+    def get_image(self, angle):
+        if abs(angle) < math.pi / 2:
+            face = 'right'
+        else:
+            face = 'left'
+        if self._frame >= len(self._images[face]):
+            self._frame = 0
+        return self._images[face][self._frame]
+
+    def render(self, surface):
+        pos = self.game_object.get_render_position(surface)
+        image = self.get_image(self.game_object.get_render_angle())
+        surface.blit(image, image_pos(image, pos))
+        super(FacingImageRenderer, self).render(surface)
+
+    def animate(self):
+        if self._moving:
+            self._frame += 1
+        else:
+            self._frame = 0
+
+    def start(self):
+        self._moving = True
+
+    def stop(self):
+        self._moving = False
+
+
+class TimedAnimatedRenderer(ImageRenderer):
+
+    def __init__(self, images):
+        self._images = images
+        self._frame = 0
+        self._image = None
+
+    def _get_image(self):
+        if self._frame > len(self._imaages):
+            self._frame = 0
+        return self._images[self._frame]
+
+    def render(self, surface):
+        self._image = self._get_image()
+        super(TimedAnimatedRenderer, self).render(surface)
+
+    def animate(self):
+        self._frame += 1
 
 
@@ -254 +315 @@
     def render(self, surface):
         return self.renderer.render(surface)
+
+    def animate(self):
+        self.renderer.animate()
 
 

nagslang/protagonist.py

@@ -4 +4 @@
 from nagslang.constants import COLLISION_TYPE_PLAYER, ZORDER_MID
 from nagslang.game_object import (
-    GameObject, SingleShapePhysicser, FacingImageRenderer, make_body)
+    GameObject, SingleShapePhysicser, AnimatedFacingImageRenderer, make_body)
 from nagslang.mutators import FLIP_H
 from nagslang.resources import resources
@@ -51 +51 @@
     def _setup_renderers(self):
         self._renderers = {
-            self.HUMAN_FORM: FacingImageRenderer(
-                self._get_image('human_1.png'),
-                self._get_image('human_1.png', FLIP_H)),
-            self.WOLF_FORM: FacingImageRenderer(
-                self._get_image('werewolf_1.png'),
-                self._get_image('werewolf_1.png', FLIP_H)),
+            self.HUMAN_FORM: AnimatedFacingImageRenderer(
+                (self._get_image('human_1.png'),
+                 self._get_image('human_1.png'),
+                 self._get_image('human_1.png'),
+                 self._get_image('human_2.png'),
+                 self._get_image('human_2.png'),
+                 self._get_image('human_2.png')),
+                (self._get_image('human_1.png', FLIP_H),
+                 self._get_image('human_1.png', FLIP_H),
+                 self._get_image('human_1.png', FLIP_H),
+                 self._get_image('human_2.png', FLIP_H),
+                 self._get_image('human_2.png', FLIP_H),
+                 self._get_image('human_2.png', FLIP_H))),
+            self.WOLF_FORM: AnimatedFacingImageRenderer(
+                (self._get_image('werewolf_1.png'),
+                 self._get_image('werewolf_1.png'),
+                 self._get_image('werewolf_1.png'),
+                 self._get_image('werewolf_2.png'),
+                 self._get_image('werewolf_2.png'),
+                 self._get_image('werewolf_2.png')),
+                (self._get_image('werewolf_1.png', FLIP_H),
+                 self._get_image('werewolf_1.png', FLIP_H),
+                 self._get_image('werewolf_1.png', FLIP_H),
+                 self._get_image('werewolf_2.png', FLIP_H),
+                 self._get_image('werewolf_2.png', FLIP_H),
+                 self._get_image('werewolf_2.png', FLIP_H))),
         }
         for renderer in self._renderers.values():
@@ -94 +114 @@
     def set_direction(self, dx, dy):
         if (dx, dy) == (0, 0):
+            self.renderer.stop()
             return
         self.angle = pymunk.Vec2d((dx, dy)).angle
         self._body.apply_impulse(
             (dx * self.impulse_factor, dy * self.impulse_factor))
+        self.renderer.start()
 
     def toggle_form(self):

nagslang/screens/area.py

@@ -163 +163 @@
     def tick(self, seconds):
         self.tick_protagonist()
+        for drawable in self._drawables:
+            drawable.animate()
         super(AreaScreen, self).tick(seconds)