Changed interface to LODGenerator to handle the

case where the input is a single geometry/geode without any parents.
gwaldron · May 13, 2024 · c319a7e · c319a7e
1 parent a9e75d3
commit c319a7e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/applications/osgearth_lod/osgearth_lod.cpp b/src/applications/osgearth_lod/osgearth_lod.cpp
@@ -53,8 +53,8 @@ main(int argc, char** argv)
     osg::ref_ptr<osg::Node> root = osgDB::readRefNodeFiles(args);
 
     LODGenerator generator;
-    generator.generateLODs(root.get(), options);
+    osg::ref_ptr< osg::Node> result = generator.generateLODs(root.get(), options);
 
-    osgDB::writeNodeFile(*root, outFilename);
+    osgDB::writeNodeFile(*result, outFilename);
     return 0;
 }
diff --git a/src/osgEarth/LODGenerator b/src/osgEarth/LODGenerator
@@ -21,7 +21,7 @@ namespace osgEarth
             bool aggressive;
         };
 
-        void generateLODs(osg::Node* node, const std::vector<LODOptions>& options);
+        osg::Node* generateLODs(osg::Node* node, const std::vector<LODOptions>& options);
     };
 
 

diff --git a/src/osgEarth/LODGenerator.cpp b/src/osgEarth/LODGenerator.cpp
@@ -96,7 +96,7 @@ osg::LOD* createLODFromGeometry(osg::Geometry* originalGeometry, const std::vect
 }
 
 
-void LODGenerator::generateLODs(osg::Node* node, const std::vector<LODOptions>& options)
+osg::Node* LODGenerator::generateLODs(osg::Node* node, const std::vector<LODOptions>& options)
 {
     FindNodesVisitor<osg::Geometry> nv;
     node->accept(nv);
@@ -113,15 +113,28 @@ void LODGenerator::generateLODs(osg::Node* node, const std::vector<LODOptions>&
                 if (geode)
                 {
                     lod->setStateSet(geode->getStateSet());
-                    geode->getParent(0)->replaceChild(geode, lod);
+                    if (geode->getNumParents() == 0)
+                    {
+                        return lod;
+                    }
+                    else
+                    {
+                        geode->getParent(0)->replaceChild(geode, lod);
+                    }
                 }
                 else
                 {
                     parent->replaceChild(geom, lod);
                 }
             }
+            else
+            {             
+                return lod;
+            }
         }
     }
+
+    return node;
 }
 
 #endif // OSGEARTH_HAVE_MESH_OPTIMIZER