diff --git a/stages/mvstex.py b/stages/mvstex.py index fe90332d..f8a6b81e 100644 --- a/stages/mvstex.py +++ b/stages/mvstex.py @@ -79,11 +79,11 @@ class ODMMvsTexStage(types.ODM_Stage): keepUnseenFaces = "" nadir = "" - if (self.params.get('skip_glob_seam_leveling')): + if args.texturing_skip_global_seam_leveling: skipGlobalSeamLeveling = "--skip_global_seam_leveling" - if (self.params.get('skip_loc_seam_leveling')): + if args.texturing_skip_local_seam_leveling: skipLocalSeamLeveling = "--skip_local_seam_leveling" - if (self.params.get('keep_unseen_faces')): + if args.texturing_keep_unseen_faces: keepUnseenFaces = "--keep_unseen_faces" if (r['nadir']): nadir = '--nadir_mode' @@ -93,12 +93,12 @@ class ODMMvsTexStage(types.ODM_Stage): 'bin': context.mvstex_path, 'out_dir': os.path.join(r['out_dir'], "odm_textured_model_geo"), 'model': r['model'], - 'dataTerm': self.params.get('data_term'), - 'outlierRemovalType': self.params.get('outlier_rem_type'), + 'dataTerm': args.texturing_data_term, + 'outlierRemovalType': args.texturing_outlier_removal_type, 'skipGlobalSeamLeveling': skipGlobalSeamLeveling, 'skipLocalSeamLeveling': skipLocalSeamLeveling, 'keepUnseenFaces': keepUnseenFaces, - 'toneMapping': self.params.get('tone_mapping'), + 'toneMapping': args.texturing_tone_mapping, 'nadirMode': nadir, 'maxTextureSize': '--max_texture_size=%s' % max_texture_size, 'nvm_file': r['nvm_file'], diff --git a/stages/odm_app.py b/stages/odm_app.py index 2620e375..e05db6f2 100644 --- a/stages/odm_app.py +++ b/stages/odm_app.py @@ -49,13 +49,7 @@ class ODMApp: point_weight=4.0, max_concurrency=args.max_concurrency, verbose=args.verbose) - texturing = ODMMvsTexStage('mvs_texturing', args, progress=70.0, - data_term=args.texturing_data_term, - outlier_rem_type=args.texturing_outlier_removal_type, - skip_glob_seam_leveling=args.texturing_skip_global_seam_leveling, - skip_loc_seam_leveling=args.texturing_skip_local_seam_leveling, - keep_unseen_faces=args.texturing_keep_unseen_faces, - tone_mapping=args.texturing_tone_mapping) + texturing = ODMMvsTexStage('mvs_texturing', args, progress=70.0) georeferencing = ODMGeoreferencingStage('odm_georeferencing', args, progress=80.0, gcp_file=args.gcp, verbose=args.verbose)