fix gui

nerf/gui.py

@@ -35,7 +35,7 @@ def pose(self):
  @property
  def intrinsics(self):
  focal = self.H / (2 * np.tan(np.radians(self.fovy) / 2))
- return np.array([focal, focal, self.H // 2, self.W // 2])
+ return np.array([focal, focal, self.W // 2, self.H // 2])
 
  def orbit(self, dx, dy):
  # rotate along camera up/side axis!

nerf/utils.py

@@ -534,7 +534,7 @@ def train_gui(self, train_loader, step=16):
 
  # mark untrained grid
  if self.global_step == 0:
- self.model.mark_untrained_grid(train_loader.dataset.poses, train_loader.dataset.intrinsic)
+ self.model.mark_untrained_grid(train_loader._data.poses, train_loader._data.intrinsics)
  self.error_map = train_loader._data.error_map
 
  # update grid every 16 steps
@@ -587,11 +587,11 @@ def test_gui(self, pose, intrinsics, W, H, bg_color=None, spp=1, downscale=1):
 
  pose = torch.from_numpy(pose).unsqueeze(0).to(self.device)
 
- rays_o, rays_d, inds = get_rays(pose, self.intrinsics, rH, rW, -1)
+ rays = get_rays(pose, intrinsics, rH, rW, -1)
 
  data = {
- 'rays_o': rays_o,
- 'rays_d': rays_d,
+ 'rays_o': rays['rays_o'],
+ 'rays_d': rays['rays_d'],
  'H': rH,
  'W': rW,
  }

tensoRF/utils.py

@@ -541,7 +541,7 @@ def train_gui(self, train_loader, step=16):
 
  # mark untrained grid
  if self.global_step == 0:
- self.model.mark_untrained_grid(train_loader.dataset.poses, train_loader.dataset.intrinsic)
+ self.model.mark_untrained_grid(train_loader._data.poses, train_loader._data.intrinsics)
  self.error_map = train_loader._data.error_map
 
  # update grid every 16 steps
@@ -594,11 +594,11 @@ def test_gui(self, pose, intrinsics, W, H, bg_color=None, spp=1, downscale=1):
 
  pose = torch.from_numpy(pose).unsqueeze(0).to(self.device)
 
- rays_o, rays_d, inds = get_rays(pose, self.intrinsics, rH, rW, -1)
+ rays = get_rays(pose, intrinsics, rH, rW, -1)
 
  data = {
- 'rays_o': rays_o,
- 'rays_d': rays_d,
+ 'rays_o': rays['rays_o'],
+ 'rays_d': rays['rays_d'],
  'H': rH,
  'W': rW,
  }