tilemap-editor 4.3.4__tar.gz → 4.3.5__tar.gz

{tilemap_editor-4.3.4/src/tilemap_editor.egg-info → tilemap_editor-4.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tilemap-editor
-Version: 4.3.4
+Version: 4.3.5
 Summary: Pygame tilemap editor with collision, animation, sprite & particle tools
 Author: tilemap editor contributors
 License: Proprietary
@@ -18,6 +18,15 @@ Dynamic: license-file
 
 `tilemap-editor` is a pygame-based map editor focused on fast iteration for 2D games.
 
+# tilemap-editor
+
+`tilemap-editor` is a Pygame-based map editor focused on fast iteration for 2D games.
+
+> **Credits:** The initial version of this project was based on DaFluffyPotato's platformer tutorial which is about 6-hours. If you want to understand the foundation this project started from, I highly recommend watching his video: https://www.youtube.com/watch?v=2gABYM5M0ww. While the editor has since evolved with many additional features and improvements, the original map format has been preserved for compatibility.
+
+Several features and design ideas were also inspired by the Godot Engine, including the animation workflow, polygon collision editing, and character collision (Sprite2D-style) editing.
+
+
 ## Installation
 
 [tilemap-editor on PyPI](https://pypi.org/project/tilemap-editor/)
@@ -55,3 +64,6 @@ if __name__ == "__main__":
     editor = Editor()
     editor.run()
 ```
+
+> [!WARNING]
+> The current release requires **Python 3.11+**. The documentation incorrectly lists Python 3.10 support due to an accidental dependency on `typing.NotRequired`. This will be fixed in a future update.

{tilemap_editor-4.3.4 → tilemap_editor-4.3.5}/README.md

@@ -2,6 +2,15 @@
 
 `tilemap-editor` is a pygame-based map editor focused on fast iteration for 2D games.
 
+# tilemap-editor
+
+`tilemap-editor` is a Pygame-based map editor focused on fast iteration for 2D games.
+
+> **Credits:** The initial version of this project was based on DaFluffyPotato's platformer tutorial which is about 6-hours. If you want to understand the foundation this project started from, I highly recommend watching his video: https://www.youtube.com/watch?v=2gABYM5M0ww. While the editor has since evolved with many additional features and improvements, the original map format has been preserved for compatibility.
+
+Several features and design ideas were also inspired by the Godot Engine, including the animation workflow, polygon collision editing, and character collision (Sprite2D-style) editing.
+
+
 ## Installation
 
 [tilemap-editor on PyPI](https://pypi.org/project/tilemap-editor/)
@@ -39,3 +48,6 @@ if __name__ == "__main__":
     editor = Editor()
     editor.run()
 ```
+
+> [!WARNING]
+> The current release requires **Python 3.11+**. The documentation incorrectly lists Python 3.10 support due to an accidental dependency on `typing.NotRequired`. This will be fixed in a future update.

{tilemap_editor-4.3.4 → tilemap_editor-4.3.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tilemap-editor"
-version = "4.3.4"
+version = "4.3.5"
 description = "Pygame tilemap editor with collision, animation, sprite & particle tools"
 readme = "README.md"
 requires-python = ">=3.11"

{tilemap_editor-4.3.4 → tilemap_editor-4.3.5}/src/node_manager.py

@@ -13,7 +13,7 @@ def create_node_id() -> str:
     return str(uuid.uuid4())
 
 
-SIDECAR_VERSION = 1
+SIDECAR_VERSION = 2
 
 
 class NodeManager:
@@ -49,10 +49,15 @@ class NodeManager:
             raw = json.loads(sidecar.read_text(encoding="utf-8"))
             if not isinstance(raw, dict):
                 return
+            version = raw.get("version", 1)
             self.groups = list(raw.get("groups", []))
+            rs = self.editor.tilemap.render_scale
             for item in raw.get("nodes", []):
                 if isinstance(item, dict):
                     node = Node.from_dict(item)
+                    if version >= 2:
+                        node.area.x = int(node.area.x * rs)
+                        node.area.y = int(node.area.y * rs)
                     self.nodes[node.node_id] = node
         except (json.JSONDecodeError, KeyError, ValueError, TypeError):
             import logging
@@ -62,12 +67,23 @@ class NodeManager:
     def save(self, map_path: Path) -> None:
         sidecar = self._sidecar_path_for(map_path)
         self.nodes_dir.mkdir(parents=True, exist_ok=True)
-        data: dict[str, Any] = {
-            "version": SIDECAR_VERSION,
-            "groups": self.groups,
-            "nodes": [node.to_dict() for node in self.nodes.values()],
-        }
-        sidecar.write_text(json.dumps(data, indent=2), encoding="utf-8")
+        rs = self.editor.tilemap.render_scale
+        orig_areas: dict[str, tuple[int, int]] = {}
+        for nid, node in self.nodes.items():
+            orig_areas[nid] = (node.area.x, node.area.y)
+            node.area.x = int(node.area.x / rs)
+            node.area.y = int(node.area.y / rs)
+        try:
+            data: dict[str, Any] = {
+                "version": SIDECAR_VERSION,
+                "groups": self.groups,
+                "nodes": [node.to_dict() for node in self.nodes.values()],
+            }
+            sidecar.write_text(json.dumps(data, indent=2), encoding="utf-8")
+        finally:
+            for nid, (ox, oy) in orig_areas.items():
+                self.nodes[nid].area.x = ox
+                self.nodes[nid].area.y = oy
 
     def add_node(self, node: Node) -> str:
         self.nodes[node.node_id] = node

{tilemap_editor-4.3.4 → tilemap_editor-4.3.5}/src/plugins/character_collision/editor.py

@@ -182,11 +182,32 @@ class CharacterCollisionEditor:
             self._image_path = self._rel_path(path)
             pygame.display.set_caption(f"Character Collision Editor — {path.stem}")
             self._toast_manager.success(f"Loaded sprite: {path.name}")
+            self._auto_load_collision()
         except Exception as e:
             self._toast_manager.error(f"Failed to load image: {e}")
         finally:
             self._image_dialog = None
 
+    def _auto_load_collision(self) -> bool:
+        name = self._name_input.text.strip()
+        if not name:
+            return False
+        safe = re.sub(r"[^\w\-]+", "-", name).strip("-").lower()
+        coll_filename = f"{safe}.collision.json"
+        try:
+            coll_dir = self._get_collision_dir()
+        except RuntimeError:
+            return False
+        coll_path = coll_dir / coll_filename
+        if coll_path.exists():
+            try:
+                self.load_from_file(coll_path)
+                self._toast_manager.success(f"Loaded collision: {coll_path.name}")
+                return True
+            except Exception:
+                pass
+        return False
+
     def _open_image_dialog(self) -> None:
         try:
             data_root = self._data_root or Path.cwd()
@@ -281,7 +302,6 @@ class CharacterCollisionEditor:
         self.character_name = data.name
         self._name_input.text = data.name
         self._name_input.cursor_pos = len(data.name)
-        self.shape_editor.load_shape_data(data.shape.to_dict())
         layer = data.properties.get("collision_layer", 1)
         mask = data.properties.get("collision_mask", 0xFFFF)
         self.layer_sidebar.set_layer(layer)
@@ -293,7 +313,9 @@ class CharacterCollisionEditor:
             if resolved:
                 self._load_sprite_from_path(resolved)
                 self._toast_manager.success(f"Sprite loaded: {resolved.name}")
-                return
+
+        self.shape_editor.load_shape_data(data.shape.to_dict())
+        return
 
         if data.name:
             for d in [self._data_root]:
@@ -545,6 +567,7 @@ class CharacterCollisionEditor:
         editor = cls(rect, surface, character_name)
         editor._data_root = data_root
         editor._image_path = image_path
+        editor._auto_load_collision()
         return editor
 
     def run(self) -> None:

{tilemap_editor-4.3.4 → tilemap_editor-4.3.5}/src/plugins/character_collision/shape_editor.py

@@ -100,6 +100,30 @@ class ShapeEditor:
         self.offset_x = (self.rect.w - sw * self.zoom) / 2
         self.offset_y = (self.rect.h - sh * self.zoom) / 2
 
+    def _focus_on_shape(self) -> None:
+        """Center the viewport on the shape's bounding box"""
+        left, top, right, bottom = self._shape_bounds()
+        cx = (left + right) / 2
+        cy = (top + bottom) / 2
+        self.offset_x = self.rect.w / 2 - cx * self.zoom
+        self.offset_y = self.rect.h / 2 - cy * self.zoom
+
+    def _shape_bounds(self) -> tuple[float, float, float, float]:
+        """Get shape bounding box in sprite-local coords (left, top, right, bottom)"""
+        if self.shape_type == "rectangle":
+            return (self.rect_x, self.rect_y, self.rect_x + self.rect_w, self.rect_y + self.rect_h)
+        if self.shape_type == "circle":
+            return (self.circle_x - self.circle_radius, self.circle_y - self.circle_radius,
+                    self.circle_x + self.circle_radius, self.circle_y + self.circle_radius)
+        if self.shape_type == "capsule":
+            return (self.capsule_x - self.capsule_radius, self.capsule_y,
+                    self.capsule_x + self.capsule_radius, self.capsule_y + self.capsule_height)
+        if self.shape_type == "polygon" and self.polygon_vertices:
+            xs = [v[0] for v in self.polygon_vertices]
+            ys = [v[1] for v in self.polygon_vertices]
+            return (min(xs), min(ys), max(xs), max(ys))
+        return (0, 0, 0, 0)
+
     def _center_shape(self) -> None:
         """Center all shape types on the sprite"""
         sw, sh = self.sprite_surface.get_size()
@@ -195,6 +219,8 @@ class ShapeEditor:
         elif shape_type == "polygon":
             self.polygon_vertices = [tuple(v) for v in data.get("vertices", [])]
 
+        self._focus_on_shape()
+
     def resize(self, rect: Rect) -> None:
         """Update rect"""
         self.rect = rect
@@ -254,12 +280,19 @@ class ShapeEditor:
                     self.hover_handle = None
 
         if event.type == pygame.MOUSEWHEEL and self.rect.collidepoint(mouse):
-            self.zoom *= 1.15 if event.y > 0 else 0.87
-            self.zoom = max(0.5, min(self.zoom, 8.0))
-
-            sprite_pos = self._screen_to_sprite(mouse)
-            self.offset_x = mouse[0] - self.rect.x - sprite_pos[0] * self.zoom
-            self.offset_y = mouse[1] - self.rect.y - sprite_pos[1] * self.zoom
+            mods = pygame.key.get_mods()
+            if mods & (pygame.KMOD_CTRL | pygame.KMOD_META):
+                self.zoom *= 1.15 if event.y > 0 else 0.87
+                self.zoom = max(0.5, min(self.zoom, 8.0))
+                sprite_pos = self._screen_to_sprite(mouse)
+                self.offset_x = mouse[0] - self.rect.x - sprite_pos[0] * self.zoom
+                self.offset_y = mouse[1] - self.rect.y - sprite_pos[1] * self.zoom
+            elif mods & pygame.KMOD_SHIFT:
+                scroll_val = event.y if event.y != 0 else event.x
+                self.offset_x -= scroll_val * 30
+            else:
+                scroll_val = event.y if event.y != 0 else event.x
+                self.offset_y -= scroll_val * 30
             return True
 
         if event.type == pygame.MOUSEBUTTONDOWN and event.button == 1:

{tilemap_editor-4.3.4 → tilemap_editor-4.3.5}/src/plugins/object_tileset_collision/editor.py

@@ -234,12 +234,13 @@ class ObjectTilesetCollisionEditor:
     def _layout_toolbar_buttons(self) -> None:
         x = self.toolbar_rect.x + 10
         y = self.toolbar_rect.y + 8
-        for i, btn in enumerate(self._toolbar_buttons):
+        for btn in self._toolbar_buttons:
             if btn.text == "?":
                 w, h = 28, 28
             else:
                 w, h = 60, 28
-            btn.resize(x + i * (w + 8), y, w, h)
+            btn.resize(x, y, w, h)
+            x += w + 8
 
     def _on_splitter_drag(self, pos: int) -> None:
         self.tileset_selector_height = max(

{tilemap_editor-4.3.4 → tilemap_editor-4.3.5}/src/plugins/tileset_collision/collision_painter.py

@@ -476,12 +476,19 @@ class CollisionPainter:
                     return True
 
         if event.type == pygame.MOUSEWHEEL and self.rect.collidepoint(mouse):
-            self.zoom *= 1.15 if event.y > 0 else 0.87
-            self.zoom = max(0.5, min(self.zoom, 8.0))
-
-            tile_pos = self._screen_to_tile(mouse)
-            self.offset_x = mouse[0] - self.rect.x - tile_pos[0] * self.zoom
-            self.offset_y = mouse[1] - self.rect.y - tile_pos[1] * self.zoom
+            mods = pygame.key.get_mods()
+            if mods & (pygame.KMOD_CTRL | pygame.KMOD_META):
+                self.zoom *= 1.15 if event.y > 0 else 0.87
+                self.zoom = max(0.5, min(self.zoom, 8.0))
+                tile_pos = self._screen_to_tile(mouse)
+                self.offset_x = mouse[0] - self.rect.x - tile_pos[0] * self.zoom
+                self.offset_y = mouse[1] - self.rect.y - tile_pos[1] * self.zoom
+            elif mods & pygame.KMOD_SHIFT:
+                scroll_val = event.y if event.y != 0 else event.x
+                self.offset_x -= scroll_val * 30
+            else:
+                scroll_val = event.y if event.y != 0 else event.x
+                self.offset_y -= scroll_val * 30
             return True
 
         if event.type == pygame.MOUSEBUTTONDOWN and event.button == 1:

{tilemap_editor-4.3.4 → tilemap_editor-4.3.5}/src/plugins/tileset_collision/editor.py

@@ -716,8 +716,18 @@ class TilesetCollisionEditor:
                     return True
 
             if event.type == pygame.MOUSEWHEEL:
-                self.tileset_zoom *= 1.15 if event.y > 0 else 0.87
-                self.tileset_zoom = max(0.5, min(self.tileset_zoom, 8.0))
+                mods = pygame.key.get_mods()
+                if mods & (pygame.KMOD_CTRL | pygame.KMOD_META):
+                    self.tileset_zoom *= 1.15 if event.y > 0 else 0.87
+                    self.tileset_zoom = max(0.5, min(self.tileset_zoom, 8.0))
+                elif mods & pygame.KMOD_SHIFT:
+                    scroll_val = event.y if event.y != 0 else event.x
+                    self.tileset_scroll_x -= scroll_val * 30
+                else:
+                    scroll_val = event.y if event.y != 0 else event.x
+                    self.tileset_scroll_y -= scroll_val * 30
+                self.tileset_scroll_x = max(0, self.tileset_scroll_x)
+                self.tileset_scroll_y = max(0, self.tileset_scroll_y)
                 return True
 
         if event.type == pygame.MOUSEBUTTONUP:
@@ -947,12 +957,17 @@ class TilesetCollisionEditor:
         tw = int(self._tile_size[0] * self.tileset_zoom)
         th = int(self._tile_size[1] * self.tileset_zoom)
 
+        tileset_scr_w = self.tile_cols * tw
+        tileset_scr_h = self.tile_rows * th
+        center_off_x = max(0, (self.tileset_selector_rect.w - tileset_scr_w) // 2)
+        center_off_y = max(0, (self.tileset_selector_rect.h - tileset_scr_h) // 2)
+
         for row in range(self.tile_rows):
             for col in range(self.tile_cols):
                 tile_id = row * self.tile_cols + col
 
-                x = self.tileset_selector_rect.x + col * tw - self.tileset_scroll_x
-                y = self.tileset_selector_rect.y + row * th - self.tileset_scroll_y
+                x = self.tileset_selector_rect.x + col * tw - self.tileset_scroll_x + center_off_x
+                y = self.tileset_selector_rect.y + row * th - self.tileset_scroll_y + center_off_y
 
                 if (
                     x + tw < self.tileset_selector_rect.x

{tilemap_editor-4.3.4 → tilemap_editor-4.3.5/src/tilemap_editor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tilemap-editor
-Version: 4.3.4
+Version: 4.3.5
 Summary: Pygame tilemap editor with collision, animation, sprite & particle tools
 Author: tilemap editor contributors
 License: Proprietary
@@ -18,6 +18,15 @@ Dynamic: license-file
 
 `tilemap-editor` is a pygame-based map editor focused on fast iteration for 2D games.
 
+# tilemap-editor
+
+`tilemap-editor` is a Pygame-based map editor focused on fast iteration for 2D games.
+
+> **Credits:** The initial version of this project was based on DaFluffyPotato's platformer tutorial which is about 6-hours. If you want to understand the foundation this project started from, I highly recommend watching his video: https://www.youtube.com/watch?v=2gABYM5M0ww. While the editor has since evolved with many additional features and improvements, the original map format has been preserved for compatibility.
+
+Several features and design ideas were also inspired by the Godot Engine, including the animation workflow, polygon collision editing, and character collision (Sprite2D-style) editing.
+
+
 ## Installation
 
 [tilemap-editor on PyPI](https://pypi.org/project/tilemap-editor/)
@@ -55,3 +64,6 @@ if __name__ == "__main__":
     editor = Editor()
     editor.run()
 ```
+
+> [!WARNING]
+> The current release requires **Python 3.11+**. The documentation incorrectly lists Python 3.10 support due to an accidental dependency on `typing.NotRequired`. This will be fixed in a future update.

{tilemap_editor-4.3.4 → tilemap_editor-4.3.5}/src/widgets/tile_grid.py

@@ -799,10 +799,12 @@ class TileGrid:
         elif active_layer.layer_type == "object":
             mouse_pos = pygame.mouse.get_pos()
             world_pos = self.screen_to_world(mouse_pos)
+            rs = self.editor.tilemap.render_scale
+            pick_pos = (int(world_pos[0] / rs), int(world_pos[1] / rs)) if rs else world_pos
             for _obj_id, obj in active_layer.get_all_objects().items():
                 area = obj["area"]
                 obj_rect = Rect(area["x"], area["y"], area["w"], area["h"])
-                if obj_rect.collidepoint(world_pos):
+                if obj_rect.collidepoint(pick_pos):
                     ttype = int(obj["ttype"])
                     variant = obj["variant"]
                     ts_widget.select_tile_by_variant(ttype, variant)

{tilemap_editor-4.3.4 → tilemap_editor-4.3.5}/src/widgets/ui/region_selector.py

@@ -329,17 +329,26 @@ class RegionSelector:
                 self._update_hover(mouse)
 
         if event.type == pygame.MOUSEWHEEL and in_bounds:
-            old_zoom = self.zoom
-            if event.y > 0:
-                self.zoom = min(self.zoom * 1.15, 8.0)
+            mods = pygame.key.get_mods()
+            if mods & (pygame.KMOD_CTRL | pygame.KMOD_META):
+                old_zoom = self.zoom
+                if event.y > 0:
+                    self.zoom = min(self.zoom * 1.15, 8.0)
+                else:
+                    self.zoom = max(self.zoom * 0.87, 0.25)
+                if self.image:
+                    img_x = (mouse[0] - self.rect.x + self.scroll_x) / old_zoom
+                    img_y = (mouse[1] - self.rect.y + self.scroll_y) / old_zoom
+                    self.scroll_x = int(img_x * self.zoom - (mouse[0] - self.rect.x))
+                    self.scroll_y = int(img_y * self.zoom - (mouse[1] - self.rect.y))
+                    self._clamp_scroll()
+            elif mods & pygame.KMOD_SHIFT:
+                scroll_val = event.y if event.y != 0 else event.x
+                self.scroll_x -= scroll_val * 30
+                self._clamp_scroll()
             else:
-                self.zoom = max(self.zoom * 0.87, 0.25)
-
-            if self.image:
-                img_x = (mouse[0] - self.rect.x + self.scroll_x) / old_zoom
-                img_y = (mouse[1] - self.rect.y + self.scroll_y) / old_zoom
-                self.scroll_x = int(img_x * self.zoom - (mouse[0] - self.rect.x))
-                self.scroll_y = int(img_y * self.zoom - (mouse[1] - self.rect.y))
+                scroll_val = event.y if event.y != 0 else event.x
+                self.scroll_y -= scroll_val * 30
                 self._clamp_scroll()
             return True
 
@@ -501,8 +510,10 @@ class RegionSelector:
         if self.image:
             img_w = int(self.image.get_width() * self.zoom)
             img_h = int(self.image.get_height() * self.zoom)
-            img_x = self.rect.x - self.scroll_x
-            img_y = self.rect.y - self.scroll_y
+            center_off_x = max(0, (self.rect.w - img_w) // 2)
+            center_off_y = max(0, (self.rect.h - img_h) // 2)
+            img_x = self.rect.x - self.scroll_x + center_off_x
+            img_y = self.rect.y - self.scroll_y + center_off_y
 
             clip = screen.get_clip()
             screen.set_clip(self.rect)