diff --git a/src/rendering/__pycache__/setup_scene.cpython-35.pyc b/src/rendering/__pycache__/setup_scene.cpython-35.pyc index c5e1022..d289391 100644 Binary files a/src/rendering/__pycache__/setup_scene.cpython-35.pyc and b/src/rendering/__pycache__/setup_scene.cpython-35.pyc differ diff --git a/src/rendering/setup_scene.py b/src/rendering/setup_scene.py index 669513e..bbf8c70 100644 --- a/src/rendering/setup_scene.py +++ b/src/rendering/setup_scene.py @@ -35,13 +35,13 @@ def setup_scene(shape_parameters): bpy.context.active_object.data.materials.append(mat) # Set up cameras - bpy.data.objects["Camera"].location = (10.0, 0.0, -4) + bpy.data.objects["Camera"].location = (8.5, 0.0, -2) fov = 65.0 bpy.data.objects["Camera"].data.angle = fov*(math.pi/180.0) bpy.data.objects["Camera"].rotation_mode = 'XYZ' - bpy.data.objects["Camera"].rotation_euler[0] = math.pi/2.0 + bpy.data.objects["Camera"].rotation_euler[0] = 1.5 bpy.data.objects["Camera"].rotation_euler[1] = 0.0 - bpy.data.objects["Camera"].rotation_euler[2] = math.pi/2.0 + bpy.data.objects["Camera"].rotation_euler[2] = 1.5708 # Lamps bpy.data.scenes['Scene'].objects.unlink(bpy.data.objects["Lamp"]) @@ -69,9 +69,13 @@ def setup_scene(shape_parameters): bpy.context.active_object.data.materials.append(mat) bpy.ops.mesh.primitive_plane_add(radius=5, location=(10.0, 10.0, -5.0)) - bpy.ops.transform.rotate(value=-math.pi/2.0, axis=(1.0,2.0,0.0)) - bpy.ops.transform.rotate(value=-math.pi/4.0, axis=(0.0,0.0,1.0)) + #bpy.ops.transform.rotate(value=-math.pi/2.0, axis=(1.0,2.0,0.0)) + #bpy.ops.transform.rotate(value=-math.pi/4.0, axis=(0.0,0.0,1.0)) bpy.data.objects["Plane"].name = "fill_lamp" + bpy.data.objects["fill_lamp"].location = (10.0, 10.0, -5.0) + bpy.data.objects["fill_lamp"].rotation_euler[0] = 0.6454 + bpy.data.objects["fill_lamp"].rotation_euler[1] = 0.7169 + bpy.data.objects["fill_lamp"].rotation_euler[2] = 0.0000 mat = bpy.data.materials.get("fill-material") if mat is None: diff --git a/test/test/test.blend b/test/test/test.blend index 8169a4c..0261bf9 100644 Binary files a/test/test/test.blend and b/test/test/test.blend differ diff --git a/test/test/test.blend1 b/test/test/test.blend1 index 4da8827..e10dd86 100644 Binary files a/test/test/test.blend1 and b/test/test/test.blend1 differ diff --git a/test/test/test.json b/test/test/test.json index fc772b5..92094a2 100644 --- a/test/test/test.json +++ b/test/test/test.json @@ -1 +1 @@ -{"division_offsets": [0.25, 0.25, 0.25, 0.25], "radius": 0.5151794595751276, "height": 4.115548193330971, "division_patterns": ["inv_square", "inv_square", "square", "inv_sine"], "shape": "pendant", "style": "light", "division_radii": [0.9221841829622927, 0.9489520915432629, 0.9897309968469092, 0.994921834206689], "fixture_radius": 0.3} \ No newline at end of file +{"shape": "pendant", "division_offsets": [0.25, 0.25, 0.25, 0.25], "height": 3.6812407081509724, "fixture_radius": 0.3, "division_radii": [0.294556044831744, 0.587752251293952, 0.8598310084103927, 0.9056905517274985], "division_patterns": ["ramp", "ramp", "ramp", "sine"], "radius": 2.2969131039025945, "style": "billard"} \ No newline at end of file diff --git a/test/test/test.png b/test/test/test.png index 050ef54..ea56682 100644 Binary files a/test/test/test.png and b/test/test/test.png differ