Add Interior management (back only)

opencc/maps/003/terrain.tsx

@@ -18,6 +18,7 @@
    <property name="opacity" type="float" value="100.0"/>
    <property name="height" type="float" value="2.0"/>
   </properties>
+ </tile>
  <tile id="2">
   <properties>
    <property name="name" type="str" value="Bitume"/>

opencc/simulation/interior.py

@@ -0,0 +1,89 @@
+# coding: utf-8
+import typing
+
+from synergine2_xyz.map import TMXMap
+from synergine2_xyz.utils import get_direct_around_positions_of_position
+
+
+class InteriorMapConfiguration(object):
+    def __init__(
+        self,
+        layer_name: str='interiors',
+        exterior_id: str='ext',
+        interior_id: str='int',
+        separator_id: str='sep',
+    ) -> None:
+        self.layer_name = layer_name
+        self.exterior_id = exterior_id
+        self.interior_id = interior_id
+        self.separator_id = separator_id
+
+
+class InteriorManager(object):
+    def __init__(
+        self,
+        map_: TMXMap,
+        configuration: InteriorMapConfiguration=None,
+    ) -> None:
+        self.interiors = []
+        self.map = map_
+        self.configuration = configuration or InteriorMapConfiguration()
+        self.interiors = self._compute_interiors()
+
+    def _compute_interiors(self) -> typing.List[typing.List[typing.Tuple[int, int]]]:
+        interiors = []
+        layer_tiles = self.map.layer_tiles(self.configuration.layer_name)
+        for tile_xy, tile in layer_tiles.items():
+
+            if tile.property('id') == self.configuration.interior_id:
+                x, y = map(int, tile_xy.split('.'))
+                if not any([(x, y) in i for i in interiors]):
+                    new_interior = [(x, y)]
+                    positions_to_parse = []
+                    possible_positions_xyz = get_direct_around_positions_of_position((x, y, 0))
+                    possible_positions_xy = [(p[0], p[1]) for p in possible_positions_xyz]
+                    positions_to_parse.extend(possible_positions_xy)
+
+                    for possible_position_xyz in positions_to_parse:
+                        test_tile = None
+                        new_tile_x = possible_position_xyz[0]
+                        new_tile_y = possible_position_xyz[1]
+                        possible_position_key = '{}.{}'.format(new_tile_x, new_tile_y)
+
+                        if (new_tile_x, new_tile_y) in new_interior:
+                            continue
+
+                        try:
+                            test_tile = layer_tiles[possible_position_key]
+                        except KeyError:
+                            continue
+
+                        if test_tile.property('id') not in [
+                            self.configuration.interior_id,
+                            self.configuration.separator_id,
+                        ]:
+                            continue
+
+                        new_interior.append((new_tile_x, new_tile_y))
+
+                        if not test_tile.property('id') == self.configuration.separator_id:
+                            new_position_neighbour = get_direct_around_positions_of_position((new_tile_x, new_tile_y, 0))
+                            positions_to_parse.extend(new_position_neighbour)
+
+                    interiors.append(new_interior)
+
+        return interiors
+
+    def get_interiors(
+        self,
+        where_positions: typing.List[typing.Tuple[int, int]]=None,
+    ) -> typing.List[typing.List[typing.Tuple[int, int]]]:
+        if not where_positions:
+            return self.interiors
+        interiors = []
+
+        for interior in self.interiors:
+            for where_position in where_positions:
+                if where_position in interior and interior not in interiors:
+                    interiors.append(interior)
+        return interiors

requirements.txt

@@ -13,5 +13,6 @@ PyYAML==3.12
 redis==2.10.6
 six==1.11.0
 tmx==1.9.1
+pytest
 git+https://github.com/buxx/synergine2.git@master
 git+https://github.com/buxx/cocos.git@tileset

tests/__init__.py

@@ -0,0 +1 @@
+# coding: utf-8

tests/fixtures/__init__.py

@@ -0,0 +1 @@
+# coding: utf-8

tests/fixtures/interiors.tsx

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset name="interiors" tilewidth="8" tileheight="8" spacing="1" tilecount="49" columns="7">
+ <image source="interiors.png" width="64" height="64"/>
+ <tile id="0">
+  <properties>
+   <property name="name" type="str" value="Exterior"/>
+   <property name="id" type="str" value="ext"/>
+  </properties>
+ </tile>
+ <tile id="1">
+  <properties>
+   <property name="name" type="str" value="interior"/>
+   <property name="id" type="str" value="int"/>
+  </properties>
+ </tile>
+ <tile id="2">
+  <properties>
+   <property name="name" type="str" value="separator"/>
+   <property name="id" type="str" value="sep"/>
+  </properties>
+ </tile>
+</tileset>

tests/fixtures/one_interior.tmx

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="2017.07.26" orientation="orthogonal" renderorder="left-up" width="5" height="5" tilewidth="8" tileheight="8" nextobjectid="1">
+ <tileset firstgid="1" source="interiors.tsx"/>
+ <layer name="interiors" width="5" height="5">
+  <data encoding="csv">
+0,0,0,0,0,
+0,2,2,2,0,
+0,2,2,2,0,
+0,2,2,2,0,
+0,0,0,0,0
+</data>
+ </layer>
+</map>

tests/fixtures/side_by_side_interiors.tmx

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="2017.07.26" orientation="orthogonal" renderorder="left-up" width="5" height="5" tilewidth="8" tileheight="8" nextobjectid="1">
+ <tileset firstgid="1" source="interiors.tsx"/>
+ <layer name="interiors" width="5" height="5">
+  <data encoding="csv">
+0,0,0,0,0,
+2,2,3,2,2,
+2,2,3,2,2,
+2,2,3,2,2,
+0,0,0,0,0
+</data>
+ </layer>
+</map>

