refact user interaction

sandbox/tile/gui/base.py

@@ -1,26 +1,23 @@
 # coding: utf-8
+
 from pyglet.window import key
-from cocos.actions import MoveTo as BaseMoveTo
-from sandbox.tile.gui.move import MoveActorInteraction
-from sandbox.tile.gui.move import MoveFastActorInteraction
-from sandbox.tile.gui.move import MoveCrawlActorInteraction
-from synergine2_cocos2d.layer import LayerManager
-from synergine2_xyz.move.simulation import FinishMoveEvent
-from synergine2_xyz.move.simulation import StartMoveEvent
 
-from synergine2_xyz.utils import get_angle
+from cocos.actions import MoveTo as BaseMoveTo
+from sandbox.tile.user_action import UserAction
 from synergine2.config import Config
 from synergine2.log import SynergineLogger
 from synergine2.terminals import Terminal
-from synergine2_cocos2d.gui import TMXGui
-from synergine2_cocos2d.gui import EditLayer as BaseEditLayer
 from synergine2_cocos2d.actions import MoveTo
-from synergine2_cocos2d.animation import Animate
 # TODO NOW: MOVE
 from synergine2_cocos2d.animation import ANIMATION_CRAWL
 from synergine2_cocos2d.animation import ANIMATION_WALK
-
-from sandbox.tile.user_action import UserAction
+from synergine2_cocos2d.animation import Animate
+from synergine2_cocos2d.gui import EditLayer as BaseEditLayer
+from synergine2_cocos2d.gui import TMXGui
+from synergine2_cocos2d.layer import LayerManager
+from synergine2_xyz.move.simulation import FinishMoveEvent
+from synergine2_xyz.move.simulation import StartMoveEvent
+from synergine2_xyz.utils import get_angle
 
 
 class EditLayer(BaseEditLayer):
@@ -73,6 +70,11 @@ class Game(TMXGui):
         self.move_crawl_duration_ref = float(self.config.resolve('game.move.crawl_ref_time'))
 
     def before_run(self) -> None:
+        from sandbox.tile.gui.move import MoveActorInteraction
+        from sandbox.tile.gui.move import MoveFastActorInteraction
+        from sandbox.tile.gui.move import MoveCrawlActorInteraction
+        from sandbox.tile.gui.fire import FireActorInteraction
+
         self.layer_manager.interaction_manager.register(MoveActorInteraction, self.layer_manager)
         self.layer_manager.interaction_manager.register(MoveFastActorInteraction, self.layer_manager)
         self.layer_manager.interaction_manager.register(MoveCrawlActorInteraction, self.layer_manager)

sandbox/tile/gui/move.py

@@ -1,12 +1,15 @@
 # coding: utf-8
+import typing
+
+from synergine2_cocos2d.interaction import BaseActorInteraction
 from sandbox.tile.user_action import UserAction
-from synergine2.terminals import TerminalPackage
+from synergine2.simulation import SimulationBehaviour
+from synergine2_cocos2d.actor import Actor
 from synergine2_cocos2d.gl import draw_line
-from synergine2_cocos2d.interaction import Interaction
 from synergine2_xyz.move.simulation import RequestMoveBehaviour
 
 
-class BaseMoveActorInteraction(Interaction):
+class BaseMoveActorInteraction(BaseActorInteraction):
     gui_action = None
     color = None
     request_move_behaviour_class = RequestMoveBehaviour
@@ -22,27 +25,12 @@ class BaseMoveActorInteraction(Interaction):
                 self.color,
             )
 
-    def get_package_for_terminal(self) -> TerminalPackage:
-        # TODO: FinishMoveEvent ?
-        actions = []
-        mouse_grid_position = self.layer_manager.grid_manager.get_grid_position(
-            self.layer_manager.scrolling_manager.screen_to_world(
-                *self.layer_manager.edit_layer.screen_mouse,
-            )
-        )
-
-        for actor in self.layer_manager.edit_layer.selection:
-            actions.append((
-                self.request_move_behaviour_class, {
-                    'subject_id': actor.subject.id,
-                    'move_to': mouse_grid_position,
-                    'gui_action': self.gui_action,
-                }
-            ))
-
-        return TerminalPackage(
-            simulation_actions=actions,
-        )
+    def get_behaviour(self, actor: Actor, mouse_grid_position) -> typing.Tuple[typing.Type[SimulationBehaviour], dict]:
+        return self.request_move_behaviour_class, {
+            'subject_id': actor.subject.id,
+            'move_to': mouse_grid_position,
+            'gui_action': self.gui_action,
+        }
 
 
 class MoveActorInteraction(BaseMoveActorInteraction):

synergine2_cocos2d/interaction.py

@@ -3,9 +3,12 @@ import typing
 
 from synergine2.config import Config
 from synergine2.log import SynergineLogger
+from synergine2.simulation import SimulationBehaviour
 from synergine2.terminals import Terminal
 from synergine2.terminals import TerminalPackage
+from synergine2_cocos2d.actor import Actor
 from synergine2_cocos2d.exception import InteractionNotFound
+from synergine2_cocos2d.gl import draw_line
 from synergine2_cocos2d.layer import LayerManager
 from synergine2_cocos2d.user_action import UserAction
 
@@ -65,3 +68,38 @@ class Interaction(object):
 
     def get_package_for_terminal(self) -> TerminalPackage:
         raise NotImplementedError()
+
+
+class BaseActorInteraction(Interaction):
+    gui_action = None
+    color = None
+
+    def draw_pending(self) -> None:
+        for actor in self.layer_manager.edit_layer.selection:
+            grid_position = self.layer_manager.grid_manager.get_grid_position(actor.position)
+            pixel_position = self.layer_manager.grid_manager.get_pixel_position_of_grid_position(grid_position)
+
+            draw_line(
+                self.layer_manager.scrolling_manager.world_to_screen(*pixel_position),
+                self.layer_manager.edit_layer.screen_mouse,
+                self.color,
+            )
+
+    def get_package_for_terminal(self) -> TerminalPackage:
+        actions = []
+        mouse_grid_position = self.layer_manager.grid_manager.get_grid_position(
+            self.layer_manager.scrolling_manager.screen_to_world(
+                *self.layer_manager.edit_layer.screen_mouse,
+            )
+        )
+
+        for actor in self.layer_manager.edit_layer.selection:
+            behaviour_class, behaviour_data = self.get_behaviour(actor, mouse_grid_position)
+            actions.append((behaviour_class, behaviour_data))
+
+        return TerminalPackage(
+            simulation_actions=actions,
+        )
+
+    def get_behaviour(self, actor: Actor, mouse_grid_position) -> typing.Tuple[typing.Type[SimulationBehaviour], dict]:
+        raise NotImplementedError()