Persson-dev/GDMC-2024
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Circle

Browse Source
This commit is contained in:
Xeon0X
2024-06-11 03:27:55 +02:00
parent d993232a1a
commit c879f209d8
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
main.py
View File

@@ -1,3 +1,4 @@
from networks.geometry.Circle import Circle
from networks.geometry.Polyline import Polyline from networks.geometry.Polyline import Polyline
from networks.geometry.Point2D import Point2D from networks.geometry.Point2D import Point2D
import networks.roads.lines.Line as Line import networks.roads.lines.Line as Line
@@ -252,11 +253,11 @@ block_list = ["blue_concrete", "red_concrete", "green_concrete",
# r.place_roads() # r.place_roads()
polyline = Polyline((Point2D(0, 0), Point2D(0, 10), # polyline = Polyline((Point2D(0, 0), Point2D(0, 10),
Point2D(50, 10), Point2D(20, 20))) # Point2D(50, 10), Point2D(20, 20)))
# print(polyline.radius_balance(2)) # # print(polyline.radius_balance(2))
# polyline._alpha_assign(1, polyline.length_polyline-1) # # polyline._alpha_assign(1, polyline.length_polyline-1)
print(polyline.alpha_radii) # print(polyline.alpha_radii)

30
networks/geometry/Circle.py
View File

@@ -3,15 +3,15 @@ from networks.geometry.Point2D import Point2D
class Circle: class Circle:
def __init__(center: Type[Point2D], inner: int, outer: int): def __init__(self, center: Point2D, inner: int, outer: int):
self.center = center self.center = center
self.inner = inner self.inner = inner
self.outer = outer self.outer = outer
self.coordinates = [] self.coordinates = []
circle(self.center, self.inner, self.outer) self.circle(self.center, self.inner, self.outer)
def circle(center: Type[Point2D], inner: int, outer: int): def circle(self, center: Point2D, inner: int, outer: int):
"""Compute discrete value of a 2d-circle with thickness. """Compute discrete value of a 2d-circle with thickness.
https://stackoverflow.com/questions/27755514/circle-with-thickness-drawing-algorithm https://stackoverflow.com/questions/27755514/circle-with-thickness-drawing-algorithm
@@ -20,6 +20,8 @@ class Circle:
center (Type[Point2D]): Center of the circle. Circles always have an odd diameter due to the central coordinate. center (Type[Point2D]): Center of the circle. Circles always have an odd diameter due to the central coordinate.
inner (int): The minimum radius at which the disc is filled (included). inner (int): The minimum radius at which the disc is filled (included).
outer (int): The maximum radius where disc filling stops (included). outer (int): The maximum radius where disc filling stops (included).
>>> Circle(Point2D(0, 0), 5, 10)
""" """
xo = outer xo = outer
xi = inner xi = inner
@@ -28,14 +30,14 @@ class Circle:
erri = 1 - xi erri = 1 - xi
while xo >= y: while xo >= y:
_x_line(center.x + xi, center.x + xo, center.y + y) self._x_line(center.x + xi, center.x + xo, center.y + y)
_y_line(center.x + y, center.y + xi, center.y + xo) self._y_line(center.x + y, center.y + xi, center.y + xo)
_x_line(center.x - xo, center.x - xi, center.y + y) self._x_line(center.x - xo, center.x - xi, center.y + y)
_y_line(center.x - y, center.y + xi, center.y + xo) self._y_line(center.x - y, center.y + xi, center.y + xo)
_x_line(center.x - xo, center.x - xi, center.y - y) self._x_line(center.x - xo, center.x - xi, center.y - y)
_y_line(center.x - y, center.y - xo, center.y - xi) self._y_line(center.x - y, center.y - xo, center.y - xi)
_x_line(center.x + xi, center.x + xo, center.y - y) self._x_line(center.x + xi, center.x + xo, center.y - y)
_y_line(center.x + y, center.y - xo, center.y - xi) self._y_line(center.x + y, center.y - xo, center.y - xi)
y += 1 y += 1
@@ -54,14 +56,14 @@ class Circle:
xi -= 1 xi -= 1
erri += 2 * (y - xi + 1) erri += 2 * (y - xi + 1)
def _x_line(x1, x2, y): def _x_line(self, x1, x2, y):
while x1 <= x2: while x1 <= x2:
self.coordinates.append(Point2D(x1, y)) self.coordinates.append(Point2D(x1, y))
x1 += 1 x1 += 1
def _y_line(x, y1, y2): def _y_line(self, x, y1, y2):
while y1 <= y2: while y1 <= y2:
self.coordinate.append(Point2D(x, y1)) self.coordinates.append(Point2D(x, y1))
y1 += 1 y1 += 1
def __repr__(self): def __repr__(self):