Changes for new split-merge point cloud merging logic

pull/99/head
Piero Toffanin 2019-10-29 15:24:11 -04:00
rodzic 488ba227d8
commit 865fcb883b
1 zmienionych plików z 4 dodań i 11 usunięć

Wyświetl plik

@ -71,12 +71,6 @@ for path in "odm_georeferencing/odm_georeferenced_model.laz" \
fi fi
done done
# Never generate point cloud tiles with split-merge workflows
if [ -e "submodels" ] && [ -e "entwine_pointcloud" ]; then
pointcloud_input_path=""
echo "Split-merge dataset with point cloud detected. No need to regenerate point cloud tiles."
fi
if [ ! -z "$pointcloud_input_path" ]; then if [ ! -z "$pointcloud_input_path" ]; then
# Convert the failsafe PLY point cloud to laz in odm_georeferencing # Convert the failsafe PLY point cloud to laz in odm_georeferencing
# if necessary, otherwise it will not get zipped # if necessary, otherwise it will not get zipped
@ -93,13 +87,12 @@ if [ ! -z "$pointcloud_input_path" ]; then
fi fi
if hash entwine 2>/dev/null; then if hash entwine 2>/dev/null; then
# Optionally cleanup previous results (from a restart) if [ ! -e "entwine_pointcloud" ]; then
if [ -e "entwine_pointcloud" ]; then entwine build --threads $(nproc) --tmp "entwine_pointcloud-tmp" -i "$pointcloud_input_path" -o entwine_pointcloud
rm -fr "entwine_pointcloud" else
echo "Entwine point cloud is already built."
fi fi
entwine build --threads $(nproc) --tmp "entwine_pointcloud-tmp" -i "$pointcloud_input_path" -o entwine_pointcloud
# Cleanup # Cleanup
if [ -e "entwine_pointcloud-tmp" ]; then if [ -e "entwine_pointcloud-tmp" ]; then
rm -fr "entwine_pointcloud-tmp" rm -fr "entwine_pointcloud-tmp"