diff --git a/src/product_gen/__pycache__/generate_shades.cpython-35.pyc b/src/product_gen/__pycache__/generate_shades.cpython-35.pyc index ed5de12..9b9e0e2 100644 Binary files a/src/product_gen/__pycache__/generate_shades.cpython-35.pyc and b/src/product_gen/__pycache__/generate_shades.cpython-35.pyc differ diff --git a/src/product_gen/generate_shades.py b/src/product_gen/generate_shades.py index 30a52af..2227929 100644 --- a/src/product_gen/generate_shades.py +++ b/src/product_gen/generate_shades.py @@ -141,8 +141,12 @@ 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"] cube.name = "shade" @@ -218,8 +222,12 @@ 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)) diff --git a/src/utility/test456/test456.blend b/src/utility/test456/test456.blend index facf2ee..6e41ead 100644 Binary files a/src/utility/test456/test456.blend and b/src/utility/test456/test456.blend differ diff --git a/src/utility/test456/test456.blend1 b/src/utility/test456/test456.blend1 index 90f4b1c..293964a 100644 Binary files a/src/utility/test456/test456.blend1 and b/src/utility/test456/test456.blend1 differ diff --git a/src/utility/test456/test456.json b/src/utility/test456/test456.json index 024db76..7b16115 100644 --- a/src/utility/test456/test456.json +++ b/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} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/src/utility/test456/test456.png b/src/utility/test456/test456.png index 1009722..b23df6e 100644 Binary files a/src/utility/test456/test456.png and b/src/utility/test456/test456.png differ