engulf: cel movement

requirements.txt

@@ -1,5 +1,11 @@
+appdirs==1.4.2
 cocos2d==0.6.4
+packaging==16.8
+pkg-resources==0.0.0
 py==1.4.31
 pyglet==1.2.4
+pymlconf==0.7.0
+pyparsing==2.1.10
 pytest==3.0.4
+PyYAML==3.12
 six==1.10.0

sandbox/engulf/behaviour.py

@@ -1,8 +1,12 @@
 # coding: utf-8
+from random import randint
+
+from sandbox.engulf.const import COLLECTION_GRASS
 from synergine2.simulation import SubjectBehaviour, SimulationMechanism, SimulationBehaviour
 from synergine2.simulation import Event
 from synergine2.utils import ChunkManager
-from synergine2.xyz_utils import get_around_positions_of_positions
+from synergine2.xyz import ProximitySubjectMechanism
+from synergine2.xyz_utils import get_around_positions_of_positions, get_around_positions_of
 
 
 class GrassGrownUp(Event):
@@ -115,3 +119,58 @@ class GrassSpawnBehaviour(SimulationBehaviour):
                 ))
 
         return events
+
+
+class EatableDirectProximityMechanism(ProximitySubjectMechanism):
+    distance = 1.41  # distance when on angle
+    feel_collections = [COLLECTION_GRASS]
+
+
+class MoveTo(Event):
+    def __init__(self, subject_id: int, position: tuple, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.subject_id = subject_id
+        self.position = position
+
+    def repr_debug(self) -> str:
+        return '{}: subject_id:{}, position:{}'.format(
+            type(self).__name__,
+            self.subject_id,
+            self.position,
+        )
+
+
+class SearchFood(SubjectBehaviour):
+    """
+    Si une nourriture a une case de distance et cellule non rassasié, move dans sa direction.
+    """
+    use = [EatableDirectProximityMechanism]
+
+    def run(self, data):
+        pass
+
+
+class Eat(SubjectBehaviour):
+    """
+    Prduit un immobilisme si sur une case de nourriture, dans le cas ou la cellule n'est as rassasié.
+    """
+    def run(self, data):
+        pass
+
+
+class Explore(SubjectBehaviour):
+    """
+    Produit un mouvement au hasard (ou un immobilisme)
+    """
+    use = []
+
+    def action(self, data) -> [Event]:
+        position = self.get_random_around_position()
+        return [MoveTo(self.subject.id, position)]
+
+    def run(self, data):
+        return True  # for now, want move every time
+
+    def get_random_around_position(self):
+        around_positions = get_around_positions_of(self.subject.position)
+        return around_positions[randint(0, len(around_positions)-1)]

sandbox/engulf/config.yaml

@@ -0,0 +1,4 @@
+core:
+    cycle_duration: 0.5
+terminals:
+    sync: True

sandbox/engulf/const.py

@@ -0,0 +1,7 @@
+# coding: utf-8
+
+
+COLLECTION_CELL = 'CELL'
+COLLECTION_ALIVE = 'ALIVE'
+COLLECTION_EATABLE = 'EATABLE'
+COLLECTION_GRASS = 'GRASS'

sandbox/engulf/gui.py

@@ -2,31 +2,58 @@
 from random import randint
 
 import cocos
+from cocos.actions import MoveTo, Repeat, ScaleBy, Reverse, RotateTo
 from cocos.sprite import Sprite
-from sandbox.engulf.behaviour import GrassGrownUp, GrassSpawn
+from sandbox.engulf.behaviour import GrassGrownUp, GrassSpawn, MoveTo as MoveToEvent
 from sandbox.engulf.subject import Cell, Grass
 from synergine2.terminals import TerminalPackage
 from synergine2_cocos2d.gui import Gui, GridLayerMixin
 from synergine2_cocos2d.gui import MainLayer as BaseMainLayer
 
+cell_scale = ScaleBy(1.1, duration=0.25)
+
 
 class CellsLayer(GridLayerMixin, BaseMainLayer):
-    def __init__(self, *args, **kwargs):
+    def __init__(self, game: 'Game', *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.cells = {}
+        self.game = game
+        self.cell_positions = {}
+        self.cell_ids = {}
+
+    @property
+    def move_duration(self):
+        return self.game.cycle_duration
+
+    @property
+    def fake_move_rotate_duration(self):
+        return self.move_duration / 3
 
-    def born(self, grid_position):
+    def born(self, subject_id: int, grid_position):
         cell = Sprite('resources/cell.png')
         cell.rotation = randint(0, 360)
         self.grid_manager.scale_sprite(cell)
         self.grid_manager.position_sprite(cell, grid_position)
-        self.cells[grid_position] = cell
+        self.cell_positions[grid_position] = cell
+        self.cell_ids[subject_id] = cell
+        cell.do(Repeat(cell_scale + Reverse(cell_scale)))
         self.add(cell)
 
+    def move(self, subject_id: int, position: tuple):
+        cell = self.cell_ids[subject_id]
+
+        window_position = self.grid_manager.get_window_position(position[0], position[1])
+        move_action = MoveTo(window_position, self.move_duration)
+
+        fake_rotate = RotateTo(randint(0, 360), self.fake_move_rotate_duration)
+
+        cell.do(move_action)
+        cell.do(fake_rotate)
+
 
 class GrassLayer(GridLayerMixin, BaseMainLayer):
-    def __init__(self, *args, **kwargs):
+    def __init__(self, game: 'Game', *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.game = game
         self.grasses = {}
 
     def born(self, subject_id, grid_position, opacity=100):
@@ -43,13 +70,14 @@ class GrassLayer(GridLayerMixin, BaseMainLayer):
 
 
 class MainLayer(GridLayerMixin, BaseMainLayer):
-    def __init__(self, terminal, *args, **kwargs):
+    def __init__(self, game: 'Game', terminal, *args, **kwargs):
         super().__init__(terminal, *args, **kwargs)
+        self.game = game
 
-        self.cells = CellsLayer(terminal=terminal)
+        self.cells = CellsLayer(game=game, terminal=terminal)
         self.add(self.cells)
 
-        self.grasses = GrassLayer(terminal=terminal)
+        self.grasses = GrassLayer(game=game, terminal=terminal)
         self.add(self.grasses)
 
 
@@ -57,9 +85,10 @@ class Game(Gui):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.main_layer = MainLayer(terminal=self.terminal)
+        self.main_layer = MainLayer(game=self, terminal=self.terminal)
         self.main_scene = cocos.scene.Scene(self.main_layer)
 
+        # Event registering
         self.terminal.register_event_handler(
             GrassGrownUp,
             self.on_grass_grown_up,
@@ -68,6 +97,10 @@ class Game(Gui):
             GrassSpawn,
             self.on_grass_spawn,
         )
+        self.terminal.register_event_handler(
+            MoveToEvent,
+            self.on_move_to,
+        )
 
     def get_main_scene(self):
         return self.main_scene
@@ -76,7 +109,7 @@ class Game(Gui):
         if package.subjects:  # It's thirst package
             for subject in package.subjects:
                 if isinstance(subject, Cell):
-                    self.main_layer.cells.born(subject.position)
+                    self.main_layer.cells.born(subject.id, subject.position)
                 if isinstance(subject, Grass):
                     self.main_layer.grasses.born(
                         subject.id,
@@ -96,3 +129,9 @@ class Game(Gui):
             event.subject_id,
             event.density,  # TODO: Recupe ces données depuis local plutôt que event ?
         )
+
+    def on_move_to(self, event: MoveToEvent):
+        self.main_layer.cells.move(
+            event.subject_id,
+            event.position,
+        )

sandbox/engulf/run.py

@@ -27,11 +27,12 @@ synergine2_ath = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__
 sys.path.append(synergine2_ath)
 
 from random import randint, seed
-from sandbox.engulf.behaviour import GrassGrownUp, GrassSpawn, GrassSpawnBehaviour
+from sandbox.engulf.behaviour import GrassGrownUp, GrassSpawn, GrassSpawnBehaviour, MoveTo
 
 from synergine2.config import Config
 from synergine2.log import get_default_logger
-from sandbox.engulf.subject import Cell, Grass, COLLECTION_GRASS
+from sandbox.engulf.subject import Cell, Grass
+from sandbox.engulf.const import COLLECTION_GRASS
 from synergine2.core import Core
 from synergine2.cycle import CycleManager
 from synergine2.terminals import TerminalManager, Terminal, TerminalPackage
@@ -50,11 +51,13 @@ class GameTerminal(Terminal):
     subscribed_events = [
         GrassGrownUp,
         GrassSpawn,
+        MoveTo,
     ]
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.gui = None
+        self.asynchronous = False  # TODO: config
 
     def receive(self, package: TerminalPackage):
         self.gui.before_received(package)
@@ -63,7 +66,7 @@ class GameTerminal(Terminal):
 
     def run(self):
         from sandbox.engulf import gui
-        self.gui = gui.Game(self)
+        self.gui = gui.Game(self.config, self.logger, self)
         self.gui.run()
 
 
@@ -145,6 +148,7 @@ def main():
     simulation.subjects = subjects
 
     config = Config()
+    config.load_files(['sandbox/engulf/config.yaml'])
     logger = get_default_logger(level=logging.DEBUG)
 
     core = Core(
@@ -160,10 +164,12 @@ def main():
             config=config,
             logger=logger,
             terminals=[GameTerminal(
+                config,
+                logger,
                 asynchronous=False,
             )]
         ),
-        cycles_per_seconds=1,
+        cycles_per_seconds=1/config.core.cycle_duration,
     )
     core.run()
 

sandbox/engulf/subject.py

@@ -1,13 +1,9 @@
 # coding: utf-8
-from sandbox.engulf.behaviour import GrowUp
+from sandbox.engulf.behaviour import GrowUp, SearchFood, Eat, Explore
+from sandbox.engulf.const import COLLECTION_CELL, COLLECTION_ALIVE, COLLECTION_EATABLE, COLLECTION_GRASS
 from synergine2.simulation import Subject
 from synergine2.xyz import XYZSubjectMixin
 
-COLLECTION_CELL = 'CELL'
-COLLECTION_ALIVE = 'ALIVE'
-COLLECTION_EATABLE = 'EATABLE'
-COLLECTION_GRASS = 'GRASS'
-
 
 class Cell(XYZSubjectMixin, Subject):
     collections = [
@@ -15,6 +11,11 @@ class Cell(XYZSubjectMixin, Subject):
         COLLECTION_ALIVE,
         COLLECTION_EATABLE,
     ]
+    behaviours_classes = [
+        SearchFood,
+        Eat,
+        Explore,
+    ]
 
 
 class Grass(XYZSubjectMixin, Subject):

sandbox/life_game/gui.py

@@ -9,6 +9,8 @@ from random import randint
 from sandbox.life_game.simulation import CellBornEvent
 from sandbox.life_game.simulation import CellDieEvent, Cell, InvertCellStateBehaviour, \
     EmptyPositionWithLotOfCellAroundEvent
+from synergine2.config import Config
+from synergine2.log import SynergineLogger
 from synergine2.terminals import Terminal
 from synergine2.terminals import TerminalPackage
 from synergine2_cocos2d.gui import Gui, GridLayerMixin, MainLayer as BaseMainLayer
@@ -100,10 +102,12 @@ class MainLayer(GridLayerMixin, BaseMainLayer):
 class LifeGameGui(Gui):
     def __init__(
             self,
+            config: Config,
+            logger: SynergineLogger,
             terminal: Terminal,
             read_queue_interval: float=1 / 60.0,
     ):
-        super().__init__(terminal, read_queue_interval)
+        super().__init__(config, logger, terminal, read_queue_interval)
 
         self.main_layer = MainLayer(terminal=self.terminal)
         self.main_scene = cocos.scene.Scene(self.main_layer)

sandbox/life_game/run.py

@@ -34,8 +34,8 @@ class SimplePrintTerminal(Terminal):
         CellBornEvent,
     ]
 
-    def __init__(self):
-        super().__init__()
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         self._cycle_born_count = 0
         self._cycle_die_count = 0
         self.register_event_handler(CellDieEvent, self.record_die)
@@ -86,8 +86,8 @@ class CocosTerminal(Terminal):
         EmptyPositionWithLotOfCellAroundEvent,
     ]
 
