From c91b7cb2ab48bbf058fc1c1b6f9b3b6eee1e04c3 Mon Sep 17 00:00:00 2001 From: Dakota Benjamin Date: Thu, 30 Jun 2016 08:53:50 -0400 Subject: [PATCH] Move texturing cell to correct line --- scripts/odm_app.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/scripts/odm_app.py b/scripts/odm_app.py index 7b6ce793..008049a9 100644 --- a/scripts/odm_app.py +++ b/scripts/odm_app.py @@ -45,16 +45,6 @@ class ODMApp(ecto.BlackBox): feature_process_size=p.args.resize_to, feature_min_frames=p.args.min_num_features, processes=context.num_cores, - 'texturing': ODMMvsTexCell(data_term=p.args.mvs_texturing_dataTerm, - outlier_rem_type=p.args.mvs_texturing_outlierRemovalType, - skip_vis_test=p.args.mvs_texturing_skipGeometricVisibilityTest, - skip_glob_seam_leveling=p.args.mvs_texturing_skipGlobalSeamLeveling, - skip_loc_seam_leveling=p.args.mvs_texturing_skipLocalSeamLeveling, - skip_hole_fill=p.args.mvs_texturing_skipHoleFilling, - keep_unseen_faces=p.args.mvs_texturing_keepUnseenFaces), -# Old odm_texturing -# 'texturing': ODMTexturingCell(resize=p.args['resize_to'], -# resolution=p.args['odm_texturing_textureResolution'], matching_gps_neighbors=p.args.matcher_neighbors, matching_gps_distance=p.args.matcher_distance), 'cmvs': ODMCmvsCell(max_images=p.args.cmvs_maxImages), @@ -68,9 +58,16 @@ class ODMApp(ecto.BlackBox): oct_tree=p.args.odm_meshing_octreeDepth, samples=p.args.odm_meshing_samplesPerNode, solver=p.args.odm_meshing_solverDivide), - 'texturing': ODMTexturingCell(resize=p.args.resize_to, - resolution=p.args.odm_texturing_textureResolution, - size=p.args.odm_texturing_textureWithSize), + 'texturing': ODMMvsTexCell(data_term=p.args.mvs_texturing_dataTerm, + outlier_rem_type=p.args.mvs_texturing_outlierRemovalType, + skip_vis_test=p.args.mvs_texturing_skipGeometricVisibilityTest, + skip_glob_seam_leveling=p.args.mvs_texturing_skipGlobalSeamLeveling, + skip_loc_seam_leveling=p.args.mvs_texturing_skipLocalSeamLeveling, + skip_hole_fill=p.args.mvs_texturing_skipHoleFilling, + keep_unseen_faces=p.args.mvs_texturing_keepUnseenFaces), +# Old odm_texturing +# 'texturing': ODMTexturingCell(resize=p.args['resize_to'], +# resolution=p.args['odm_texturing_textureResolution'], 'georeferencing': ODMGeoreferencingCell(img_size=p.args.resize_to, gcp_file=p.args.odm_georeferencing_gcpFile, use_gcp=p.args.odm_georeferencing_useGcp),