diff --git a/generate_sky_masks.py b/generate_sky_masks.py index 6726ad3..6370f30 100644 --- a/generate_sky_masks.py +++ b/generate_sky_masks.py @@ -61,7 +61,6 @@ def extract_sky_mask(network, image_paths, mask_folder): def process_folder(folder_to_process, colmap_img_root, mask_path, pic_ext, verbose=False, batchsize=8, **env): network = prepare_network() folders = [folder_to_process] + list(folder_to_process.walkdirs()) - for folder in folders: mask_folder = mask_path/colmap_img_root.relpathto(folder) @@ -84,7 +83,6 @@ def process_folder(folder_to_process, colmap_img_root, mask_path, pic_ext, verbo del network torch.cuda.empty_cache() - parser = ArgumentParser(description='sky mask generator using ENet trained on cityscapes', formatter_class=ArgumentDefaultsHelpFormatter) @@ -105,3 +103,4 @@ def process_folder(folder_to_process, colmap_img_root, mask_path, pic_ext, verbo file_exts = ['jpg', 'JPG'] process_folder(args.img_dir, args.colmap_img_root, args.mask_root, file_exts, True, args.batchsize) + diff --git a/main_pipeline_no_lidar.py b/main_pipeline_no_lidar.py index 2dc0e62..2ad4f27 100644 --- a/main_pipeline_no_lidar.py +++ b/main_pipeline_no_lidar.py @@ -74,6 +74,7 @@ def main(): if i not in args.skip_step: print_step(i, "First thorough photogrammetry") env["thorough_recon"].makedirs_p() + print(env["video_frame_list_thorough"]) colmap.extract_features(image_list=env["video_frame_list_thorough"], more=args.more_sift_features) colmap.index_images(vocab_tree_output=env["indexed_vocab_tree"], vocab_tree_input=args.vocab_tree) if env["match_method"] == "vocab_tree": diff --git a/pcl_util/pointcloud_subsampler.h b/pcl_util/pointcloud_subsampler.h index 68abcec..f98e0c1 100644 --- a/pcl_util/pointcloud_subsampler.h +++ b/pcl_util/pointcloud_subsampler.h @@ -19,7 +19,7 @@ typename pcl::PointCloud::Ptr filter(typename pcl::PointCloud::P pcl::VoxelGrid vox; vox.setLeafSize (resolution, resolution, resolution); - for (auto it = octree.leaf_begin(); it != octree.leaf_end(); ++it) { + for (auto it = octree.leaf_depth_begin(); it != octree.leaf_depth_end(); ++it) { pcl::octree::OctreeContainerPointIndices& container = it.getLeafContainer(); pcl::IndicesPtr indexVector(new std::vector);