Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed background image bug. #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed background image bug. #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 29 additions & 22 deletions fspy_blender/addon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,10 @@ def execute(self, context):
self.update_existing_camera,
self.import_background_image
)



def set_up_camera(self, project, update_existing_camera):
def set_up_camera(self, project, update_existing_camera, offset):
"""
Finds or creates a suitable camera and sets its parameters
"""
Expand Down Expand Up @@ -103,23 +105,8 @@ def set_up_camera(self, project, update_existing_camera):
# Set camera transform
camera.matrix_world = mathutils.Matrix(camera_parameters.camera_transfrom)

# Set camera shift (aka principal point)
x_shift_scale = 1
y_shift_scale = 1
if camera_parameters.image_height > camera_parameters.image_width:
x_shift_scale = camera_parameters.image_width / camera_parameters.image_height
else:
y_shift_scale = camera_parameters.image_height / camera_parameters.image_width

pp = camera_parameters.principal_point
pp_rel = [0, 0]
image_aspect = camera_parameters.image_width / camera_parameters.image_height
if image_aspect <= 1:
pp_rel = (0.5 * (pp[0] / image_aspect + 1), 0.5 * (-pp[1] + 1))
else:
pp_rel = (0.5 * (pp[0] + 1), 0.5 * (-pp[1] * image_aspect + 1))
camera.data.shift_x = x_shift_scale * (0.5 - pp_rel[0])
camera.data.shift_y = y_shift_scale * (-0.5 + pp_rel[1])
camera.data.shift_x = offset[0] #x
camera.data.shift_y = offset[1] #y

# Return the configured camera
return camera
Expand All @@ -132,7 +119,7 @@ def set_render_resolution(self, project):
render_settings.resolution_x = project.camera_parameters.image_width
render_settings.resolution_y = project.camera_parameters.image_height

def set_up_3d_area(self, project, camera, update_existing_camera, set_background_image):
def set_up_3d_area(self, project, camera, update_existing_camera, set_background_image, offset):
# Find the first 3D view area and set its background image
for area in bpy.context.screen.areas:
if area.type == 'VIEW_3D':
Expand Down Expand Up @@ -191,7 +178,8 @@ def set_up_3d_area(self, project, camera, update_existing_camera, set_background
img = bpy.data.images.load(tmp_path)
img.name = project.file_name
img.pack()
bg.image = img
bg.image = img
bg.offset = [offset[0]*2,offset[1]*3] # Offset the background image relative to the camera's possible offset.

# Remove temp file
os.remove(tmp_path)
Expand Down Expand Up @@ -255,12 +243,31 @@ def import_fpsy_project(self, context, filepath, update_existing_camera, set_bac
try:
project = fspy.Project(filepath)
try:
camera = self.set_up_camera(project, update_existing_camera)
#Figure out principal points.
camera_parameters = project.camera_parameters

x_shift_scale = 1
y_shift_scale = 1
if camera_parameters.image_height > camera_parameters.image_width:
x_shift_scale = camera_parameters.image_width / camera_parameters.image_height
else:
y_shift_scale = camera_parameters.image_height / camera_parameters.image_width

pp = camera_parameters.principal_point
pp_rel = [0, 0]
image_aspect = camera_parameters.image_width / camera_parameters.image_height
if image_aspect <= 1:
pp_rel = (0.5 * (pp[0] / image_aspect + 1), 0.5 * (-pp[1] + 1))
else:
pp_rel = (0.5 * (pp[0] + 1), 0.5 * (-pp[1] * image_aspect + 1))
offset = [x_shift_scale * (0.5 - pp_rel[0]), y_shift_scale * (-0.5 + pp_rel[1])]

camera = self.set_up_camera(project, update_existing_camera, offset)
except Exception as e:
self.report({ 'ERROR' }, str(e))
return { 'CANCELLED' }
self.set_render_resolution(project)
self.set_up_3d_area(project, camera, update_existing_camera, set_background_image)
self.set_up_3d_area(project, camera, update_existing_camera, set_background_image, offset)
self.set_reference_distance_unit(project, camera)
self.report({ 'INFO' }, "Finished setting up camera '" + project.file_name + "'")
return {'FINISHED'}
Expand Down