rotation on move

requirements.txt

@@ -4,6 +4,7 @@ cocos2d==0.6.4
 coverage==4.4.1
 Dijkstar==2.2
 execnet==1.4.1
+numpy==1.13.1
 packaging==16.8
 psutil==5.2.2
 py==1.4.31

synergine2_cocos2d/animation.py

@@ -4,6 +4,9 @@ import typing
 import pyglet
 import cocos
 
+if False:
+    from synergine2_cocos2d.actor import Actor
+
 ANIMATION_WALK = 'WALK'
 ANIMATION_CRAWL = 'CRAWL'
 

synergine2_cocos2d/gui.py

@@ -29,6 +29,7 @@ from synergine2_cocos2d.middleware import MapMiddleware
 from synergine2_cocos2d.middleware import TMXMiddleware
 from synergine2_cocos2d.user_action import UserAction
 from synergine2_xyz.move import MoveEvent
+from synergine2_xyz.utils import get_angle
 from synergine2_xyz.xyz import XYZSubjectMixin
 
 
@@ -771,10 +772,11 @@ class TMXGui(Gui):
     def move_subject(self, event: MoveEvent):
         actor = self.layer_manager.subject_layer.subjects_index[event.subject_id]
 
-        new_world_position = self.layer_manager.grid_manager.get_pixel_position_of_grid_position(event.position)
+        new_world_position = self.layer_manager.grid_manager.get_pixel_position_of_grid_position(event.to_position)
         new_window_position = self.layer_manager.scrolling_manager.world_to_screen(*new_world_position)
 
         move_action = MoveTo(new_window_position, 0.5)
         actor.do(move_action)
         # TODO: values
         actor.do(Animate(ANIMATION_WALK, 0.5, 1))
+        actor.rotation = get_angle(event.from_position, event.to_position)

synergine2_xyz/move.py

@@ -73,7 +73,7 @@ class MoveToMechanism(SubjectMechanism):
                 found_path = find_path(self.simulation.graph, start, end)
                 move.path = []
 
-                for position in found_path[0]:
+                for position in found_path[0][1:]:
                     x, y = map(int, position.split('.'))
                     move.path.append((x, y))
 
@@ -105,10 +105,18 @@ class MoveToMechanism(SubjectMechanism):
 
 
 class MoveEvent(Event):
-    def __init__(self, subject_id: int, position: tuple, *args, **kwargs):
+    def __init__(
+        self,
+        subject_id: int,
+        from_position: typing.Tuple[int, int],
+        to_position: typing.Tuple[int, int],
+        *args,
+        **kwargs
+    ):
         super().__init__(*args, **kwargs)
         self.subject_id = subject_id
-        self.position = position
+        self.from_position = from_position
+        self.to_position = to_position
 
     def repr_debug(self) -> str:
         return '{}: subject_id:{}, position:{}'.format(
@@ -147,9 +155,10 @@ class MoveToBehaviour(SubjectBehaviour):
             # TODO: fin de path
             move.path_progression += 1
             new_position = move.path[move.path_progression]
+            previous_position = self.subject.position
             self.subject.position = new_position
 
-            return [MoveEvent(self.subject.id, new_position)]
+            return [MoveEvent(self.subject.id, previous_position, new_position)]
 
         except KeyError:
             # TODO: log ? Il devrait y avoir un move puisque data du run/mechanism !

synergine2_xyz/utils.py

@@ -1,7 +1,10 @@
 # coding: utf-8
 import collections
+import typing
 from math import sqrt
 
+import numpy
+
 from synergine2_xyz.xyz import DIRECTION_MODIFIERS
 
 
@@ -215,3 +218,13 @@ def get_position_for_direction(from_position: tuple, direction: int) -> tuple:
         from_position[1] + modifier[1],
         from_position[2] + modifier[2],
     )
+
+
+def get_angle(a: typing.Tuple[int, int], b: typing.Tuple[int, int]) -> int:
+    b = (b[0] - a[0], b[1] - a[1])
+    a = 0, 1
+
+    ang1 = numpy.arctan2(*a[::-1])
+    ang2 = numpy.arctan2(*b[::-1])
+
+    return numpy.rad2deg((ang1 - ang2) % (2 * numpy.pi))