Merge pull request #90 from alicevision/dev_removeCereal

Add support for AliceVision dev_removeCereal branch

meshroom/nodes/aliceVision/CameraInit.py

@@ -62,6 +62,14 @@ class CameraInit(desc.CommandLineNode):
             label="Intrinsics",
             description="Camera Intrinsics",
             group="",
+        ),
+		desc.FloatParam(
+            name='defaultFieldOfView',
+            label='Default Field Of View',
+            description='Empirical value for the field of view in degree.',
+            value=45.0,
+            range=(0, 180.0, 1),
+            uid=[0],
         ),
         desc.File(
             name='sensorDatabase',

meshroom/nodes/aliceVision/FeatureExtraction.py

@@ -6,7 +6,7 @@ class FeatureExtraction(desc.CommandLineNode):
     internalFolder = '{cache}/{nodeType}/{uid0}/'
     commandLine = 'aliceVision_featureExtraction {allParams}'
     size = desc.DynamicNodeSize('input')
-    parallelization = desc.Parallelization(blockSize=10)
+    parallelization = desc.Parallelization(blockSize=40)
     commandLineRange = '--rangeStart {rangeStart} --rangeSize {rangeBlockSize}'
 
     inputs = [

meshroom/nodes/aliceVision/FeatureMatching.py

@@ -112,15 +112,6 @@ class FeatureMatching(desc.CommandLineNode):
             value=False,
             uid=[],
         ),
-        desc.ChoiceParam(
-            name='fileExtension',
-            label='File Extension',
-            description='''File extension to store matches (bin or txt).''',
-            value='txt',
-            values=('txt', 'bin'),
-            exclusive=True,
-            uid=[],
-        ),
         desc.IntParam(
             name='maxMatches',
             label='Max Matches',