tests/fixtures/two_interiors.tmx

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="2017.07.26" orientation="orthogonal" renderorder="left-up" width="5" height="5" tilewidth="8" tileheight="8" nextobjectid="1">
+ <tileset firstgid="1" source="interiors.tsx"/>
+ <layer name="interiors" width="5" height="5">
+  <data encoding="csv">
+0,0,0,0,0,
+2,2,1,2,2,
+2,2,1,2,2,
+2,2,1,2,2,
+0,0,0,0,0
+</data>
+ </layer>
+</map>

tests/gui/__init__.py

@@ -0,0 +1 @@
+# coding: utf-8

tests/gui/test_interiors.py

@@ -0,0 +1,130 @@
+# coding: utf-8
+from synergine2_xyz.map import TMXMap
+
+from opencc.simulation.interior import InteriorManager
+
+
+def test_interior_zones__one_zone():
+    map_ = TMXMap('tests/fixtures/one_interior.tmx')
+    manager = InteriorManager(map_)
+    interiors = manager.get_interiors()
+
+    assert interiors
+    assert isinstance(interiors, list)
+    assert 1 == len(interiors)
+
+    assert (1, 1) in interiors[0]
+    assert (1, 2) in interiors[0]
+    assert (1, 3) in interiors[0]
+    assert (2, 1) in interiors[0]
+    assert (2, 2) in interiors[0]
+    assert (2, 3) in interiors[0]
+    assert (3, 1) in interiors[0]
+    assert (3, 2) in interiors[0]
+    assert (3, 3) in interiors[0]
+    assert 9 == len(interiors[0])
+
+
+def test_interior_zones__two_separated_zones():
+    map_ = TMXMap('tests/fixtures/two_interiors.tmx')
+    manager = InteriorManager(map_)
+    interiors = sorted(manager.get_interiors())
+
+    assert interiors
+    assert isinstance(interiors, list)
+    assert 2 == len(interiors)
+
+    assert (0, 1) in interiors[0]
+    assert (1, 1) in interiors[0]
+    assert (0, 2) in interiors[0]
+    assert (1, 2) in interiors[0]
+    assert (0, 3) in interiors[0]
+    assert (1, 3) in interiors[0]
+    assert 6 == len(interiors[0])
+
+    assert (3, 1) in interiors[1]
+    assert (4, 1) in interiors[1]
+    assert (3, 2) in interiors[1]
+    assert (4, 2) in interiors[1]
+    assert (3, 3) in interiors[1]
+    assert (4, 3) in interiors[1]
+    assert 6 == len(interiors[1])
+
+
+def test_interiors_zones__side_by_side_zones_with_separator():
+    map_ = TMXMap('tests/fixtures/side_by_side_interiors.tmx')
+    manager = InteriorManager(map_)
+    interiors = sorted(manager.get_interiors())
+
+    assert interiors
+    assert isinstance(interiors, list)
+    assert 2 == len(interiors)
+
+    assert (0, 1) in interiors[0]
+    assert (1, 1) in interiors[0]
+    assert (0, 2) in interiors[0]
+    assert (1, 2) in interiors[0]
+    assert (0, 3) in interiors[0]
+    assert (1, 3) in interiors[0]
+    assert (2, 1) in interiors[0]
+    assert (2, 2) in interiors[0]
+    assert (2, 3) in interiors[0]
+    assert 9 == len(interiors[0])
+
+    assert (2, 1) in interiors[1]
+    assert (2, 2) in interiors[1]
+    assert (2, 3) in interiors[1]
+    assert (3, 1) in interiors[1]
+    assert (4, 1) in interiors[1]
+    assert (3, 2) in interiors[1]
+    assert (4, 2) in interiors[1]
+    assert (3, 3) in interiors[1]
+    assert (4, 3) in interiors[1]
+    assert 9 == len(interiors[1])
+
+
+def test_interiors_zones__active_zones():
+    # active zones are zone where someone is in
+    map_ = TMXMap('tests/fixtures/two_interiors.tmx')
+    manager = InteriorManager(map_)
+
+    interiors = manager.get_interiors(where_positions=[(0, 1)])
+
+    assert (0, 1) in interiors[0]
+    assert (1, 1) in interiors[0]
+    assert (0, 2) in interiors[0]
+    assert (1, 2) in interiors[0]
+    assert (0, 3) in interiors[0]
+    assert (1, 3) in interiors[0]
+    assert 6 == len(interiors[0])
+
+    interiors = manager.get_interiors(where_positions=[(4, 2)])
+
+    assert 1 == len(interiors)
+    assert (3, 1) in interiors[0]
+    assert (4, 1) in interiors[0]
+    assert (3, 2) in interiors[0]
+    assert (4, 2) in interiors[0]
+    assert (3, 3) in interiors[0]
+    assert (4, 3) in interiors[0]
+    assert 6 == len(interiors[0])
+
+    interiors = manager.get_interiors(where_positions=[(0, 1), (4, 2)])
+
+    assert 2 == len(interiors)
+
+    assert (0, 1) in interiors[0]
+    assert (1, 1) in interiors[0]
+    assert (0, 2) in interiors[0]
+    assert (1, 2) in interiors[0]
+    assert (0, 3) in interiors[0]
+    assert (1, 3) in interiors[0]
+    assert 6 == len(interiors[0])
+
+    assert (3, 1) in interiors[1]
+    assert (4, 1) in interiors[1]
+    assert (3, 2) in interiors[1]
+    assert (4, 2) in interiors[1]
+    assert (3, 3) in interiors[1]
+    assert (4, 3) in interiors[1]
+    assert 6 == len(interiors[1])