diff --git a/scripts/mvstex.py b/scripts/mvstex.py index 94e81ded..fa860995 100644 --- a/scripts/mvstex.py +++ b/scripts/mvstex.py @@ -40,11 +40,11 @@ class ODMMvsTexCell(ecto.Cell): system.mkdir_p(tree.odm_texturing) # check if we rerun cell or not - rerun_cell = (args['rerun'] is not None and - args['rerun'] == 'mvs_texturing') or \ - (args['rerun_all']) or \ - (args['rerun_from'] is not None and - 'mvs_texturing' in args['rerun_from']) + rerun_cell = (args.rerun is not None and + args.rerun == 'mvs_texturing') or \ + (args.rerun_all) or \ + (args.rerun_from is not None and + 'mvs_texturing' in args.rerun_from) if not io.file_exists(tree.odm_textured_model_obj) or rerun_cell: log.ODM_DEBUG('Writing MVS Textured file in: %s' @@ -104,8 +104,8 @@ class ODMMvsTexCell(ecto.Cell): log.ODM_WARNING('Found a valid ODM Texture file in: %s' % tree.odm_textured_model_obj) - if args['time']: + if args.time: system.benchmark(start_time, tree.benchmarking, 'Texturing') - log.ODM_INFO('Running OMD Texturing Cell - Finished') - return ecto.OK if args['end_with'] != 'odm_texturing' else ecto.QUIT + log.ODM_INFO('Running ODM Texturing Cell - Finished') + return ecto.OK if args.end_with != 'odm_texturing' else ecto.QUIT 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),