Skip to content

Edge angle override #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raoulb wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Edge angle override #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2cabb5
Implement edge angle override
Sep 6, 2018
1a011e8
Explicit edge angles for some isosceles triangles
Sep 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions fillygons/generate_sources/variants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ def decide_fillygon_file(decider: Decider):
short_diagonal = 0
long_diagonal = 1

min_convex_angle = None
min_concave_angle = None

if equilateral:
regular = decider.get_boolean()

Expand Down Expand Up @@ -265,19 +268,20 @@ def decide_fillygon_file(decider: Decider):

elif decider.get_boolean():
# General triangles
name, polygon_name, angles, edges = decider.get(
('Right isosceles triangle', 'right-isosceles-triangle', [pi/4, pi/2, pi/4], [1, 1, sqrt(2)]),
('Right isosceles triangle (sqrt2)', 'right-isosceles-triangle-sqrt2', [pi/4, pi/2, pi/4], [sqrt(2), sqrt(2), 2]),
('Right isosceles triangle (sqrt2, double)', 'right-isosceles-triangle-sqrt2-double', [pi/4, pi/2, pi/4, pi], [sqrt(2), sqrt(2), 1, 1]),
name, polygon_name, angles, edges, min_convex_angle, min_concave_angle = decider.get(
('Right isosceles triangle', 'right-isosceles-triangle', [pi/4, pi/2, pi/4], [1, 1, sqrt(2)], None, None),
('Right isosceles triangle (sqrt2)', 'right-isosceles-triangle-sqrt2', [pi/4, pi/2, pi/4], [sqrt(2), sqrt(2), 2], None, None),
('Right isosceles triangle (sqrt2, double)', 'right-isosceles-triangle-sqrt2-double', [pi/4, pi/2, pi/4, pi], [sqrt(2), sqrt(2), 1, 1], None, None),

('Isosceles triangle (1, sqrt2, sqrt2)', 'isosceles-triangle-1-sqrt2-sqrt2', [acos(sqrt(2)/4), acos(sqrt(2)/4), pi-2*acos(sqrt(2)/4)], [1, sqrt(2), sqrt(2)]),
('Isosceles triangle (sqrt2, 2, 2)', 'isosceles-triangle-sqrt2-2-2', [acos(sqrt(2)/4), acos(sqrt(2)/4), pi-2*acos(sqrt(2)/4)], [sqrt(2), 2, 2]),
('Isosceles triangle (sqrt2, double, double)', 'isosceles-triangle-sqrt2-double-double', [acos(sqrt(2)/4), acos(sqrt(2)/4), pi, pi-2*acos(sqrt(2)/4), pi], [sqrt(2), 1, 1, 1, 1]),
('Isosceles triangle (1, sqrt2, sqrt2)', 'isosceles-triangle-1-sqrt2-sqrt2', [acos(sqrt(2)/4), acos(sqrt(2)/4), pi-2*acos(sqrt(2)/4)], [1, sqrt(2), sqrt(2)], rad(38), rad(38)),
('Isosceles triangle (sqrt2, 2, 2)', 'isosceles-triangle-sqrt2-2-2', [acos(sqrt(2)/4), acos(sqrt(2)/4), pi-2*acos(sqrt(2)/4)], [sqrt(2), 2, 2], rad(38), rad(38)),
('Isosceles triangle (sqrt2, double, double)', 'isosceles-triangle-sqrt2-double-double', [acos(sqrt(2)/4), acos(sqrt(2)/4), pi, pi-2*acos(sqrt(2)/4), pi], [sqrt(2), 1, 1, 1, 1], rad(38), rad(38)),

('Isosceles triangle (1, Phi, Phi)', 'isosceles-triangle-1-phi-phi', [2*pi/5, 2*pi/5, pi/5], [1, GoldenRatio, GoldenRatio]),
('Isosceles triangle (1, Phi, Phi)', 'isosceles-triangle-1-phi-phi', [2*pi/5, 2*pi/5, pi/5], [1, GoldenRatio, GoldenRatio], rad(38), rad(38)),
('Isosceles triangle (Phi, Phi2, Phi2)', 'isosceles-triangle-phi-phi2-phi2', [2*pi/5, 2*pi/5, pi/5], [GoldenRatio, GoldenRatio**2, GoldenRatio**2], rad(38), rad(38)),

('Isosceles triangle (1, 2, 2)', 'isosceles-triangle-1-2-2', [acos(Rational(1,4)), acos(Rational(1,4)), pi-2*acos(Rational(1,4))], [1, 2, 2]),
('Isosceles triangle (1, double, double)', 'isosceles-triangle-1-double-double', [acos(Rational(1,4)), acos(Rational(1,4)), pi, pi-2*acos(Rational(1,4)), pi], [1, 1, 1, 1, 1])
('Isosceles triangle (1, 2, 2)', 'isosceles-triangle-1-2-2', [acos(Rational(1,4)), acos(Rational(1,4)), pi-2*acos(Rational(1,4))], [1, 2, 2], None, None),
('Isosceles triangle (1, double, double)', 'isosceles-triangle-1-double-double', [acos(Rational(1,4)), acos(Rational(1,4)), pi, pi-2*acos(Rational(1,4)), pi], [1, 1, 1, 1, 1], None, None)
)

else:
Expand Down Expand Up @@ -310,8 +314,8 @@ def decide_fillygon_file(decider: Decider):
else:
variant_name = 'corners'

min_convex_angle = pi/2
min_concave_angle = pi
min_edge_angle = pi/2
max_edge_angle = pi
else:
if filled:
variant_name = 'filled'
Expand All @@ -324,7 +328,12 @@ def decide_fillygon_file(decider: Decider):
min_edge_angle = rad(38)

# Make pieces vertically symmetric.
min_convex_angle = min_concave_angle = min_edge_angle
max_edge_angle = min_edge_angle

if not min_convex_angle:
min_convex_angle = min_edge_angle
if not min_concave_angle:
min_concave_angle = max_edge_angle

path = os.path.join(
'src/variants',
Expand Down