public/py-tools
1
0
Fork 0
Code Issues Pull Requests Actions Releases 8 Activity

waaaay better circles

Browse Source
This commit is contained in:
Stefan Harmuth 2022-08-14 13:36:55 +02:00
parent 987a5bab28
commit 3c5e27cf36
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/coordinate.py
View File

@ -1,9 +1,11 @@
from __future__ import annotations from __future__ import annotations
from dataclasses import dataclass from dataclasses import dataclass
from enum import Enum from enum import Enum
from math import gcd, sqrt, inf, atan2, degrees from math import gcd, sqrt, inf, atan2, degrees, floor
from typing import Union, List, Optional from typing import Union, List, Optional
from tools.math import round_half_up
class DistanceAlgorithm(Enum): class DistanceAlgorithm(Enum):
MANHATTAN = 0 MANHATTAN = 0
@ -65,8 +67,9 @@ class Coordinate:
else: else:
return minX <= self.x <= maxX and minY <= self.y <= maxY and minZ <= self.z <= maxZ return minX <= self.x <= maxX and minY <= self.y <= maxY and minZ <= self.z <= maxZ
def getCircle(self, radius: int = 1, includeDiagonal: bool = True, minX: int = -inf, minY: int = -inf, def getCircle(self, radius: int = 1, algorithm: DistanceAlgorithm = DistanceAlgorithm.EUCLIDEAN,
maxX: int = inf, maxY: int = inf, minZ: int = -inf, maxZ: int = inf) -> list[Coordinate]: minX: int = -inf, minY: int = -inf, maxX: int = inf, maxY: int = inf,
minZ: int = -inf, maxZ: int = inf) -> list[Coordinate]:
# FIXME: includeDiagonal == True returns way too few coordinates # FIXME: includeDiagonal == True returns way too few coordinates
ret = [] ret = []
if self.z is None: # mode 2D if self.z is None: # mode 2D
@ -75,9 +78,10 @@ class Coordinate:
target = Coordinate(x, y) target = Coordinate(x, y)
if not target.inBoundaries(minX, minY, maxX, maxY): if not target.inBoundaries(minX, minY, maxX, maxY):
continue continue
dist = self.getDistanceTo(target, DistanceAlgorithm.MANHATTAN, includeDiagonals=includeDiagonal) dist = round_half_up(self.getDistanceTo(target, algorithm=algorithm, includeDiagonals=False))
if dist == radius: if dist == radius:
ret.append(target) ret.append(target)
else: else:
for x in range(self.x - radius * 2, self.x + radius * 2 + 1): for x in range(self.x - radius * 2, self.x + radius * 2 + 1):
for y in range(self.y - radius * 2, self.y + radius * 2 + 1): for y in range(self.y - radius * 2, self.y + radius * 2 + 1):