Skip to content

Commit

Permalink
Merge pull request #577 from alicevision/fix/meshroom_photogrammetry_…
Browse files Browse the repository at this point in the history
…inputs

Fix meshroom_photogrammetry inputs
  • Loading branch information
yann-lty authored Aug 8, 2019
2 parents f6f91d2 + 177d47f commit 9612c37
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions bin/meshroom_photogrammetry
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,16 @@ views, intrinsics = [], []
# Build image files list from inputImages arguments
images = [f for f in args.inputImages if multiview.isImageFile(f)]

if os.path.isdir(args.input):
# args.input is a folder: extend images list with images in that folder
images += multiview.findImageFiles(args.input)
elif os.path.isfile(args.input) and os.path.splitext(args.input)[-1] in ('.json', '.sfm'):
# args.input is a sfmData file: setup pre-calibrated views and intrinsics
from meshroom.nodes.aliceVision.CameraInit import readSfMData
views, intrinsics = readSfMData(args.input)
else:
raise RuntimeError(args.input + ': format not supported')
if args.input:
if os.path.isdir(args.input):
# args.input is a folder: extend images list with images in that folder
images += multiview.findImageFiles(args.input)
elif os.path.isfile(args.input) and os.path.splitext(args.input)[-1] in ('.json', '.sfm'):
# args.input is a sfmData file: setup pre-calibrated views and intrinsics
from meshroom.nodes.aliceVision.CameraInit import readSfMData
views, intrinsics = readSfMData(args.input)
else:
raise RuntimeError(args.input + ': format not supported.')

# initialize photogrammetry pipeline
if args.pipeline:
Expand All @@ -106,9 +107,10 @@ else:
graph = multiview.photogrammetry(inputViewpoints=views, inputIntrinsics=intrinsics, output=args.output)
cameraInit = getOnlyNodeOfType(graph, 'CameraInit')

views, intrinsics = cameraInit.nodeDesc.buildIntrinsics(cameraInit, images)
cameraInit.viewpoints.value = views
cameraInit.intrinsics.value = intrinsics
if images:
views, intrinsics = cameraInit.nodeDesc.buildIntrinsics(cameraInit, images)
cameraInit.viewpoints.value = views
cameraInit.intrinsics.value = intrinsics

if args.overrides:
import io
Expand Down

0 comments on commit 9612c37

Please sign in to comment.