From d15eddd2bcac2b860bcb5874544924b37dc956cf Mon Sep 17 00:00:00 2001
From: Felix Pankratz <mail@felixpankratz.de>
Date: Wed, 21 Aug 2024 09:53:33 +0200
Subject: [PATCH] things n stuffs

---
 .gitignore               |   3 +++
 .hyphae_pixelflut.py.swp | Bin 20480 -> 0 bytes
 hyphae_nft.py            |  12 +++++++++---
 moon.py                  |  15 ++++++++++-----
 utils.py                 |  29 ++++++++++++++++++++++++++++-
 5 files changed, 50 insertions(+), 9 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 .hyphae_pixelflut.py.swp

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f0e7418
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+out/
+__pycache__/
+nft/
diff --git a/.hyphae_pixelflut.py.swp b/.hyphae_pixelflut.py.swp
deleted file mode 100644
index b0ee8232c74d1539cc6daf2e8abc7f27dde95d9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
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
E2i2DussI20

diff --git a/hyphae_nft.py b/hyphae_nft.py
index 349b886..2492b64 100644
--- a/hyphae_nft.py
+++ b/hyphae_nft.py
@@ -120,7 +120,7 @@ class Node():
 
 def grow_sub(ctx, branch, branches, new_subs):
     # create a sub branch based on length
-    sub_branches = len(branch.nodes) // 7 * 3 
+    sub_branches = len(branch.nodes) // 8 * 2
     if sub_branches == 0: return
     #sub_branches = 4
     #print(f'creating {sub_branches} subs')
@@ -140,6 +140,7 @@ def grow_sub(ctx, branch, branches, new_subs):
                     break
             if found_ang: 
                 break
+        grow_branch_until_ended(new_branch, branches)
 
         new_branch.set_ignores(branch.nodes)
         branches.append(new_branch)
@@ -154,8 +155,8 @@ def grow_subs(ctx, subs, branches):
     new_subs = []
     for branch in subs:
             grow_sub(ctx, branch, branches, new_subs)
-    for branch in new_subs:
-        grow_branch_until_ended(branch, branches)
+    #for branch in new_subs:
+    #    grow_branch_until_ended(branch, branches)
     return new_subs 
 
 def main():
@@ -172,6 +173,7 @@ def main():
 
         # place seeds 
         branches = []
+
         r, g, b = colorsys.hsv_to_rgb(start_hue, 1.0, 1.0)
         #r, g, b = random_color()
         ctx.set_source_rgb(r, g, b) 
@@ -203,6 +205,10 @@ def main():
                 
                 print(f'iteration {x} done')
                 #surface.write_to_png("out/hyphae.png")  # Output to PNG
+            r, g, b = colorsys.hsv_to_rgb(start_hue - 0.05, 1.0, 0.2)
+            ctx.set_source_rgb(r, g, b)
+            ctx.set_operator(cairo.Operator.DEST_OVER)
+            circle_fill(ctx, 0.5, 0.5, 0.4)
         finally:
             surface.write_to_png(f"out/hyphae_{run}_{rarity}.png")  # Output to PNG
     print(f'run {run} complete')
diff --git a/moon.py b/moon.py
index 5fced55..1430f5a 100755
--- a/moon.py
+++ b/moon.py
@@ -6,10 +6,15 @@ import random
 from utils import circle_fill
 from utils import draw_crater
 from utils import random_color
+from utils import moon_shade
 
-WIDTH, HEIGHT = 1000, 1000
+WIDTH, HEIGHT = 100, 100
 
 def main():
+
+    import sys
+    seed = sys.argv[1]
+    random.seed(seed)
     
     surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, WIDTH, HEIGHT)
     ctx = cairo.Context(surface)
@@ -48,10 +53,10 @@ def main():
 
     # draw "shade" of the phase
     ctx.set_source_rgba(0.1, 0.1, 0.1, 0.95)
-    phase_pos = random.uniform(-0.5, 1.5)
-    circle_fill(ctx, phase_pos, 0.5, 0.5)
-
-    surface.write_to_png("out/moon.png")  # Output to PNG
+    phase_pos = random.uniform(-1.2, 1.2)
+    #circle_fill(ctx, phase_pos, 0.5, 0.5)
+    moon_shade(ctx, phase_pos)
+    surface.write_to_png(f"nft/{seed}_moon.png")  # Output to PNG
 
 if __name__ == '__main__':
     main()
diff --git a/utils.py b/utils.py
index 3469ac3..39be2ba 100644
--- a/utils.py
+++ b/utils.py
@@ -5,7 +5,6 @@ def circle(ctx,x,y,r):
     ctx.arc(x,y,r,0,math.pi*2.)
     ctx.stroke()
 
-
 def circle_fill(ctx,x,y,r):
     ctx.arc(x,y,r,0,math.pi*2.)
     ctx.fill()
@@ -17,6 +16,34 @@ def draw_crater(ctx,x,y,r):
         ctx.arc(x + off_x, y + off_y, r, 0, math.pi*2.)
         ctx.fill()
 
+def moon_shade(ctx, phase, nothern=True):
+    #phase=-0.4
+    #x_max = 0.7 
+    x_max = 1.
+    # the shadow always has to "hug" one side - pick which
+    ctx.move_to(0.5, 0.0)
+    if phase > 0:
+        ctx.curve_to(-0.2, 0, -0.2, 1, 0.5, 1)
+    elif phase < 0: 
+        ctx.curve_to(1.2, 0, 1.2, 1, 0.5, 1)
+    else:
+        return
+    #ctx.close_path()
+    #ctx.fill()
+
+    #ctx.move_to(0.5, 0.0)
+    #ctx.curve_to(x_max*phase, 0.5-(0.5*phase), x_max*phase, 0.5+(0.5*phase), 0.5, 1)
+    #ctx.curve_to(0.5 + (x_max*phase), 0.5+(0.5*phase), 0.5+ (x_max*phase), 0.5-(0.5*phase), 0.5, 0)
+
+    # helper x is the same for both points
+    h_x = abs(x_max * phase)
+    h_y = abs(h_x - 0.5)
+
+    #y_c = (phase * 0.5) 
+    #ctx.curve_to(x_max*phase, 0.5+abs(0.5*phase-0.5), (x_max*phase), 0.5-abs(0.5*phase-0.5), 0.5, 0)
+    ctx.curve_to(h_x, 0.5 + h_y, h_x, 0.5-h_y, 0.5, 0)
+    #ctx.close_path()
+    ctx.fill()
 
 
 def random_color():