Skip to content

fix: Obj2Tiles support --y-up-to-z-up parameter #2016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
itfsw wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Obj2Tiles support --y-up-to-z-up parameter #2016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions opendm/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,12 @@ def config(argv=None, parser=None):
default=False,
help='Generate OGC 3D Tiles outputs. Default: %(default)s')

parser.add_argument('--3d-tiles-y-up-to-z-up',
action=StoreTrue,
nargs=0,
default=False,
help='Generate OGC 3D Tiles outputs, Converts Y-up to Z-up. Default: %(default)s')

parser.add_argument('--rolling-shutter',
action=StoreTrue,
nargs=0,
Expand Down
11 changes: 8 additions & 3 deletions opendm/ogctiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import fiona
from shapely.geometry import shape

def build_textured_model(input_obj, output_path, reference_lla = None, model_bounds_file=None, rerun=False):
def build_textured_model(args, input_obj, output_path, reference_lla = None, model_bounds_file=None, rerun=False):
if not os.path.isfile(input_obj):
log.ODM_WARNING("No input OBJ file to process")
return
Expand Down Expand Up @@ -64,7 +64,12 @@ def build_textured_model(input_obj, output_path, reference_lla = None, model_bou
'lon': lon,
'alt': alt,
}
system.run('Obj2Tiles "{input}" "{output}" --divisions {divisions} --lat {lat} --lon {lon} --alt {alt} '.format(**kwargs))
cmd = 'Obj2Tiles "{input}" "{output}" --divisions {divisions} --lat {lat} --lon {lon} --alt {alt} '.format(**kwargs)

if getattr(args, '3d_tiles_y_up_to_z_up'):
cmd += ' --y-up-to-z-up'

system.run(cmd)

except Exception as e:
log.ODM_WARNING("Cannot build 3D tiles textured model: %s" % str(e))
Expand Down Expand Up @@ -123,7 +128,7 @@ def build_3dtiles(args, tree, reconstruction, rerun=False):
if not os.path.isfile(input_obj):
input_obj = os.path.join(tree.odm_25dtexturing, tree.odm_textured_model_obj)

build_textured_model(input_obj, model_output_path, reference_lla, model_bounds_file, rerun)
build_textured_model(args, input_obj, model_output_path, reference_lla, model_bounds_file, rerun)
else:
log.ODM_WARNING("OGC 3D Tiles model %s already generated" % model_output_path)

Expand Down