:Merge branch 'pillow'

Author: viblo

CHANGELOG.rst

@@ -2,9 +2,20 @@
 Changelog 
 =========
 
-.. NEXT
+Pymunk 7.2.0 (2025-11-02)
+-------------------------
+
+This release provides wheels for Python 3.14. It also contains a new method
+that make it possible to get the inverse transform of a Transform.
+
+**Wheels for Python 3.14**
+
+Changes:
+
+ - Build wheels for 3.14
  - Added Tranform.inverted() to get the inverse transform.
 
+
 Pymunk 7.1.0 (2025-06-29)
 -------------------------
 

docs/src/_static/examples/pillow_util_demo.png

@@ -93,4 +93,6 @@
  "pygame.locals",
  "pygame.color",
  "pyglet",
+ "pillow",
+ "PIL"
 ]

docs/src/conf.py

@@ -0,0 +1,151 @@
+# ----------------------------------------------------------------------------
+# pymunk
+# Copyright (c) 2007-2025 Victor Blomqvist
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# ----------------------------------------------------------------------------
+
+"""This submodule contains helper functions to help with quick prototyping
+using pymunk together with Pillow/PIL.
+
+For now this is experimental. 
+
+Intended to help with debugging and prototyping, not for actual production use
+in a full application. The methods contained in this module is opinionated
+about your coordinate system and not in any way optimized.
+"""
+
+__docformat__ = "reStructuredText"
+
+__all__ = [
+ "DrawOptions",
+]
+
+from typing import Sequence
+
+from PIL import ImageDraw, Image
+
+import pymunk
+from pymunk.space_debug_draw_options import SpaceDebugColor
+from pymunk.vec2d import Vec2d
+
+
+class DrawOptions(pymunk.SpaceDebugDrawOptions):
+ def __init__(self, im: Image.Image) -> None:
+ """Draw a pymunk.Space on a pillow Image object.
+
+ Typical usage::
+
+ >>> import pymunk
+ >>> from PIL import Image
+ >>> image = Image.new("RGB", (1000, 700), "white")
+ >>> space = pymunk.Space()
+ >>> options = pymunk.pillow_util.DrawOptions(image)
+ >>> space.debug_draw(options)
+
+ You can control the color of a shape by setting shape.color to the color
+ you want it drawn in::
+
+ >>> c = pymunk.Circle(None, 10)
+ >>> c.color = (255,0,0,255)
+
+ See pillow_util.demo.py for a full example
+
+ :Parameters:
+ im : Image.Image
+ Image that the objects will be drawn on
+ """
+ self.image = im
+ self.draw = ImageDraw.Draw(im)
+ super(DrawOptions, self).__init__()
+
+ def draw_circle(
+ self,
+ pos: Vec2d,
+ angle: float,
+ radius: float,
+ outline_color: SpaceDebugColor,
+ fill_color: SpaceDebugColor,
+ ) -> None:
+ self.draw.circle(pos, radius, fill_color.as_int(), outline_color.as_int(), 1)
+
+ circle_edge = pos + Vec2d.from_polar(radius, angle)
+ p2 = circle_edge
+ line_r = 2 if radius > 20 else 1
+ self.draw.line([pos, p2], outline_color.as_int(), line_r)
+ 
+
+ def draw_segment(self, a: Vec2d, b: Vec2d, color: SpaceDebugColor) -> None:
+ self.draw.line([a,b], color.as_int())
+
+ def draw_fat_segment(
+ self,
+ a: tuple[float, float],
+ b: tuple[float, float],
+ radius: float,
+ outline_color: SpaceDebugColor,
+ fill_color: SpaceDebugColor,
+ ) -> None:
+ p1 = a
+ p2 = b
+
+ r = round(max(1, radius * 2))
+ self.draw.line([a,b], fill_color.as_int(), r)
+ 
+ if r > 2:
+ orthog = [abs(p2[1] - p1[1]), abs(p2[0] - p1[0])]
+ if orthog[0] == 0 and orthog[1] == 0:
+ return
+ scale = radius / (orthog[0] * orthog[0] + orthog[1] * orthog[1]) ** 0.5
+ orthog[0] = round(orthog[0] * scale)
+ orthog[1] = round(orthog[1] * scale)
+ points = [
+ (p1[0] - orthog[0], p1[1] - orthog[1]),
+ (p1[0] + orthog[0], p1[1] + orthog[1]),
+ (p2[0] + orthog[0], p2[1] + orthog[1]),
+ (p2[0] - orthog[0], p2[1] - orthog[1]),
+ ]
+ self.draw.polygon(points, fill_color.as_int())
+ self.draw.circle((round(p1[0]), round(p1[1])), radius-1, fill_color.as_int())
+ self.draw.circle((round(p2[0]), round(p2[1])), radius-1, fill_color.as_int())
+ 
+ def draw_polygon(
+ self,
+ verts: Sequence[tuple[float, float]],
+ radius: float,
+ outline_color: SpaceDebugColor,
+ fill_color: SpaceDebugColor,
+ ) -> None:
+ ps = [v for v in verts]
+ ps += [ps[0]]
+
+ self.draw.polygon(ps, fill_color.as_int())
+
+ if radius > 0:
+ for i in range(len(verts)):
+ a = verts[i]
+ b = verts[(i + 1) % len(verts)]
+ self.draw_fat_segment(a, b, radius, outline_color, outline_color)
+
+ def draw_dot(
+ self, size: float, pos: tuple[float, float], color: SpaceDebugColor
+ ) -> None:
+ self.draw.circle(pos, size, color.as_int(), width=0)
+
+

