Cameras pr followup (nerfstudio-project#622)

cameras manual indexing bug in datamanager
chris838 · Oct 3, 2022 · 4533c7d · 4533c7d
1 parent e3eb323
commit 4533c7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/nerfstudio/cameras/cameras.py b/nerfstudio/cameras/cameras.py
@@ -401,7 +401,7 @@ def rescale_output_resolution(self, scaling_factor: Union[TensorType["num_camera
             scaling_factor: Scaling factor to apply to the output resolution.
         """
         if isinstance(scaling_factor, float):
-            scaling_factor = torch.tensor([scaling_factor]).broadcast_to((self.size))
+            scaling_factor = torch.tensor([scaling_factor]).to(self.device).broadcast_to((self.size))
 
         self.fx = self.fx * scaling_factor
         self.fy = self.fy * scaling_factor

diff --git a/nerfstudio/data/utils/dataloaders.py b/nerfstudio/data/utils/dataloaders.py
@@ -141,13 +141,15 @@ def get_camera(self, image_idx: int = 0) -> Cameras:
             distortion_params = self.cameras.distortion_params[image_idx]
 
         camera = Cameras(
-            fx=self.cameras.fx if isinstance(self.cameras.fx, float) else self.cameras.fx[image_idx : image_idx + 1],
-            fy=self.cameras.fy if isinstance(self.cameras.fy, float) else self.cameras.fy[image_idx : image_idx + 1],
-            cx=self.cameras.cx,
-            cy=self.cameras.cy,
+            fx=self.cameras.fx[image_idx : image_idx + 1],
+            fy=self.cameras.fy[image_idx : image_idx + 1],
+            cx=self.cameras.cx[image_idx : image_idx + 1],
+            cy=self.cameras.cy[image_idx : image_idx + 1],
+            height=self.cameras.image_height[image_idx : image_idx + 1],
+            width=self.cameras.image_width[image_idx : image_idx + 1],
             camera_to_worlds=self.cameras.camera_to_worlds[image_idx : image_idx + 1],
             distortion_params=distortion_params,
-            camera_type=self.cameras.camera_type,
+            camera_type=self.cameras.camera_type[image_idx : image_idx + 1],
         )
         return camera