diff --git a/drzewo.lpy b/drzewo.lpy index 47dd2c5..75821cf 100644 --- a/drzewo.lpy +++ b/drzewo.lpy @@ -29,7 +29,7 @@ B(x,k): C(x,k): r = random.random() if x <= 3: - produce F(0.6)C(x+1,k+1);(2)&(r*200)Leaf() + produce F(0.6)C(x+1,k+1);(2)Leaf() Leaf(): produce Sweep(path,section,length,dl,globalwidth,leafwidth) @@ -66,7 +66,7 @@ def __initialiseContext__(context): ) treepath.name = "treepath" finish = pgl.BezierCurve2D( - pgl.Point3Array([(-0.465217, 0.00434783, 1),(-0.310145, 0.0826087, 1),(-0.324638, 0.456522, 1),(-0.408696, 0.669565, 1)]) , + pgl.Point3Array([(-0.465217, 0.00434783, 1),(-0.310145, 0.0826087, 1),(-0.324638, 0.456522, 1),(-0.34633, 0.672535, 1)]) , ) finish.name = "finish" treepath2 = pgl.NurbsCurve2D( diff --git a/drzewo.lpy~ b/drzewo.lpy~ index eb4155f..47dd2c5 100644 --- a/drzewo.lpy~ +++ b/drzewo.lpy~ @@ -12,7 +12,7 @@ Axiom: SetGuide(treepath,90)_(1)@GsG(0.5)A(1,0.30) derivation length: 100 production: A(x,k) : - if k < 4: + if k < 3.5: if x <= 7: produce /(96)F(0.7,1-k/5)A(x+1,k+0.01) elif x <= 14: @@ -20,7 +20,8 @@ A(x,k) : else: x = 0 produce A(x+1,k+0.01) - + elif k < 4: + produce /(degree)F(0.7,1-k/5)[SetGuide(finish,8)_(0.2)&(90)-(60)B(1,k)]A(x+1,k+0.1) B(x,k): r = random.random() if x <= 20: @@ -64,17 +65,22 @@ def __initialiseContext__(context): ctrlPointList = pgl.Point3Array([(-0.5, 0, 1),(-0.238627, 0.00619407, 1),(-0.07298, -0.00805499, 1),(0.0491646, 0.0141531, 1),(0.234358, -9.59484e-005, 1),(0.398942, -0.00805499, 1),(0.565017, -0.00943561, 1)]) , ) treepath.name = "treepath" + finish = pgl.BezierCurve2D( + pgl.Point3Array([(-0.465217, 0.00434783, 1),(-0.310145, 0.0826087, 1),(-0.324638, 0.456522, 1),(-0.408696, 0.669565, 1)]) , + ) + finish.name = "finish" treepath2 = pgl.NurbsCurve2D( ctrlPointList = pgl.Point3Array([(-0.00917746, 0.0133432, 1),(0.72348, 1.57179, 1),(3.10364, 2.97222, 1),(3.50129, 4.69656, 1),(3.82637, 6.13593, 1)]) , ) treepath2.name = "treepath2" - panel_0 = ({'active': True, 'visible': True, 'name': 'Panel 1'},[('Curve2D',path),('Curve2D',section),('Function',leafwidth),('Curve2D',treepath),('Curve2D',treepath2)]) + panel_0 = ({'active': True, 'visible': True, 'name': 'Panel 1'},[('Curve2D',path),('Curve2D',section),('Function',leafwidth),('Curve2D',treepath),('Curve2D',finish),('Curve2D',treepath2)]) parameterset = [panel_0,] context["__functions__"] = [('leafwidth',leafwidth),] - context["__curves__"] = [('path',path),('section',section),('treepath',treepath),('treepath2',treepath2),] + context["__curves__"] = [('path',path),('section',section),('treepath',treepath),('finish',finish),('treepath2',treepath2),] context["__parameterset__"] = parameterset context["path"] = path context["section"] = section context["leafwidth"] = pgl.QuantisedFunction(leafwidth) context["treepath"] = treepath + context["finish"] = finish context["treepath2"] = treepath2