[Bf-blender-cvs] [b0ec5c72e62] usd-importer-T81257: USD importer: read camera attributes.

[Michael A. Kowalski]

Commit: b0ec5c72e626935ca562c1fa900d608bb59a08d4
Author: Michael A. Kowalski
Date:   Thu Nov 12 21:01:48 2020 -0500
Branches: usd-importer-T81257
https://developer.blender.org/rBb0ec5c72e626935ca562c1fa900d608bb59a08d4

USD importer: read camera attributes.

Finished logic for reading camera data.
Requires further testing.

===================================================================

M	source/blender/io/usd/import/usd_reader_camera.cc

===================================================================

diff --git a/source/blender/io/usd/import/usd_reader_camera.cc b/source/blender/io/usd/import/usd_reader_camera.cc
index 4f774bc69ad..092021137e7 100644
--- a/source/blender/io/usd/import/usd_reader_camera.cc
+++ b/source/blender/io/usd/import/usd_reader_camera.cc
@@ -70,17 +70,35 @@ void USDCameraReader::create_object(Main *bmain, double time)
     std::cerr << "Warning: couldn't determine camera name for " << this->prim_path() << std::endl;
   }
 
+  /* TODO(makowalski): The following application of
+   * settings is taken from the ABC importer.  Verify
+   * that this logic makes sense for USD. */
+
   Camera *bcam = static_cast<Camera *>(BKE_camera_add(bmain, cam_name.c_str()));
 
   pxr::GfCamera usd_cam = camera_.GetCamera(time);
 
+  const float apperture_x = usd_cam.GetHorizontalAperture();
+  const float apperture_y = usd_cam.GetVerticalAperture();
+  const float h_film_offset = usd_cam.GetHorizontalApertureOffset();
+  const float v_film_offset = usd_cam.GetVerticalApertureOffset();
+  const float film_aspect = apperture_x / apperture_y;
+
   bcam->lens = usd_cam.GetFocalLength();
 
-  pxr::GfRange1f usd_clip_range = usd_cam.GetClippingRange();
+  bcam->sensor_x = apperture_x;
+  bcam->sensor_y = apperture_y;
 
+  bcam->shiftx = h_film_offset / apperture_x;
+  bcam->shifty = v_film_offset / apperture_y / film_aspect;
+
+  pxr::GfRange1f usd_clip_range = usd_cam.GetClippingRange();
   bcam->clip_start = usd_clip_range.GetMin();
   bcam->clip_end = usd_clip_range.GetMax();
 
+  bcam->dof.focus_distance = usd_cam.GetFocusDistance();
+  bcam->dof.aperture_fstop = usd_cam.GetFStop();
+
   this->object_->data = bcam;
 }