Skip to content

Commit e04ad8a

Browse files
author
Fabien Servant
committed
Update all nodes to output usda file format sfmData
1 parent fd283da commit e04ad8a

36 files changed

Lines changed: 44 additions & 44 deletions

meshroom/aliceVision/AddPoseNoise.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class AddPoseNoise(desc.AVCommandLineNode):
5656
name="output",
5757
label="SfMData",
5858
description="Path to the output SfMData file.",
59-
value="{nodeCacheFolder}/sfmFiltered.abc",
59+
value="{nodeCacheFolder}/sfmFiltered.usda",
6060
),
6161
desc.File(
6262
name="outputViewsAndPoses",

meshroom/aliceVision/ColorCheckerCorrection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def outputImagesValueFunct(attr):
1111
inputExt = os.path.splitext(basename)[1]
1212
outputExt = ('.' + attr.node.extension.value) if attr.node.extension.value else None
1313

14-
if inputExt in ['.abc', '.sfm']:
14+
if inputExt in ['.abc', '.sfm', '.usda']:
1515
fileStem = '<FILESTEM>' if attr.node.keepImageName.value else '<VIEW_ID>'
1616
# If we have an SfM in input
1717
return "{nodeCacheFolder}/" + fileStem + (outputExt or '.*')
@@ -117,7 +117,7 @@ class ColorCheckerCorrection(desc.AVCommandLineNode):
117117
name="outSfMData",
118118
label="SfMData",
119119
description="Output SfMData.",
120-
value=lambda attr: ("{nodeCacheFolder}/" + os.path.basename(attr.node.input.value)) if (os.path.splitext(attr.node.input.value)[1] in [".abc", ".sfm"]) else "",
120+
value=lambda attr: ("{nodeCacheFolder}/" + os.path.basename(attr.node.input.value)) if (os.path.splitext(attr.node.input.value)[1] in [".abc", ".sfm", ".usda"]) else "",
121121
commandLineGroup="", # do not export on the command line
122122
),
123123
desc.File(

meshroom/aliceVision/ConvertDistortion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ class ConvertDistortion(desc.AVCommandLineNode):
5353
name="output",
5454
label="Output",
5555
description="Path to the output SfMData file.",
56-
value="{nodeCacheFolder}/sfm.abc",
56+
value="{nodeCacheFolder}/sfm.usda",
5757
),
5858
]

meshroom/aliceVision/ConvertSfMFormat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ConvertSfMFormat(desc.AVCommandLineNode):
2929
name="fileExt",
3030
label="SfM File Format",
3131
description="Output SfM file format.",
32-
value="abc",
32+
value="usda",
3333
values=["abc", "usda", "sfm", "json", "ply", "baf"],
3434
commandLineGroup="", # exclude from command line
3535
),

meshroom/aliceVision/ExportColoredPointCloud.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ class ExportColoredPointCloud(desc.AVCommandLineNode):
3737
name="output",
3838
label="Point Cloud Filepath",
3939
description="Output point cloud with visibilities as SfMData file.",
40-
value="{nodeCacheFolder}/pointCloud.abc",
40+
value="{nodeCacheFolder}/pointCloud.usda",
4141
),
4242
]

meshroom/aliceVision/ExportImages.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class ExportImages(desc.AVCommandLineNode):
122122
name="outputSfMData",
123123
label="Output SfMData",
124124
description="Path to the target SfMData file updated with transformed images.",
125-
value="{nodeCacheFolder}/sfm.abc",
125+
value="{nodeCacheFolder}/sfm.usda",
126126
),
127127
]
128128

meshroom/aliceVision/GlobalPositionEstimating.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ class GlobalPositionEstimating(desc.AVCommandLineNode):
4848
name="output",
4949
label="SfMData",
5050
description="Path to the output SfMData file.",
51-
value="{nodeCacheFolder}/sfm.abc",
51+
value="{nodeCacheFolder}/sfm.usda",
5252
),
5353
]

meshroom/aliceVision/GlobalRotationEstimating.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ class GlobalRotationEstimating(desc.AVCommandLineNode):
6767
name="output",
6868
label="SfMData",
6969
description="Path to the output SfMData file.",
70-
value="{nodeCacheFolder}/sfm.abc",
70+
value="{nodeCacheFolder}/sfm.usda",
7171
),
7272
]

meshroom/aliceVision/GlobalSfM.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class GlobalSfM(desc.AVCommandLineNode):
9494
name="output",
9595
label="SfMData",
9696
description="Path to the output SfMData file.",
97-
value="{nodeCacheFolder}/sfm.abc",
97+
value="{nodeCacheFolder}/sfm.usda",
9898
),
9999
desc.File(
100100
name="outputViewsAndPoses",

meshroom/aliceVision/ImageProcessing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ class ImageProcessing(desc.AVCommandLineNode):
582582
name="outSfMData",
583583
label="SfMData",
584584
description="Output SfMData file.",
585-
value=lambda attr: ("{nodeCacheFolder}/" + os.path.basename(attr.node.input.value)) if (os.path.splitext(attr.node.input.value)[1] in [".abc", ".sfm"]) else "",
585+
value=lambda attr: ("{nodeCacheFolder}/" + os.path.basename(attr.node.input.value)) if (os.path.splitext(attr.node.input.value)[1] in [".usda", ".abc", ".sfm"]) else "",
586586
commandLineGroup="", # do not export on the command line
587587
),
588588
desc.File(

0 commit comments

Comments
 (0)