Rotierender Würfel mit CubeGame
This commit is contained in:
commit
8300228059
17 files changed
+551
No files matched your search
@@ -0,0 +1,2 @@
|
||||
git add .
|
||||
git commit -m "Rotierender Würfel mit CubeGame"
|
||||
Generated
+8
@@ -0,0 +1,8 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<settings>
|
||||
<option name="USE_PROJECT_PROFILE" value="false" />
|
||||
<version value="1.0" />
|
||||
</settings>
|
||||
</component>
|
||||
Generated
+10
@@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Black">
|
||||
<option name="sdkName" value="Python 3.13 (wurfel)" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 (wurfel)" project-jdk-type="Python SDK" />
|
||||
<component name="PythonCompatibilityInspectionAdvertiser">
|
||||
<option name="version" value="3" />
|
||||
</component>
|
||||
</project>
|
||||
Generated
+8
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/wurfel.iml" filepath="$PROJECT_DIR$/.idea/wurfel.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
Generated
+10
@@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="PYTHON_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<excludeFolder url="file://$MODULE_DIR$/.venv" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Python 3.13 (wurfel)" jdkType="Python SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -0,0 +1,200 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Installiert die Abhängigkeiten aus pyproject.toml in die aktuelle Python-Umgebung.
|
||||
|
||||
Ersatz für "Install requirements" aus PyCharm, wenn das Projekt eine pyproject.toml
|
||||
statt einer requirements.txt hat. Kein Build, keine besondere Projektstruktur nötig,
|
||||
nur Standardbibliothek (Python >= 3.11).
|
||||
|
||||
Benutzung:
|
||||
In PyCharm: Rechtsklick auf diese Datei -> Run 'install_dependencies'
|
||||
Im Terminal (venv aktiv): python install_dependencies.py
|
||||
|
||||
Ohne Parameter wird ALLES installiert:
|
||||
[project].dependencies + alle [project.optional-dependencies] + alle [dependency-groups]
|
||||
|
||||
Abweichendes Verhalten:
|
||||
python install_dependencies.py --extra dev nur Basis + Extra "dev"
|
||||
python install_dependencies.py --group test nur Basis + Gruppe "test"
|
||||
python install_dependencies.py --no-main --group dev
|
||||
python install_dependencies.py --list nur anzeigen, nichts installieren
|
||||
python install_dependencies.py --write requirements.txt schreiben statt installieren
|
||||
python install_dependencies.py --write -o reqs.txt
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import sys
|
||||
|
||||
if sys.version_info < (3, 11):
|
||||
sys.exit(
|
||||
"Dieses Skript braucht Python 3.11 oder neuer (tomllib). "
|
||||
f"Aktuell: {sys.version.split()[0]}"
|
||||
)
|
||||
|
||||
import argparse
|
||||
import subprocess
|
||||
import tempfile
|
||||
import tomllib
|
||||
from pathlib import Path
|
||||
|
||||
PROJECT_DIR = Path(__file__).resolve().parent
|
||||
|
||||
|
||||
def resolve_group(groups: dict, name: str, seen: set[str] | None = None) -> list[str]:
|
||||
"""Löst eine Dependency-Group inkl. {include-group = "..."} rekursiv auf."""
|
||||
seen = set() if seen is None else seen
|
||||
if name in seen:
|
||||
raise ValueError(f"Zyklische include-group: {name}")
|
||||
if name not in groups:
|
||||
raise KeyError(f"Dependency-Group '{name}' nicht gefunden")
|
||||
seen.add(name)
|
||||
result: list[str] = []
|
||||
for entry in groups[name]:
|
||||
if isinstance(entry, str):
|
||||
result.append(entry)
|
||||
elif isinstance(entry, dict) and "include-group" in entry:
|
||||
result.extend(resolve_group(groups, entry["include-group"], seen))
|
||||
return result
|
||||
|
||||
|
||||
def collect(
|
||||
data: dict, extras: list[str], groups: list[str], no_main: bool
|
||||
) -> list[str]:
|
||||
project = data.get("project", {})
|
||||
optional = project.get("optional-dependencies", {})
|
||||
dep_groups = data.get("dependency-groups", {})
|
||||
deps: list[str] = []
|
||||
|
||||
if not no_main:
|
||||
deps.extend(project.get("dependencies", []))
|
||||
for extra in extras:
|
||||
if extra not in optional:
|
||||
raise KeyError(f"Optional-Dependency '{extra}' nicht gefunden")
|
||||
deps.extend(optional[extra])
|
||||
for group in groups:
|
||||
deps.extend(resolve_group(dep_groups, group))
|
||||
|
||||
# Duplikate entfernen, Reihenfolge behalten
|
||||
return list(dict.fromkeys(d.strip() for d in deps if d.strip()))
|
||||
|
||||
|
||||
def main() -> int:
|
||||
p = argparse.ArgumentParser(
|
||||
description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
|
||||
)
|
||||
p.add_argument(
|
||||
"-p",
|
||||
"--pyproject",
|
||||
type=Path,
|
||||
default=PROJECT_DIR / "pyproject.toml",
|
||||
help="Pfad zur pyproject.toml (Standard: neben diesem Skript)",
|
||||
)
|
||||
p.add_argument(
|
||||
"--extra",
|
||||
action="append",
|
||||
default=None,
|
||||
help="nur diese optional-dependencies (mehrfach möglich)",
|
||||
)
|
||||
p.add_argument(
|
||||
"--group",
|
||||
action="append",
|
||||
default=None,
|
||||
help="nur diese dependency-groups (mehrfach möglich)",
|
||||
)
|
||||
p.add_argument(
|
||||
"--no-main", action="store_true", help="[project].dependencies weglassen"
|
||||
)
|
||||
p.add_argument("--list", action="store_true", help="Abhängigkeiten nur anzeigen")
|
||||
p.add_argument(
|
||||
"--write",
|
||||
action="store_true",
|
||||
help="requirements-Datei schreiben statt installieren",
|
||||
)
|
||||
p.add_argument(
|
||||
"-o",
|
||||
"--output",
|
||||
type=Path,
|
||||
default=PROJECT_DIR / "requirements.txt",
|
||||
help="Zieldatei für --write",
|
||||
)
|
||||
args = p.parse_args()
|
||||
|
||||
if not args.pyproject.exists():
|
||||
print(f"{args.pyproject} nicht gefunden", file=sys.stderr)
|
||||
return 1
|
||||
data = tomllib.loads(args.pyproject.read_text(encoding="utf-8"))
|
||||
all_extras = list(data.get("project", {}).get("optional-dependencies", {}))
|
||||
all_groups = list(data.get("dependency-groups", {}))
|
||||
|
||||
# Ohne --extra/--group: alles. Mit einem davon: nur das Gewählte.
|
||||
selective = args.extra is not None or args.group is not None
|
||||
extras = (args.extra or []) if selective else all_extras
|
||||
groups = (args.group or []) if selective else all_groups
|
||||
|
||||
try:
|
||||
deps = collect(data, extras, groups, args.no_main)
|
||||
except (KeyError, ValueError) as e:
|
||||
print(f"Fehler: {e.args[0]}", file=sys.stderr)
|
||||
print(
|
||||
f" Vorhandene --extra: {', '.join(all_extras) or '(keine)'}",
|
||||
file=sys.stderr,
|
||||
)
|
||||
print(
|
||||
f" Vorhandene --group: {', '.join(all_groups) or '(keine)'}",
|
||||
file=sys.stderr,
|
||||
)
|
||||
return 1
|
||||
|
||||
parts = (
|
||||
([] if args.no_main else ["Basis"])
|
||||
+ [f"extra:{e}" for e in extras]
|
||||
+ [f"group:{g}" for g in groups]
|
||||
)
|
||||
print(f"Auswahl: {', '.join(parts) or '(nichts)'}")
|
||||
|
||||
if args.list:
|
||||
print("\n".join(deps) or "(keine Abhängigkeiten)")
|
||||
return 0
|
||||
|
||||
content = (
|
||||
f"# Automatisch erzeugt aus {args.pyproject.name} – nicht von Hand bearbeiten\n"
|
||||
+ "\n".join(deps)
|
||||
+ "\n"
|
||||
)
|
||||
|
||||
if args.write:
|
||||
args.output.write_text(content, encoding="utf-8")
|
||||
print(f"{len(deps)} Abhängigkeiten -> {args.output}")
|
||||
return 0
|
||||
|
||||
if not deps:
|
||||
print("Keine Abhängigkeiten gefunden – nichts zu tun.")
|
||||
return 0
|
||||
|
||||
if sys.prefix == sys.base_prefix:
|
||||
print(
|
||||
"WARNUNG: Es ist kein virtuelles Environment aktiv – es wird in die globale "
|
||||
f"Python-Installation installiert:\n {sys.prefix}",
|
||||
file=sys.stderr,
|
||||
)
|
||||
if sys.stdin.isatty() and input(
|
||||
"Trotzdem fortfahren? [j/N] "
|
||||
).strip().lower() not in ("j", "ja", "y", "yes"):
|
||||
return 1
|
||||
|
||||
with tempfile.NamedTemporaryFile(
|
||||
"w", suffix=".txt", delete=False, encoding="utf-8"
|
||||
) as tmp:
|
||||
tmp.write(content)
|
||||
tmp_path = Path(tmp.name)
|
||||
try:
|
||||
print(f"Installiere {len(deps)} Abhängigkeiten in {sys.prefix}\n")
|
||||
return subprocess.call(
|
||||
[sys.executable, "-m", "pip", "install", "-r", str(tmp_path)]
|
||||
)
|
||||
finally:
|
||||
tmp_path.unlink(missing_ok=True)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,4 @@
|
||||
from spiel.cube_game import CubeGame
|
||||
|
||||
if __name__ == "__main__":
|
||||
CubeGame().run()
|
||||
@@ -0,0 +1,7 @@
|
||||
[project]
|
||||
name = "wurfel"
|
||||
version = "0.1.0"
|
||||
dependencies = ["pygame"]
|
||||
|
||||
[project.optional-dependencies]
|
||||
dev = ["pytest", "ruff", "pytest-cov"]
|
||||
Whitespace-only changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,196 @@
|
||||
"""Utility functions for matrix operations."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import math
|
||||
|
||||
from tabulate import tabulate
|
||||
|
||||
Matrix = list[list[int | float]]
|
||||
|
||||
|
||||
def transpose(matrix: Matrix) -> Matrix:
|
||||
"""Return the transpose of a matrix.
|
||||
|
||||
Args:
|
||||
matrix: Rectangular, non-empty matrix in row-major format.
|
||||
|
||||
Returns:
|
||||
The transposed matrix.
|
||||
|
||||
Raises:
|
||||
ValueError: If the matrix is empty or has irregular rows.
|
||||
"""
|
||||
if not matrix:
|
||||
raise ValueError("Cannot transpose an empty matrix")
|
||||
row_length = len(matrix[0])
|
||||
if row_length == 0:
|
||||
raise ValueError("Matrix rows must have at least one column")
|
||||
for row in matrix:
|
||||
if len(row) != row_length:
|
||||
raise ValueError("Inconsistent row lengths; matrix must be rectangular")
|
||||
return [list(column) for column in zip(*matrix)]
|
||||
|
||||
|
||||
def matmul(a: Matrix, b: Matrix) -> Matrix:
|
||||
"""Return the matrix product of two matrices.
|
||||
|
||||
Args:
|
||||
a: Matrix with m rows and n columns.
|
||||
b: Matrix with n rows and p columns.
|
||||
|
||||
Returns:
|
||||
The product matrix with m rows and p columns.
|
||||
|
||||
Raises:
|
||||
ValueError: If a matrix is empty or the inner dimensions do not match.
|
||||
"""
|
||||
if not a or not b:
|
||||
raise ValueError("Both matrices must be non-empty")
|
||||
if not a[0] or not b[0]:
|
||||
raise ValueError("Matrices must have at least one column")
|
||||
|
||||
rows_a, cols_a = len(a), len(a[0])
|
||||
rows_b, cols_b = len(b), len(b[0])
|
||||
|
||||
if cols_a != rows_b:
|
||||
raise ValueError(
|
||||
f"Inner matrix dimensions must agree: got {cols_a} and {rows_b}"
|
||||
)
|
||||
|
||||
result: Matrix = []
|
||||
for i in range(rows_a):
|
||||
result_row: list[int | float] = []
|
||||
for j in range(cols_b):
|
||||
total: int | float = 0
|
||||
for k in range(cols_a):
|
||||
total += a[i][k] * b[k][j]
|
||||
result_row.append(total)
|
||||
result.append(result_row)
|
||||
return result
|
||||
|
||||
|
||||
def rot_2D(theta: float) -> Matrix:
|
||||
"""Create a 2D rotation matrix.
|
||||
|
||||
Args:
|
||||
theta: Rotation angle in radians. Positive values rotate
|
||||
counter-clockwise.
|
||||
|
||||
Returns:
|
||||
A 2x2 rotation matrix [[cos, -sin], [sin, cos]].
|
||||
"""
|
||||
return [
|
||||
[math.cos(theta), -math.sin(theta)],
|
||||
[math.sin(theta), math.cos(theta)],
|
||||
]
|
||||
|
||||
def project_ortho(
|
||||
point: tuple[float, float, float], scale: float = 1
|
||||
) -> tuple[float, float]:
|
||||
"""Projiziert einen 3D-Punkt orthogonal auf die x-y-Ebene.
|
||||
|
||||
Die z-Koordinate wird ignoriert. x und y werden mit scale multipliziert.
|
||||
|
||||
Args:
|
||||
point: Der 3D-Punkt (x, y, z).
|
||||
scale: Skalierungsfaktor für den projizierten Punkt.
|
||||
|
||||
Returns:
|
||||
Der 2D-Punkt (x * scale, y * scale).
|
||||
"""
|
||||
x, y, _ = point
|
||||
return (x * scale, y * scale)
|
||||
|
||||
def project_perspective(
|
||||
point: tuple[float, float, float],
|
||||
focal_length: float = 1.0,
|
||||
scale: float = 1.0,
|
||||
camera_distance: float = 4.0,
|
||||
) -> tuple[float, float]:
|
||||
"""Projiziert einen 3D-Punkt perspektivisch auf die x-y-Ebene.
|
||||
|
||||
x_2d = x * focal_length / (z + camera_distance) * scale
|
||||
y_2d = y * focal_length / (z + camera_distance) * scale
|
||||
|
||||
Args:
|
||||
point: Der 3D-Punkt (x, y, z).
|
||||
focal_length: Brennweite, steuert die Stärke der Perspektive.
|
||||
scale: Skalierungsfaktor für den projizierten Punkt.
|
||||
camera_distance: Offset für die Kameraposition auf der z-Achse.
|
||||
|
||||
Returns:
|
||||
Der 2D-Punkt (x_2d, y_2d).
|
||||
|
||||
Raises:
|
||||
ValueError: Wenn z + camera_distance gleich 0 ist.
|
||||
"""
|
||||
x, y, z = point
|
||||
depth = z + camera_distance
|
||||
if depth == 0:
|
||||
raise ValueError("z + camera_distance darf nicht 0 sein")
|
||||
return (x * focal_length / depth * scale, y * focal_length / depth * scale)
|
||||
|
||||
|
||||
def rot_3D(angle: float, axis: str) -> list[list[float]]:
|
||||
"""Gibt die 3D-Rotationsmatrix für eine Drehung um eine Koordinatenachse zurück.
|
||||
|
||||
Rotation um die x-Achse:
|
||||
[[1, 0, 0], [0, cos(a), -sin(a)], [0, sin(a), cos(a)]]
|
||||
Rotation um die y-Achse:
|
||||
[[cos(a), 0, sin(a)], [0, 1, 0], [-sin(a), 0, cos(a)]]
|
||||
Rotation um die z-Achse:
|
||||
[[cos(a), -sin(a), 0], [sin(a), cos(a), 0], [0, 0, 1]]
|
||||
|
||||
Args:
|
||||
angle: Drehwinkel a im Bogenmaß.
|
||||
axis: Drehachse, "x", "y" oder "z".
|
||||
|
||||
Returns:
|
||||
Die 3x3-Rotationsmatrix als verschachtelte Liste.
|
||||
|
||||
Raises:
|
||||
ValueError: Wenn axis nicht "x", "y" oder "z" ist.
|
||||
"""
|
||||
cos_a = math.cos(angle)
|
||||
sin_a = math.sin(angle)
|
||||
if axis == "x":
|
||||
return [[1, 0, 0], [0, cos_a, -sin_a], [0, sin_a, cos_a]]
|
||||
if axis == "y":
|
||||
return [[cos_a, 0, sin_a], [0, 1, 0], [-sin_a, 0, cos_a]]
|
||||
if axis == "z":
|
||||
return [[cos_a, -sin_a, 0], [sin_a, cos_a, 0], [0, 0, 1]]
|
||||
raise ValueError("axis muss 'x', 'y' oder 'z' sein")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
matrix_a = [
|
||||
[3, 4, -1, 4],
|
||||
[-2, 2, 5, 1],
|
||||
]
|
||||
matrix_b = [
|
||||
[1, 3, -2],
|
||||
[2, 5, 1],
|
||||
[-1, 4, -4],
|
||||
[2, 3, 6],
|
||||
]
|
||||
assert matmul(matrix_a, matrix_b) == [[20, 37, 26], [-1, 27, -8]]
|
||||
assert matmul([[1, 2]], [[3], [4]]) == [[11]]
|
||||
|
||||
assert transpose([[1, 2, 3], [4, 5, 6]]) == [[1, 4], [2, 5], [3, 6]]
|
||||
|
||||
for bad_matrix in ([], [[1, 2], [3, 4, 5]]):
|
||||
try:
|
||||
transpose(bad_matrix)
|
||||
except ValueError:
|
||||
pass
|
||||
else:
|
||||
raise AssertionError("ValueError erwartet")
|
||||
|
||||
point = [[1.0], [0.0]]
|
||||
rotated = matmul(rot_2D(math.pi / 2), point)
|
||||
assert math.isclose(rotated[0][0], 0.0, abs_tol=1e-9)
|
||||
assert math.isclose(rotated[1][0], 1.0, abs_tol=1e-9)
|
||||
assert rot_2D(0) == [[1.0, 0.0], [0.0, 1.0]]
|
||||
print(tabulate(rot_2D(1.0)))
|
||||
print("Alle Tests bestanden.")
|
||||
@@ -0,0 +1,47 @@
|
||||
import pygame
|
||||
|
||||
from spiel.compute import matmul, project_ortho, rot_3D
|
||||
from spiel.game import Game
|
||||
|
||||
CORNERS = [
|
||||
(-1, -1, -1), (1, -1, -1), (1, 1, -1), (-1, 1, -1),
|
||||
(-1, -1, 1), (1, -1, 1), (1, 1, 1), (-1, 1, 1),
|
||||
]
|
||||
EDGES = [
|
||||
(0, 1), (1, 2), (2, 3), (3, 0),
|
||||
(4, 5), (5, 6), (6, 7), (7, 4),
|
||||
(0, 4), (1, 5), (2, 6), (3, 7),
|
||||
]
|
||||
GREEN = (0, 255, 0)
|
||||
BLACK = (0, 0, 0)
|
||||
SCALE = 100
|
||||
SPEED = 0.02
|
||||
|
||||
|
||||
class CubeGame(Game):
|
||||
def __init__(self, title="3D Cube", fps=60, size=(640, 400)) -> None:
|
||||
super().__init__(title, fps, size)
|
||||
self.angle_x = 0.0
|
||||
self.angle_y = 0.0
|
||||
self.points_2d: list[tuple[float, float]] = []
|
||||
|
||||
def update_game(self) -> bool:
|
||||
keys = pygame.key.get_pressed()
|
||||
self.angle_x += SPEED * (keys[pygame.K_DOWN] - keys[pygame.K_UP])
|
||||
self.angle_y += SPEED * (keys[pygame.K_RIGHT] - keys[pygame.K_LEFT])
|
||||
rotation = matmul(rot_3D(self.angle_y, "y"), rot_3D(self.angle_x, "x"))
|
||||
width, height = self.screen.get_size()
|
||||
self.points_2d = []
|
||||
for x, y, z in CORNERS:
|
||||
rx, ry, rz = (row[0] for row in matmul(rotation, [[x], [y], [z]]))
|
||||
px, py = project_ortho((rx, ry, rz), SCALE)
|
||||
self.points_2d.append((px + width / 2, py + height / 2))
|
||||
return True
|
||||
|
||||
def draw_game(self) -> None:
|
||||
self.screen.fill(BLACK)
|
||||
for start, end in EDGES:
|
||||
pygame.draw.line(
|
||||
self.screen, GREEN, self.points_2d[start], self.points_2d[end]
|
||||
)
|
||||
super().draw_game()
|
||||
@@ -0,0 +1,53 @@
|
||||
import pygame
|
||||
|
||||
class Game:
|
||||
|
||||
def __init__(self, title, fps=60, size=(640, 400)):
|
||||
self.title = title
|
||||
self.fps = fps
|
||||
self.size = size
|
||||
self.clock = pygame.time.Clock()
|
||||
self.dt = 0
|
||||
self.screen = None
|
||||
|
||||
def init_game(self):
|
||||
pygame.init()
|
||||
pygame.display.set_caption(self.title)
|
||||
self.screen = pygame.display.set_mode(self.size)
|
||||
|
||||
|
||||
def game_loop(self):
|
||||
while True:
|
||||
# Berechnung der Zeitdifferenz seit dem letzten Frame in Sekunden
|
||||
self.dt = self.clock.tick(self.fps) / 1000
|
||||
if self.event_handling() == False:
|
||||
break
|
||||
if self.update_game() == False:
|
||||
break
|
||||
self.draw_game()
|
||||
|
||||
def exit_game(self):
|
||||
pygame.quit()
|
||||
|
||||
def event_handling(self): # bleibt in der Unterklasse unverändert
|
||||
for event in pygame.event.get():
|
||||
if not self.handle_event(event):
|
||||
return False
|
||||
return True
|
||||
|
||||
def handle_event(self, event): # wird in der Unterklasse überschrieben
|
||||
if event.type == pygame.QUIT:
|
||||
return False
|
||||
return True
|
||||
|
||||
def update_game(self):
|
||||
return True
|
||||
|
||||
def draw_game(self):
|
||||
pygame.display.flip()
|
||||
|
||||
def run(self):
|
||||
self.init_game()
|
||||
self.game_loop()
|
||||
self.exit_game()
|
||||
|
||||
Reference in new issue
Block a user