Movements

socialintengine/cst.py

@@ -1,4 +1,6 @@
 from synergine.lib.eint import IncrementedNamedInt
 
 ALIVE = IncrementedNamedInt.get('socialintengine.alive')
-IMPENETRABLE = IncrementedNamedInt.get('socialintengine.impenetrable')
+IMPENETRABLE = IncrementedNamedInt.get('socialintengine.impenetrable')
+PREVIOUS_DIRECTION = IncrementedNamedInt.get('socialintengine.previous_direction')
+BLOCKED_SINCE = IncrementedNamedInt.get('socialintengine.blocked_since')

socialintengine/display/pygame/visualisation.py

@@ -1,22 +1,35 @@
 from xyworld.display.object.pygame.PygameImage import PygameImage
+from xyworld.display.object.pygame.DirectionnedImage import DirectionnedImage
 from socialintengine.synergy.object.Bug import Bug
 from socialintengine.synergy.object.ant.Ant import Ant
 from socialintengine.synergy.object.Rock import Rock
 from os import getcwd
+from synergine.metas import metas
+from socialintengine.cst import PREVIOUS_DIRECTION
 
-# TODO: Url relative au fichier
-ant = PygameImage(getcwd()+'/socialintengine/display/pygame/image/ant2.png')
-bug = PygameImage(getcwd()+'/socialintengine/display/pygame/image/ant2.png')
-rock = PygameImage(getcwd()+'/socialintengine/display/pygame/image/rock.png')
+ant = PygameImage.from_filepath(getcwd()+'/socialintengine/display/pygame/image/ant.png')
+bug = PygameImage.from_filepath(getcwd()+'/socialintengine/display/pygame/image/ant.png')
+rock = PygameImage.from_filepath(getcwd()+'/socialintengine/display/pygame/image/rock.png')
+
+directions_ant = DirectionnedImage(ant)
+
+def bug_direction(bug):
+    try:
+        previous_direction = metas.value.get(PREVIOUS_DIRECTION, bug.get_id())
+    except KeyError:
+        previous_direction = 14
+    return directions_ant.get_for_direction(previous_direction)
 
 visualisation = {
     'window': {},
     'objects': {
         Ant: {
-            'default': ant
+            'default': ant,
+            'callbacks': [bug_direction]
         },
         Bug: {
-            'default': bug
+            'default': bug,
+            'callbacks': [bug_direction]
         },
         Rock: {
             'default': rock

socialintengine/synergy/event/move/MoveAction.py

@@ -1,9 +1,10 @@
 from synergine.synergy.event.Action import Action
 from socialintengine.synergy.event.move.MoveEvent import MoveEvent
-from random import randint
+from random import randint, choice
 from xyzworld.cst import POSITION, POSITIONS
-from socialintengine.cst import IMPENETRABLE
+from socialintengine.cst import IMPENETRABLE, PREVIOUS_DIRECTION, BLOCKED_SINCE
 from synergine.synergy.Simulation import Simulation
+from socialintengine.synergy.event.move.direction import directions_same_level, directions_modifiers, directions_slighty
 
 
 class MoveAction(Action):
@@ -12,20 +13,41 @@ class MoveAction(Action):
 
     def __init__(self, object_id, parameters):
       super().__init__(object_id, parameters)
-      self._move_to = None
+      self._move_to_point = None
+      self._move_to_direction = None
 
     def prepare(self, context):
       object_point = context.metas.value.get(POSITION, self._object_id)
-      choosed_direction_point = self._get_random_direction_point(object_point)
+      choosed_direction_name, choosed_direction_point = self._get_random_direction_point(context, object_point)
       if self._direction_point_is_possible(context, choosed_direction_point):
-        self._move_to = choosed_direction_point
+        self._move_to_point = choosed_direction_point
+        self._move_to_direction = choosed_direction_name
 
-    def _get_random_direction_point(self, reference_point):
+    def _get_random_direction_point(self, context, reference_point):
         z, x, y = reference_point
-        new_z = z
-        new_x = x + randint(-1, 1)
-        new_y = y + randint(-1, 1)
-        return (new_z, new_x, new_y)
+        direction_name = self._get_random_direction_name(context)
+        directions_modifier = directions_modifiers[direction_name]
+        new_position = (z + directions_modifier[0], x + directions_modifier[1], y + directions_modifier[2])
+        return (direction_name, new_position)
+
+    def _get_random_direction_name(self, context):
+        try:
+            blocked_since = context.metas.value.get(BLOCKED_SINCE, self._object_id)
+        except KeyError:
+            blocked_since = 0
+        direction_name = None
+        if blocked_since <= 3:  #TODO: config
+            try:
+                previous_direction = context.metas.value.get(PREVIOUS_DIRECTION, self._object_id)
+                directions_list = directions_slighty[previous_direction]
+                direction_name = choice(directions_list)
+            except KeyError:
+                pass
+
+        if not direction_name:
+            direction_name = randint(directions_same_level[0], directions_same_level[1])
+
+        return direction_name
 
     def _direction_point_is_possible(self, context, direction_point):
         objects_ids_on_this_point = context.metas.list.get(POSITIONS, direction_point, allow_empty=True)
@@ -35,5 +57,13 @@ class MoveAction(Action):
         return True
 
     def run(self, obj, collection, context):
-        if self._move_to is not None:
-            obj.add_trace(self._move_to)
+        if self._move_to_point is not None:
+            obj.add_trace(self._move_to_point)
+            context.metas.value.set(PREVIOUS_DIRECTION, self._object_id, self._move_to_direction)
+            context.metas.value.set(BLOCKED_SINCE, self._object_id, 0)
+        else:
+            try:
+                blocked_since = context.metas.value.get(BLOCKED_SINCE, self._object_id)
+            except:
+                blocked_since = 0
+            context.metas.value.set(BLOCKED_SINCE, self._object_id, blocked_since+1)

socialintengine/synergy/event/move/MoveEvent.py

@@ -1,5 +1,5 @@
 from synergine.synergy.event.Event import Event
-from xyzworld.mechanism.PositionedArroundMechanism import PositionedArroundMechanism
+from synergine.core.simulation.mechanism.Mechanism import Mechanism
 
 
 class MoveEvent(Event):
@@ -9,7 +9,7 @@ class MoveEvent(Event):
 
     def __init__(self, actions):
         super().__init__(actions)
-        self._mechanism = PositionedArroundMechanism
+        self._mechanism = Mechanism
 
     def _object_match(self, object_id, context, parameters={}):
       return True

socialintengine/synergy/event/move/direction.py

@@ -0,0 +1,99 @@
+
+"""
+Directions identifiers 3D, central position is 14.
+niv -1:  1   2  3
+         4   5  6
+         7   8  9
+
+niv 0:   10 11 12
+         13 14 15
+         16 17 18
+
+niv 1:   19 20 21
+         22 23 24
+         25 26 27
+"""
+
+directions = (0, 27)
+directions_under_level = (0, 9)
+directions_same_level = (10, 18)
+directions_upper_level = (19, 27)
+directions_modifiers = {
+  #  (z, x, y)
+  1: (-1, -1, -1),
+  2: (-1, 0, -1),
+  3: (-1, 1, -1),
+  4: (-1, -1, 0),
+  5: (-1, 0, 0),
+  6: (-1, 1, 0),
+  7: (-1, -1, 1),
+  8: (-1, 0, 1),
+  9: (-1, 1, 1),
+  #  (z, x, y)
+  10: (0, -1, -1),
+  11: (0, 0, -1),
+  12: (0, 1, -1),
+  13: (0, -1, 0),
+  14: (0, 0, 0),
+  15: (0, 1, 0),
+  16: (0, -1, 1),
+  17: (0, 0, 1),
+  18: (0, 1, 1),
+  #  (z, x, y)
+  19: (1, -1, -1),
+  20: (1, 0, -1),
+  21: (1, 1, -1),
+  22: (1, -1, 0),
+  23: (1, 0, 0),
+  24: (1, 1, 0),
+  25: (1, -1, 1),
+  26: (1, 0, 1),
+  27: (1, 1, 1),
+}
+
+"""
+Directions identifiers 3D, central position is 14.
+niv -1:  1   2  3
+         4   5  6
+         7   8  9
+
+niv 0:   10 11 12
+         13 14 15
+         16 17 18
+
+niv 1:   19 20 21
+         22 23 24
+         25 26 27
+"""
+
+directions_slighty = {
+  1: (1, 2, 4, 13, 10, 11),
+  2: (1, 2, 3, 10, 11, 12),
+  3: (2, 3, 6, 11, 12, 15),
+  4: (1, 4, 7, 10, 13, 16),
+  5: (1, 2, 3, 4, 5, 6, 7, 8, 9),
+  6: (2, 3, 6, 12, 15, 18),
+  7: (4, 7, 8, 13, 16, 17),
+  8: (7, 8, 9, 16, 17, 18),
+  9: (6, 9, 8, 15, 18, 17),
+  #  (z, x, y)
+  10: (13, 10, 11),
+  11: (10, 11, 12),
+  12: (11, 12, 15),
+  13: (10, 13, 16),
+  14: (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27),
+  15: (12, 15, 18),
+  16: (13, 16, 17),
+  17: (16, 17, 18),
+  18: (15, 18, 17),
+  #  (z, x, y)
+  19: (22, 19, 20, 13, 10, 11),
+  20: (19, 20, 21, 10, 11, 12),
+  21: (20, 21, 24, 11, 12, 15),
+  22: (19, 22, 25, 10, 13, 16),
+  23: (19, 20, 21, 22, 23, 24, 25, 26, 27),
+  24: (21, 24, 27, 12, 15, 18),
+  25: (22, 25, 26, 13, 16, 17),
+  26: (25, 26, 27, 16, 17, 18),
+  27: (24, 27, 26, 15, 18, 17),
+}