solve merge
This commit is contained in:
@@ -85,6 +85,7 @@ class StrategyGenerator(Runner):
|
||||
pts_path = os.path.join(root,scene_name, "pts", f"{frame_idx}.npy")
|
||||
nrm_path = os.path.join(root,scene_name, "nrm", f"{frame_idx}.npy")
|
||||
idx_path = os.path.join(root,scene_name, "scan_points_indices", f"{frame_idx}.npy")
|
||||
|
||||
pts = np.load(pts_path)
|
||||
if self.compute_with_normal:
|
||||
if pts.shape[0] == 0:
|
||||
@@ -92,11 +93,18 @@ class StrategyGenerator(Runner):
|
||||
else:
|
||||
nrm = np.load(nrm_path)
|
||||
nrm_list.append(nrm)
|
||||
<<<<<<< HEAD
|
||||
|
||||
pts_list.append(pts)
|
||||
|
||||
indices = np.load(idx_path)
|
||||
|
||||
=======
|
||||
|
||||
indices = np.load(idx_path)
|
||||
pts_list.append(pts)
|
||||
|
||||
>>>>>>> a883a31968b668a26545f2e8766179365308b0e2
|
||||
scan_points_indices_list.append(indices)
|
||||
if pts.shape[0] > 0:
|
||||
non_zero_cnt += 1
|
||||
|
Reference in New Issue
Block a user