From 32322161ebbc94303a3cf3752e637fd142f25d8b Mon Sep 17 00:00:00 2001 From: Stephen Mather Date: Mon, 3 Dec 2018 04:31:04 +0000 Subject: [PATCH] full removal of smvs Former-commit-id: ae3221aa8b04a376b278176e76f106ed634659d6 --- README.md | 2 +- SuperBuild/CMakeLists.txt | 14 +------------- opendm/config.py | 35 ----------------------------------- 3 files changed, 2 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index 98d4f0a6..1515a69d 100644 --- a/README.md +++ b/README.md @@ -199,7 +199,7 @@ If you want to get all intermediate outputs, run the following command: -v "$(pwd)/odm_orthophoto:/code/odm_orthophoto" \ -v "$(pwd)/odm_texturing:/code/odm_texturing" \ -v "$(pwd)/opensfm:/code/opensfm" \ - -v "$(pwd)/smvs:/code/smvs" \ + -v "$(pwd)/mve:/code/mve" \ opendronemap/opendronemap To pass in custom parameters to the run.py script, simply pass it as arguments to the `docker run` command. For example: diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index b2a37142..07a82e48 100644 --- a/SuperBuild/CMakeLists.txt +++ b/SuperBuild/CMakeLists.txt @@ -128,7 +128,7 @@ foreach(lib ${custom_libs}) SETUP_EXTERNAL_PROJECT_CUSTOM(${lib}) endforeach() -## Add smvs Build +## Add mve Build externalproject_add(mve GIT_REPOSITORY https://github.com/simonfuhrmann/mve.git @@ -141,18 +141,6 @@ externalproject_add(mve INSTALL_COMMAND "" ) -#externalproject_add(smvs -# DEPENDS mve -# GIT_REPOSITORY https://github.com/flanggut/smvs.git -# GIT_TAG 6a7d0c095aa66ab98c5b285c2bc04e34d8993353 -# UPDATE_COMMAND "" -# SOURCE_DIR ${SB_SOURCE_DIR}/elibs/smvs -# CONFIGURE_COMMAND "" -# BUILD_IN_SOURCE 1 -# BUILD_COMMAND make -# INSTALL_COMMAND "" -#) - externalproject_add(poissonrecon GIT_REPOSITORY https://github.com/mkazhdan/PoissonRecon.git GIT_TAG ce5005ae3094d902d551a65a8b3131e06f45e7cf diff --git a/opendm/config.py b/opendm/config.py index 2fdb0e6c..db09d5ba 100644 --- a/opendm/config.py +++ b/opendm/config.py @@ -211,41 +211,6 @@ def config(): 'resizes images when necessary, resulting in faster processing and ' 'lower memory usage. Since GSD is an estimate, sometimes ignoring it can result in slightly better image output quality.') - parser.add_argument('--smvs-alpha', - metavar='', - default=1.0, - type=float, - help='Regularization parameter, a higher alpha leads to ' - 'smoother surfaces. Default: %(default)s') - - parser.add_argument('--smvs-output-scale', - metavar='', - default=1, - type=int, - help='The scale of the optimization - the ' - 'finest resolution of the bicubic patches will have the' - ' size of the respective power of 2 (e.g. 2 will ' - 'optimize patches covering down to 4x4 pixels). ' - 'Default: %(default)s') - - parser.add_argument('--smvs-enable-shading', - action='store_true', - default=False, - help='Use shading-based optimization. This model cannot ' - 'handle complex scenes. Try to supply linear images to ' - 'the reconstruction pipeline that are not tone mapped ' - 'or altered as this can also have very negative effects ' - 'on the reconstruction. If you have simple JPGs with SRGB ' - 'gamma correction you can remove it with the --smvs-gamma-srgb ' - 'option. Default: %(default)s') - - parser.add_argument('--smvs-gamma-srgb', - action='store_true', - default=False, - help='Apply inverse SRGB gamma correction. To be used ' - 'with --smvs-enable-shading when you have simple JPGs with ' - 'SRGB gamma correction. Default: %(default)s') - parser.add_argument('--mesh-size', metavar='', default=100000,