draw interiors

config.yaml

@@ -13,5 +13,5 @@ game:
         run_ref_time: 1
         crawl_ref_time: 10
 global:
-    logging_level: DEBUG
-    debug: true
+    logging_level: ERROR
+    debug: false

opencc/gui/base.py

@@ -1,13 +1,21 @@
 # coding: utf-8
+import io
 import os
 import random
 import typing
 
 import pyglet
+import time
+
+import tmx
+from PIL import Image
 from pyglet.window import key
 
 from cocos.actions import MoveTo as BaseMoveTo
 from cocos.audio.pygame.mixer import Sound
+
+from opencc.simulation.interior import InteriorManager
+from opencc.simulation.tmx import TileMap
 from opencc.user_action import UserAction
 from synergine2.config import Config
 from synergine2.log import SynergineLogger
@@ -34,6 +42,11 @@ class EditLayer(BaseEditLayer):
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
 
+        # TODO BS 20171213: Into other layer !
+        self.last_interior_draw = 0
+        # FIXME BS: hardcoded (move into other layer)
+        self.interior_manager = InteriorManager(TileMap('opencc/maps/003/003.tmx'))
+
     def _on_key_press(self, k, m):
         if self.selection:
             if k == key.M:
@@ -45,6 +58,34 @@ class EditLayer(BaseEditLayer):
             if k == key.F:
                 self.user_action_pending = UserAction.ORDER_FIRE
 
+    def draw(self) -> None:
+        super().draw()
+        self.draw_interiors()
+
+    def draw_interiors(self):
+        # TODO BS 20171213: Into other layer !
+        now = time.time()
+        # FIXME: config
+        if now - self.last_interior_draw > 2:
+            self.last_interior_draw = now
+            subject_grid_positions = [
+                a.subject.position for a
+                in self.layer_manager.subject_layer.subjects_index.values()
+            ]
+            interiors = self.interior_manager.get_interiors(where_positions=subject_grid_positions)
+
+            if interiors:
+                # FIXME: hardcoded
+                image = Image.open('opencc/maps/003/background.png')
+                image_fake_file = io.BytesIO()
+                # FIXME: tile height/width !
+                self.interior_manager.update_image_for_interiors(image, interiors, 8, 8)
+                image.save(image_fake_file, format='PNG')
+                self.layer_manager.background_sprite.image = pyglet.image.load(
+                    'new_background.png',
+                    file=image_fake_file,
+                )
+
 
 class TileLayerManager(LayerManager):
     edit_layer_class = EditLayer

opencc/simulation/interior.py

@@ -36,6 +36,8 @@ class InteriorManager(object):
         layer_tiles = self.map.layer_tiles(self.configuration.layer_name)
         for tile_xy, tile in layer_tiles.items():
 
+            # FIXME: on se retrouve avec des tuiles Grass la ou l'on a pas mis de tuile interior/exterior.
+            # Faut pouvoir dire c'est tel tile la tile par defaut de tel layer
             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]):
@@ -77,9 +79,9 @@ class InteriorManager(object):
 
     def get_interiors(
         self,
-        where_positions: typing.List[typing.Tuple[int, int]]=None,
+        where_positions: typing.Iterable[typing.Tuple[int, int]]=None,
     ) -> typing.List[typing.List[typing.Tuple[int, int]]]:
-        if not where_positions:
+        if where_positions is None:
             return self.interiors
         interiors = []
 
@@ -95,6 +97,7 @@ class InteriorManager(object):
         interiors: typing.List[typing.List[typing.Tuple[int, int]]],
         tile_width: int,
         tile_height: int,
+        invert_y: bool=True,
     ) -> None:
         # TODO BS 20171213: Optimization can be done: keep in cache modifications on image instead change it entirely
         pixels = image.load()
@@ -105,4 +108,9 @@ class InteriorManager(object):
                 start_y = tile_y * tile_height
                 for x in range(start_x, start_x+tile_width):
                     for y in range(start_y, start_y+tile_height):
-                        pixels[x, y] = (0, 0, 0, 0)
+
+                        real_y = y
+                        if invert_y:
+                            real_y = image.height - 1 - y
+
+                        pixels[x, real_y] = (0, 0, 0, 0)

opencc/simulation/tmx.py

@@ -11,6 +11,10 @@ class TerrainTile(XYZTile):
 
 class TileMap(TMXMap):
     xyz_tile_class = TerrainTile
+    default_layer_tilesets = {
+        'interiors': 'interiors',
+        'terrain': 'terrain',
+    }
 
     def get_default_tileset(self) -> tmx.Tileset:
         return self.tmx_tilesets['terrain']

tests/fixtures/corner_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,1,0,
+0,2,1,1,0,
+0,1,1,1,0,
+0,0,0,0,0
+</data>
+ </layer>
+</map>

tests/gui/test_interiors.py

@@ -141,3 +141,25 @@ def test_interiors_zones__make_image_transparent__just_replace():
 
     manager.update_image_for_interiors(image, interiors, 8, 8)
     assert after_image_bytes == image.tobytes()
+
+
+def test_interiors_zones__make_image_complex_transparent__just_replace():
+    map_ = TMXMap('tests/fixtures/one_interior.tmx')
+    manager = InteriorManager(map_)
+    interiors = manager.get_interiors()
+    image = Image.open('tests/fixtures/complex_40x40.png')
+    after_image_bytes = Image.open('tests/fixtures/complex_one_interior_40x40.png').tobytes()
+
+    manager.update_image_for_interiors(image, interiors, 8, 8)
+    assert after_image_bytes == image.tobytes()
+
+
+def test_interiors_zones__make_image_corner_transparent__just_replace():
+    map_ = TMXMap('tests/fixtures/corner_interior.tmx')
+    manager = InteriorManager(map_)
+    interiors = manager.get_interiors()
+    image = Image.open('tests/fixtures/white_40x40.png')
+    after_image_bytes = Image.open('tests/fixtures/white_corner_interior_40x40.png').tobytes()
+
+    manager.update_image_for_interiors(image, interiors, 8, 8)
+    assert after_image_bytes == image.tobytes()