18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-16 00:34:11 +01:00

Merge pull request #301 from pwarszawski/fix/python-screens-pillow

Python screens: ship Pillow with the Windows build, and the screen module for Pillow 10+
This commit is contained in:
2026-11-09 12:46:42 +00:00
committed by GitHub
3 changed files with 44 additions and 3 deletions

View File

@@ -45,6 +45,15 @@ jobs:
python-version: "3.14"
architecture: "x64"
# the cab screens are drawn with Pillow; CMake copies this Python's Lib, site-packages included, next to the
# executable as python64\Lib, so Pillow has to be installed here to come with the build (as on Linux)
- name: Install Pillow for the screens
shell: pwsh
run: |
$pythonExe = "${{ steps.python.outputs.python-path }}"
& $pythonExe -m pip install --no-cache-dir Pillow
& $pythonExe -c "from PIL import Image; print('Pillow:', Image.__version__)"
- name: Show environment
shell: pwsh
run: |
@@ -114,6 +123,18 @@ jobs:
-Recurse `
-Force
# the Python 3 version of the module every cab screen builds on; the game data still has the Python 2 one
New-Item `
-ItemType Directory `
-Force `
-Path "$output/python/local" | Out-Null
Copy-Item `
-Path "staticFiles/python/local/*" `
-Destination "$output/python/local" `
-Recurse `
-Force
- name: Upload Windows build
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
@@ -251,9 +272,11 @@ jobs:
- name: Copy shaders and translations
run: |
mkdir -p build/bin/shaders build/bin/lang
mkdir -p build/bin/shaders build/bin/lang build/bin/python/local
cp -R shaders/. build/bin/shaders/
cp -R lang/. build/bin/lang/
# the Python 3 version of the module every cab screen builds on; the game data still has the Python 2 one
cp -R staticFiles/python/local/. build/bin/python/local/
- name: Upload Linux build
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

View File

@@ -110,7 +110,7 @@ MaSzyna compiles and runs natively on **Linux** and **Windows**. Other platforms
## Windows
Install **Python 3.14 x64** from [python.org](https://www.python.org/downloads/windows/) and include the optional **Python native development** feature (headers and `.lib` for embedding). Pass `-DPython3_ROOT_DIR="C:\Path\To\Python314"` on the `cmake` line when you want the layout under that directory used for embedding and for copying `Lib` / `DLLs` next to the executable.
Install **Python 3.14 x64** from [python.org](https://www.python.org/downloads/windows/) and include the optional **Python native development** feature (headers and `.lib` for embedding). Pass `-DPython3_ROOT_DIR="C:\Path\To\Python314"` on the `cmake` line when you want the layout under that directory used for embedding and for copying `Lib` / `DLLs` next to the executable. The cab screens are drawn with [Pillow](https://pypi.org/project/pillow/): install it into that Python (`python -m pip install Pillow`) before building, so it is copied along with `Lib`.
**AppVeyor CI** builds with the worker image’s preinstalled Python at `C:/Python314-x64` (see [`appveyor.yml`](./appveyor.yml): `-DPython3_ROOT_DIR=...`).

View File

@@ -1,7 +1,25 @@
from PIL import Image
from PIL import Image, ImageDraw, ImageFont
from math import ceil, floor, cos, sin, radians
import os
# Pillow 10 removed ImageFont.getsize(), ImageDraw.textsize() and Image.ANTIALIAS, which the screen scripts use; for
# Python 3.14 only a newer Pillow is available, so they are put back, on top of getbbox() / textbbox() and LANCZOS
def _font_getsize(self, text, *args, **kwargs):
box = self.getbbox(text, *args, **kwargs)
return (box[2], box[3])
def _draw_textsize(self, text, font=None, *args, **kwargs):
box = self.textbbox((0, 0), text, font, *args, **kwargs)
return (box[2], box[3])
for _fontclass in (ImageFont.FreeTypeFont, ImageFont.ImageFont, getattr(ImageFont, 'TransposedFont', None)):
if _fontclass is not None and not hasattr(_fontclass, 'getsize') and hasattr(_fontclass, 'getbbox'):
_fontclass.getsize = _font_getsize
if not hasattr(ImageDraw.ImageDraw, 'textsize'):
ImageDraw.ImageDraw.textsize = _draw_textsize
if not hasattr(Image, 'ANTIALIAS'):
Image.ANTIALIAS = Image.LANCZOS
class abstractscreenrenderer():
def __init__(self, lookup_path):
self.width = 0