Fix: untwine support

pull/136/head
Piero Toffanin 2020-12-08 09:49:49 -05:00
rodzic 6be5efea97
commit b0556f1b3a
1 zmienionych plików z 14 dodań i 3 usunięć

Wyświetl plik

@ -19,7 +19,7 @@ script_path=$(realpath $(dirname "$0"))
cd "$script_path/../$1" cd "$script_path/../$1"
echo "Postprocessing: $(pwd)" echo "Postprocessing: $(pwd)"
# Generate point cloud (if entwine or potreeconverter is available) # Generate point cloud (if entwine, untwine or potreeconverter is available)
pointcloud_input_path="" pointcloud_input_path=""
for path in "odm_georeferencing/odm_georeferenced_model.laz" \ for path in "odm_georeferencing/odm_georeferenced_model.laz" \
"odm_georeferencing/odm_georeferenced_model.las" \ "odm_georeferencing/odm_georeferenced_model.las" \
@ -50,7 +50,18 @@ if [ ! -z "$pointcloud_input_path" ]; then
fi fi
fi fi
if hash entwine 2>/dev/null; then if hash untwine 2>/dev/null; then
if [ ! -e "entwine_pointcloud" ]; then
untwine --temp_dir "entwine_pointcloud-tmp" --files "$pointcloud_input_path" --output_dir entwine_pointcloud
else
echo "Entwine point cloud is already built."
fi
# Cleanup
if [ -e "entwine_pointcloud-tmp" ]; then
rm -fr "entwine_pointcloud-tmp"
fi
elif hash entwine 2>/dev/null; then
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 entwine build --threads $(nproc) --tmp "entwine_pointcloud-tmp" -i "$pointcloud_input_path" -o entwine_pointcloud
else else
@ -60,7 +71,7 @@ if [ ! -z "$pointcloud_input_path" ]; then
# Cleanup # Cleanup
if [ -e "entwine_pointcloud-tmp" ]; then if [ -e "entwine_pointcloud-tmp" ]; then
rm -fr "entwine_pointcloud-tmp" rm -fr "entwine_pointcloud-tmp"
fi fi
else else
echo "Entwine is not installed, checking if PotreeConverter is available instead..." echo "Entwine is not installed, checking if PotreeConverter is available instead..."
if hash PotreeConverter 2>/dev/null; then if hash PotreeConverter 2>/dev/null; then