Changeset 218:9e2ef2f15035 for nagslang

Timestamp:

09/04/13 13:06:33 (8 years ago)

Author:

Jeremy Thurgood <firxen@…>

Branch:

default

Phase:

public

Message:

Better rendering and movement detection.

Location:

nagslang

Files:

• enemies.py (modified) (1 diff)
• game_object.py (modified) (2 diffs)
• protagonist.py (modified) (9 diffs)
• render.py (modified) (1 diff)

nagslang/enemies.py

@@ -34 +34 @@
 
 class PatrollingAlien(Enemy):
+    is_moving = True  # Always walking.
 
     def __init__(self, space, position, end_position):

nagslang/game_object.py

@@ -118 +118 @@
 
     zorder = ZORDER_LOW
+    is_moving = False  # `True` if a movement animation should play.
 
     def __init__(self, physicser, renderer, puzzler=None, overlay=None):
@@ -150 +151 @@
         self.renderer.animate()
 
-    def is_moving(self):
-        """Returns `True` if this object is moving.
-
-        This is mostly for movement-based animation renderers to look at.
-        """
-        return self.physicser.get_velocity().length > 0
-
     def collide_with_protagonist(self):
         """Called as a `pre_solve` collision callback with the protagonist.

nagslang/protagonist.py

@@ -27 +27 @@
 
 
+class ProtagonistFormSelectionRenderer(render.RendererSelectionRenderer):
+    def select_renderer(self):
+        return self.game_object.render_form
+
+
 class Protagonist(GameObject):
     """Representation of our fearless protagonist.
@@ -40 +45 @@
     def __init__(self, space, position):
         physicser = self._make_physics(space, position)
-        self._setup_renderers()
+        renderer = self._make_renderer()
         self.inventory = {}
         self.form = self.HUMAN_FORM
         self.render_form = self.HUMAN_FORM
-
-        super(Protagonist, self).__init__(
-            physicser, self._renderers[self.form])
+        self.angle = 0
+        self.is_moving = False
+
+        super(Protagonist, self).__init__(physicser, renderer)
         self.zorder = ZORDER_MID
 
@@ -79 +85 @@
         return resources.get_image('creatures', name, transforms=transforms)
 
-    def _setup_renderers(self):
-        self.angle = 0
-        self._renderers = {
+    def _make_renderer(self):
+        return ProtagonistFormSelectionRenderer({
             self.HUMAN_FORM: render.FacingSelectionRenderer(
                 {
@@ -118 +123 @@
                          self._get_image('werewolf_back_2.png', FLIP_H)], 3),
                 }),
-        }
-        for renderer in self._renderers.values():
-            renderer.set_game_object(self)
+        })
 
     @classmethod
@@ -144 +147 @@
         else:
             self.render_form = self.WOLF_FORM
-        self.renderer = self._renderers[self.render_form]
 
     def go_human(self):
@@ -157 +159 @@
         else:
             self.render_form = self.HUMAN_FORM
-        self.renderer = self._renderers[self.render_form]
 
     def _switch_to_back(self):
@@ -164 +165 @@
         elif self.render_form == self.WOLF_FORM:
             self.render_form = self.WOLF_FORM_BACK
-        self.renderer = self._renderers[self.render_form]
 
     def _switch_to_front(self):
@@ -171 +171 @@
         elif self.render_form == self.WOLF_FORM_BACK:
             self.render_form = self.WOLF_FORM
-        self.renderer = self._renderers[self.render_form]
 
     def set_direction(self, dx, dy):
         if (dx, dy) == (0, 0):
+            self.is_moving = False
             return
+        self.is_moving = True
         old_angle = self.angle
         self.angle = pymunk.Vec2d((dx, dy)).angle
@@ -201 +202 @@
         self.render_form = old_protagonist.render_form
         self.inventory = old_protagonist.inventory
-        self.renderer = self._renderers[self.render_form]
 
     def toggle_form(self):

nagslang/render.py

@@ -100 +100 @@
 class MovementAnimatedRenderer(TimedAnimatedRenderer):
     def animate(self):
-        if self.game_object.is_moving():
+        if self.game_object.is_moving:
             self.advance_tick()
         else: