Fix other shade type generation.

src/product_gen/generate_shades.py

@@ -141,7 +141,11 @@ def generate_cone_shade(radius1, radius2, depth):
     bpy.ops.object.mode_set(mode='OBJECT')
     return cone
 
-def generate_mesh_shade(radius1, radius2, depth):
+def generate_mesh_shade(shape_parameters):
+
+    radius1 = shape_parameters["radius"]
+    depth = shape_parameters["height"]
+    radius2 = shape_parameters["fixture_radius"]
     
     bpy.ops.mesh.primitive_cube_add(radius=radius1)
     cube = bpy.data.objects["Cube"]
@@ -218,7 +222,11 @@ def make_square_ring(radius, depth, thickness):
     bpy.ops.object.mode_set(mode='OBJECT')
     return bpy.data.objects["square_ring"]   
 
-def generate_led_shade(radius1, radius2, depth):
+def generate_led_shade(shape_parameters):
+
+    radius1 = shape_parameters["radius"]
+    depth = shape_parameters["height"]
+    radius2 = shape_parameters["fixture_radius"]
     
     ring1 = make_square_ring(3.0*radius1, depth/10.0, 0.2)
     bpy.ops.transform.rotate(value=-math.pi/12.0, axis=(1.0,0.0,0.0))

src/utility/test456/test456.json

@@ -1 +1 @@
-{"style": "light", "division_radii": [0.16451120949404027, 0.23096033701138935, 0.305533414672969, 0.7390854533319504], "height": 3.3522235508986156, "output": "test456", "division_offsets": [0.25, 0.25, 0.25, 0.25], "radius": 2.917962292483968, "shape": "cone", "division_patterns": ["square", "inv_ramp", "inv_square", "ramp"], "fixture_radius": 0.3}
+{"fixture_radius": 0.3, "output": "test456", "radius": 1.8287633826475211, "height": 3.910662786988026, "division_patterns": ["ramp", "sine", "sine", "inv_sine"], "division_radii": [0.4473225094039008, 0.5963619022128677, 0.7765883654637191, 0.889395569488088], "division_offsets": [0.25, 0.25, 0.25, 0.25], "style": "billard", "shape": "bio"}