DEV

synergine2_cocos2d/actor.py

@@ -7,7 +7,6 @@ import cocos
 from cocos import collision_model
 from cocos import euclid
 from synergine2_cocos2d.animation import AnimatedInterface
-from synergine2_cocos2d.layer import LayerManager
 
 
 class Actor(AnimatedInterface, cocos.sprite.Sprite):
@@ -47,10 +46,11 @@ class Actor(AnimatedInterface, cocos.sprite.Sprite):
             self.width // 2,
             self.height // 2,
         )
+        self.need_update_cshape = False
 
     def update_position(self, new_position: euclid.Vector2) -> None:
         self.position = new_position
-        self.cshape.center = new_position
+        self.cshape.center = new_position  # Note: if remove: strange behaviour: drag change actor position with anomaly
 
     def build_animation_images(self) -> None:
         """

synergine2_cocos2d/exception.py

@@ -0,0 +1,13 @@
+# coding: utf-8
+
+
+class WorldException(Exception):
+    pass
+
+
+class PositionException(WorldException):
+    pass
+
+
+class OuterWorldPosition(PositionException):
+    pass

synergine2_cocos2d/gui.py

@@ -1,5 +1,7 @@
 # coding: utf-8
+import typing
 import weakref
+from math import floor
 
 import pyglet
 from pyglet.window import mouse
@@ -16,65 +18,98 @@ from synergine2.log import SynergineLogger
 from synergine2.terminals import Terminal
 from synergine2.terminals import TerminalPackage
 from synergine2_cocos2d.actor import Actor
+from synergine2_cocos2d.exception import OuterWorldPosition
 from synergine2_cocos2d.layer import LayerManager
 from synergine2_cocos2d.middleware import TMXMiddleware
 
 
+# class GridManager(object):
+#     def __init__(
+#         self,
+#         layer: Layer,
+#         square_width: int,
+#         border: int=0,
+#     ):
+#         self.layer = layer
+#         self.square_width = square_width
+#         self.border = border
+#
+#     @property
+#     def final_width(self):
+#         return self.square_width + self.border
+#
+#     def scale_sprite(self, sprite: Sprite):
+#         sprite.scale_x = self.final_width / sprite.image.width
+#         sprite.scale_y = self.final_width / sprite.image.height
+#
+#     def position_sprite(self, sprite: Sprite, grid_position):
+#         grid_x = grid_position[0]
+#         grid_y = grid_position[1]
+#         sprite.position = grid_x * self.final_width, grid_y * self.final_width
+#
+#     def get_window_position(self, grid_position_x, grid_position_y):
+#         grid_x = grid_position_x
+#         grid_y = grid_position_y
+#         return grid_x * self.final_width, grid_y * self.final_width
+#
+#     def get_grid_position(self, window_x, window_y, z=0) -> tuple:
+#         window_size = director.get_window_size()
+#
+#         window_center_x = window_size[0] // 2
+#         window_center_y = window_size[1] // 2
+#
+#         window_relative_x = window_x - window_center_x
+#         window_relative_y = window_y - window_center_y
+#
+#         real_width = self.final_width * self.layer.scale
+#
+#         return int(window_relative_x // real_width),\
+#                int(window_relative_y // real_width),\
+#                z
+#
+#
+# class GridLayerMixin(object):
+#     def __init__(self, *args, **kwargs):
+#         square_width = kwargs.pop('square_width', 32)
+#         square_border = kwargs.pop('square_border', 2)
+#         self.grid_manager = GridManager(
+#             self,
+#             square_width=square_width,
+#             border=square_border,
+#         )
+#         super().__init__(*args, **kwargs)
+
+
 class GridManager(object):
     def __init__(
         self,
-        layer: Layer,
-        square_width: int,
-        border: int=0,
-    ):
-        self.layer = layer
-        self.square_width = square_width
-        self.border = border
-
-    @property
-    def final_width(self):
-        return self.square_width + self.border
-
-    def scale_sprite(self, sprite: Sprite):
-        sprite.scale_x = self.final_width / sprite.image.width
-        sprite.scale_y = self.final_width / sprite.image.height
-
-    def position_sprite(self, sprite: Sprite, grid_position):
-        grid_x = grid_position[0]
-        grid_y = grid_position[1]
-        sprite.position = grid_x * self.final_width, grid_y * self.final_width
-
-    def get_window_position(self, grid_position_x, grid_position_y):
-        grid_x = grid_position_x
-        grid_y = grid_position_y
-        return grid_x * self.final_width, grid_y * self.final_width
-
-    def get_grid_position(self, window_x, window_y, z=0) -> tuple:
-        window_size = director.get_window_size()
-
-        window_center_x = window_size[0] // 2
-        window_center_y = window_size[1] // 2
+        cell_width: int,
+        cell_height: int,
+        world_width: int,
+        world_height: int,
+    ) -> None:
+        self.cell_width = cell_width
+        self.cell_height = cell_height
+        self.world_width = world_width
+        self.world_height = world_height
 
-        window_relative_x = window_x - window_center_x
-        window_relative_y = window_y - window_center_y
+    def get_grid_position(self, pixel_position: typing.Tuple[int, int]) -> typing.Tuple[int, int]:
+        pixel_x, pixel_y = pixel_position
 
-        real_width = self.final_width * self.layer.scale
+        cell_x = int(floor(pixel_x / self.cell_width))
+        cell_y = int(floor(pixel_y / self.cell_height))
 
-        return int(window_relative_x // real_width),\
-               int(window_relative_y // real_width),\
-               z
+        if cell_x > self.world_width or cell_y > self.world_height or cell_x < 0 or cell_y < 0:
+            raise OuterWorldPosition('Position "{}" is outer world ({}x{})'.format(
+                (cell_x, cell_y),
+                self.world_width,
+                self.world_height,
+            ))
 
+        return cell_x, cell_y
 
-class GridLayerMixin(object):
-    def __init__(self, *args, **kwargs):
-        square_width = kwargs.pop('square_width', 32)
-        square_border = kwargs.pop('square_border', 2)
-        self.grid_manager = GridManager(
-            self,
-            square_width=square_width,
-            border=square_border,
-        )
-        super().__init__(*args, **kwargs)
+    def get_pixel_position_of_grid_position(self, grid_position: typing.Tuple[int, int]) -> typing.Tuple[int, int]:
+        return grid_position[0] * self.cell_width, grid_position[1] * self.cell_height
 
 
 class MinMaxRect(cocos.cocosnode.CocosNode):
@@ -123,6 +158,7 @@ class EditLayer(cocos.layer.Layer):
         config: Config,
         logger: SynergineLogger,
         layer_manager: LayerManager,
+        grid_manager: GridManager,
         worldview,
         bindings=None,
         fastness=None,
@@ -135,11 +171,13 @@ class EditLayer(cocos.layer.Layer):
         mod_modify_selection=None,
         mod_restricted_mov=None,
     ):
+        # TODO: Clean init params
         super(EditLayer, self).__init__()
 
         self.config = config
         self.logger = logger
         self.layer_manager = layer_manager
+        self.grid_manager = grid_manager
 
         self.bindings = bindings
         buttons = {}
@@ -217,7 +255,6 @@ class EditLayer(cocos.layer.Layer):
                     self.collision_manager.remove_tricky(actor)
                     actor.update_cshape()
                     self.collision_manager.add(actor)
-                    actor.need_update_cshape = False
 
     def on_enter(self):
         super(EditLayer, self).on_enter()
@@ -265,8 +302,10 @@ class EditLayer(cocos.layer.Layer):
             for actor in self.selection:
                 old_pos = self.selection[actor].center
                 new_pos = old_pos + dpos
+                grid_pos = self.grid_manager.get_grid_position(new_pos)
+                grid_pixel_pos = self.grid_manager.get_pixel_position_of_grid_position(grid_pos)
                 # TODO: clamp new_pos so actor into world boundaries ?
-                actor.update_position(new_pos)
+                actor.update_position(grid_pixel_pos)
 
         scroller = self.weak_scroller()
 
@@ -541,6 +580,7 @@ class MainLayer(ScrollableLayer):
     def __init__(
         self,
         layer_manager: LayerManager,
+        grid_manager: GridManager,
         width: int,
         height: int,
         scroll_step: int=100,
@@ -548,7 +588,7 @@ class MainLayer(ScrollableLayer):
         super().__init__()
         self.layer_manager = layer_manager
         self.scroll_step = scroll_step
-        self.grid_manager = GridManager(self, 32, border=2)
+        self.grid_manager = grid_manager
 
         self.width = width
         self.height = height

synergine2_cocos2d/layer.py

@@ -9,6 +9,7 @@ from synergine2_cocos2d.middleware import MapMiddleware
 
 if False:
     from synergine2_cocos2d.actor import Actor
+    from synergine2_cocos2d.gui import GridManager
 
 
 class LayerManager(object):
@@ -22,6 +23,7 @@ class LayerManager(object):
         self.logger = logger
         self.middleware = middleware
 
+        self.grid_manager = None  # type: GridManager
         self.scrolling_manager = None  # type: cocos.layer.ScrollingManager
         self.main_scene = None  # type: cocos.scene.Scene
         self.main_layer = None  # type: cocos.layer.Layer
@@ -33,9 +35,18 @@ class LayerManager(object):
         self.top_layer = None  # type: cocos.tiles.RectMapLayer
 
     def init(self) -> None:
+        # TODO: cyclic import
         from synergine2_cocos2d.gui import MainLayer
         from synergine2_cocos2d.gui import EditLayer
-
+        from synergine2_cocos2d.gui import GridManager
+
+        # TODO: Values from tmx map
+        self.grid_manager = GridManager(
+            8,
+            8,
+            100,
+            100,
+        )
         self.middleware.init()
 
         self.main_scene = cocos.scene.Scene()
@@ -43,6 +54,7 @@ class LayerManager(object):
 
         self.main_layer = MainLayer(
             self,
+            self.grid_manager,
             **{
                 'width': 1200,  # Note: world size
                 'height': 1000,  # Note: world size
@@ -52,6 +64,7 @@ class LayerManager(object):
             self.config,
             self.logger,
             self,
+            self.grid_manager,
             self.main_layer,
             **{
                 'bindings': {