-    def __init__(self):
-        super().__init__()
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         self.subjects = None
         self.gui = None
 
@@ -98,7 +98,7 @@ class CocosTerminal(Terminal):
 
     def run(self):
         from sandbox.life_game import gui
-        self.gui = gui.LifeGameGui(self)
+        self.gui = gui.LifeGameGui(self.config, self.logger, self)
         self.gui.run()
 
 
@@ -146,7 +146,10 @@ def main():
         terminal_manager=TerminalManager(
             config=config,
             logger=logger,
-            terminals=[CocosTerminal(), SimplePrintTerminal()]
+            terminals=[
+                CocosTerminal(config, logger),
+                SimplePrintTerminal(config, logger),
+            ]
         ),
     )
     core.run()

synergine2/config.py

@@ -1,5 +1,6 @@
 # coding: utf-8
+from pymlconf import ConfigManager
 
 
-class Config(dict):
+class Config(ConfigManager):
     pass

synergine2/terminals.py

@@ -59,7 +59,14 @@ class Terminal(object):
     # who are not instance of listed classes
     subscribed_events = [Event]
 
-    def __init__(self, asynchronous: bool=True):
+    def __init__(
+        self,
+        config: Config,
+        logger: SynergineLogger,
+        asynchronous: bool=True,
+    ):
+        self.config = config
+        self.logger = logger
         self._input_queue = None
         self._output_queue = None
         self._stop_required = False

synergine2_cocos2d/gui.py

@@ -6,6 +6,8 @@ from cocos.director import director
 from cocos.layer import ScrollableLayer, Layer
 from cocos.sprite import Sprite
 
+from synergine2.config import Config
+from synergine2.log import SynergineLogger
 from synergine2.terminals import Terminal
 from synergine2.terminals import TerminalPackage
 
@@ -106,11 +108,16 @@ class MainLayer(ScrollableLayer):
 class Gui(object):
     def __init__(
             self,
+            config: Config,
+            logger: SynergineLogger,
             terminal: Terminal,
             read_queue_interval: float= 1/60.0,
     ):
+        self.config = config
+        self.logger = logger,
         self._read_queue_interval = read_queue_interval
         self.terminal = terminal
+        self.cycle_duration = self.config.core.cycle_duration
         cocos.director.director.init()
 
     def run(self):