Merge pull request #1924 from alicevision/fix/nodalPipeline

Fix nodal pipeline including scenePreview crash

Author: servantftransperfect

meshroom/blender/scripts/preview.py

@@ -222,7 +222,13 @@ def loadModel(filename):
         bpy.ops.wm.alembic_import(filepath=filename)
         root = bpy.data.objects['mvgRoot']
         root.rotation_euler.rotate_axis('X', math.radians(-90.0))
-        return bpy.data.objects['mvgPointCloud'], bpy.data.meshes['particleShape1']
+
+        obj = bpy.data.objects['mvgPointCloud']
+    
+        mesh=None
+        if "particleShape1" in [c.name for c in bpy.data.meshes]:
+            mesh = bpy.data.meshes['particleShape1']
+        return obj, mesh
 
 
 def setupWireframeShading(mesh, color):
@@ -290,21 +296,27 @@ def setupPointCloudShading(obj, color, size):
     # Setup nodes
     nodeInput = geo.nodes.new(type='NodeGroupInput')
     nodeOutput = geo.nodes.new(type='NodeGroupOutput')
-    nodeM2P = geo.nodes.new(type='GeometryNodeMeshToPoints')
     nodeIoP = geo.nodes.new(type='GeometryNodeInstanceOnPoints')
     nodeCube = geo.nodes.new(type='GeometryNodeMeshCube')
     nodeSize = geo.nodes.new(type='ShaderNodeValue')
     nodeSize.outputs['Value'].default_value = size
     nodeMat = geo.nodes.new(type='GeometryNodeSetMaterial')
     nodeMat.inputs[2].default_value = material
+
+    # Create sockets
+    if hasattr(geo, 'interface'):
+        geo.interface.new_socket('Geometry', in_out='INPUT', socket_type='NodeSocketGeometry')
+        geo.interface.new_socket('Geometry', in_out='OUTPUT', socket_type='NodeSocketGeometry')
+    else:
+        geo.inputs.new('NodeSocketGeometry', 'Geometry')
+        geo.outputs.new('NodeSocketGeometry', 'Geometry')
+        
     # Connect nodes
-    geo.links.new(nodeInput.outputs[0], nodeM2P.inputs['Mesh'])
-    geo.links.new(nodeM2P.outputs['Points'], nodeIoP.inputs['Points'])
+    geo.links.new(nodeInput.outputs['Geometry'], nodeIoP.inputs['Points'])
     geo.links.new(nodeCube.outputs['Mesh'], nodeIoP.inputs['Instance'])
     geo.links.new(nodeSize.outputs['Value'], nodeIoP.inputs['Scale'])
     geo.links.new(nodeIoP.outputs['Instances'], nodeMat.inputs['Geometry'])
-    geo.links.new(nodeMat.outputs[0], nodeOutput.inputs[0])
-
+    geo.links.new(nodeMat.outputs[0], nodeOutput.inputs['Geometry'])
 
 
 def main():

meshroom/nodalCameraTracking.mg

@@ -2,7 +2,6 @@
     "header": {
         "releaseVersion": "2025.1.0-develop",
         "fileVersion": "2.0",
-        "template": true,
         "nodesVersions": {
             "ApplyCalibration": "1.0",
             "CameraInit": "12.0",
@@ -15,13 +14,14 @@
             "FeatureMatching": "2.0",
             "ImageDetectionPrompt": "0.1",
             "ImageMatching": "2.0",
-            "ImageSegmentationBox": "0.1",
+            "ImageSegmentationBox": "0.2",
             "NodalSfM": "2.0",
             "Publish": "1.3",
             "RelativePoseEstimating": "3.0",
             "ScenePreview": "2.0",
             "TracksBuilding": "1.0"
-        }
+        },
+        "template": true
     },
     "graph": {
         "ApplyCalibration_1": {
@@ -246,7 +246,8 @@
             "inputs": {
                 "input": "{TracksBuilding_1.input}",
                 "tracksFilename": "{TracksBuilding_1.output}",
-                "enforcePureRotation": true
+                "enforcePureRotation": true,
+                "imagePairsList": "{FeatureMatching_1.imagePairsList}"
             },
             "internalInputs": {
                 "color": "#80766f"

meshroom/nodalCameraTrackingWithoutCalibration.mg

@@ -2,7 +2,6 @@
     "header": {
         "releaseVersion": "2025.1.0-develop",
         "fileVersion": "2.0",
-        "template": true,
         "nodesVersions": {
             "CameraInit": "12.0",
             "ConvertDistortion": "1.0",
@@ -13,13 +12,14 @@
             "FeatureMatching": "2.0",
             "ImageDetectionPrompt": "0.1",
             "ImageMatching": "2.0",
-            "ImageSegmentationBox": "0.1",
+            "ImageSegmentationBox": "0.2",
             "NodalSfM": "2.0",
             "Publish": "1.3",
             "RelativePoseEstimating": "3.0",
             "ScenePreview": "2.0",
             "TracksBuilding": "1.0"
-        }
+        },
+        "template": true
     },
     "graph": {
         "CameraInit_1": {
@@ -203,7 +203,8 @@
             "inputs": {
                 "input": "{TracksBuilding_1.input}",
                 "tracksFilename": "{TracksBuilding_1.output}",
-                "enforcePureRotation": true
+                "enforcePureRotation": true,
+                "imagePairsList": "{FeatureMatching_1.imagePairsList}"
             },
             "internalInputs": {
                 "color": "#80766f"

src/aliceVision/dataio/json.cpp

@@ -12,10 +12,10 @@ std::vector<boost::json::value> readJsons(std::istream& is, boost::system::error
     {   
         content += line;
 
-        totalRead = 0;
+        //Try to read all available items in the buffer
         while (true)
         {
-            totalRead += p.write(content, ec);
+            totalRead = p.write_some(content, ec);
 
             // If the parser did not find a value, then it won't
             // find anything more.

src/aliceVision/sfmDataIO/AlembicExporter.cpp

@@ -623,6 +623,25 @@ void AlembicExporter::addSurveys(const sfmData::SurveyPoints & points)
 {
     OPoints outPoints(_dataImpl->_mvgSurveys, "surveys");
     OPointsSchema& pSchema = outPoints.getSchema();
+
+    //Build positions for abc visualisation
+    std::vector<V3f> positions;
+    for (const auto & [viewId, vsp] : points)
+    {
+        for (const auto & sp : vsp)
+        {
+            positions.emplace_back(sp.point3d[0], -sp.point3d[1], -sp.point3d[2]);
+        }
+    }
+
+    //Fake indices
+    std::vector<Alembic::Util::uint64_t> ids(positions.size());
+    std::iota(begin(ids), end(ids), 0);
+    
+    OPointsSchema::Sample psamp(std::move(V3fArraySample(positions)), std::move(UInt64ArraySample(ids)));
+    pSchema.set(psamp);
+
+    //Now, store information useful for AliceVision
     OCompoundProperty userProps = pSchema.getUserProperties();
 
     std::vector<IndexT> indices;