dump/pillow_util.py

@@ -0,0 +1,36 @@
+"""Showcase what the output of pymunk.pyglet_util draw methods will look like.
+
+See pygame_util_demo.py for a comparison to pygame.
+"""
+
+__docformat__ = "reStructuredText"
+
+from PIL import Image, ImageDraw, ImageColor, ImageShow
+
+import pymunk
+import pymunk.pillow_util
+
+from .shapes_for_draw_demos import fill_space
+
+img = Image.new("RGB", (1000, 700), "white")
+draw = ImageDraw.Draw(img)
+
+space = pymunk.Space()
+draw_options = pymunk.pillow_util.DrawOptions(img)
+captions = fill_space(space)
+
+
+
+labels = []
+
+draw.text((5,5),"Demo example of shapes drawn by pillow_util.draw()", fill=(100,100,100))
+
+for caption in captions:
+ x, y = caption[0]
+ y = y - 10
+ draw.text((x,y),caption[1], fill=(50,50,50))
+
+space.debug_draw(draw_options)
+
+img.save("pillow_util_demo.png")
+ImageShow.show(img)

dump/pillow_util_demo.py

@@ -6,7 +6,7 @@
 import pymunk
 
 ignores = ["pymunk_extension_build"]
-all_dependencies = ["pygame", "pyglet", "matplotlib", "_pyglet"]
+all_dependencies = ["pygame", "pyglet", "matplotlib", "_pyglet", "pillow", "PIL"]
 
 
 def load_tests(

pymunk/tests/doctests.py

@@ -10,7 +10,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "pymunk"
 version = "7.1.0" # remember to change me for new versions!
-# Require cffi >1.14.0 since that (and older) has problem with returing structs from functions.
+# Require cffi >1.14.0 since that (and older) has problem with returning structs from functions.
 # Require cffi >= 1.17.1 since older cant work with latest setuptools version
 dependencies = [
  "cffi >= 1.17.1; platform_system != 'Emscripten'",
@@ -36,7 +36,7 @@ classifiers = [
 requires-python = ">=3.9"
 
 [project.optional-dependencies]
-dev = ["pyglet", "pygame", "sphinx", "aafigure", "wheel", "matplotlib", "numpy"]
+dev = ["pyglet", "pygame", "pillow", "sphinx", "aafigure", "wheel", "matplotlib", "numpy"]
 [project.urls]
 Homepage = "https://www.pymunk.org"
 Documentation = "https://www.pymunk.org"