Skip to content

Commit a8815c8

Browse files
author
Krister Ljung
committed
Remove some debug printing
1 parent 305837d commit a8815c8

File tree

2 files changed

+25
-10
lines changed

2 files changed

+25
-10
lines changed

lsystem/turtle.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ def set_last_indices(self, indices):
109109
self.last_indices = indices
110110

111111
def finish(self, context):
112-
print("turtle.finish")
113-
print(str(self.pen))
112+
# print("turtle.finish")
113+
# print(str(self.pen))
114114
new_mesh = self.pen.end()
115115
if new_mesh is not None:
116116
self.bmesh.from_mesh(new_mesh)
@@ -166,7 +166,7 @@ def __init__(self, seed):
166166
self.set_interpretation(':', start_object)
167167
self.set_interpretation(';', end_object)
168168
self.set_interpretation('#', fatten)
169-
# self.set_interpretation('%', slink) # todo: should be abscission
169+
# self.set_interpretation('%', slink) # handled in lsystem
170170
self.set_interpretation('s', scale)
171171
self.set_interpretation('p', set_pen)
172172
self.set_interpretation('m', set_material)
@@ -202,9 +202,9 @@ def set_direction(self, direction):
202202
self.transform = util.matmul(self.transform, rot_matrix)
203203

204204
def rotate(self, angle, vector):
205-
print("turtle rotate")
206-
print(str(angle))
207-
print(str(vector))
205+
# print("turtle rotate")
206+
# print(str(angle))
207+
# print(str(vector))
208208
self.transform = util.matmul(self.transform, mathutils.Matrix.Rotation(angle, 4, vector))
209209

210210
def rotate_y(self, angle):
@@ -274,9 +274,9 @@ def scale(self, scaling, bl_obj):
274274

275275
def forward(self, length):
276276
vec = (0.0, 0.0, length)
277-
print("forward")
278-
print(str(vec))
279-
print(str(self.tropism_force))
277+
# print("forward")
278+
# print(str(vec))
279+
# print(str(self.tropism_force))
280280
self.transform = util.matmul(self.transform, mathutils.Matrix.Translation(vec))
281281
if self.tropism_force > 0.0:
282282
loc, rot, sca = self.transform.decompose()

recursive_lsystems_as_custom_interpretation.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ def sphere(turtle, parameters, bl_obj, obj_base_pairs, context):
1818

1919
def leaf(turtle, parameters, bl_obj, obj_base_pairs, context):
2020
# Expect one parameter
21+
22+
# Deselect everything because otherwise the new lsystem will try randomly place the new lsystem on the old lsystem
23+
for ob in bpy.context.selected_objects:
24+
ob.select_set(False)
2125
lex = lsystem.exec.Exec()
2226
lex.set_axiom("p(line)X")
2327
lex.add_rule("X", "FX")
@@ -31,9 +35,20 @@ def leaf(turtle, parameters, bl_obj, obj_base_pairs, context):
3135

3236

3337
def flower(turtle, parameters, bl_obj, obj_base_pairs, context):
34-
pass
38+
for ob in bpy.context.selected_objects:
39+
ob.select_set(False)
40+
lex = lsystem.exec.Exec() # Problem with original lsystem being selected
41+
# todo: add rules and such
42+
lex.min_iterations = int(float(parameters[0]))
43+
lex.exec(context=context)
44+
for obj in lex.objects:
45+
obj.location = lsystem.util.matmul(turtle.transform, mathutils.Vector((0.0, 0.0, 0.0)))
46+
obj.rotation_euler = turtle.transform.to_euler()
47+
obj.parent = bl_obj.object
48+
obj_base_pairs.append((obj, None)) # blender 2.80 specific
3549

3650

51+
# See figure 3.2 in abop, page 69.
3752
ex = lsystem.exec.Exec()
3853
ex.set_axiom("p(subsurf)a(1)")
3954
ex.add_rule("a(t)", "F(1)[&(30)L(0)]/(137.5)a(add(t,1))", "lt(t,7)")

0 commit comments

Comments
 (0)