Minor updates

gwaldron · Jan 31, 2025 · e4be76f · e4be76f
1 parent c891a82
commit e4be76f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 79 deletions.
diff --git a/src/osgEarthImGui/NodeGraphGUI b/src/osgEarthImGui/NodeGraphGUI
@@ -201,25 +201,7 @@ namespace osgEarth
                             }
 
                             ImGui::EndMenu();
-                        }
-
-                        if (ImGui::MenuItem("Export Features"))
-                        {
-                            NodeGraphContext context;
-                            context.map = _mapNode->getMap();
-                            context.tileKey = TileKey(14, 9091, 5773, osgEarth::Registry::instance()->getGlobalGeodeticProfile());
-                            NodeGraphResult* result = _proceduralModelLayer->getNodeGraph()->execute<FeatureOutputOperation>(context);
-                            if (result)
-                            {
-                                for (auto& f : result->featuresValue)
-                                {
-                                    f->transform(osgEarth::SpatialReference::create("wgs84"));
-                                    f->getGeometry()->close();
-                                }
-                                std::ofstream out("H:/dev/osgearth/tests/features.json");
-                                out << osgEarth::Feature::featuresToGeoJSON(result->featuresValue);
-                            } 
-                        }
+                        }                      
                     }
                     ImGui::EndMenuBar();
 

diff --git a/src/osgEarthProcedural/NodeGraph b/src/osgEarthProcedural/NodeGraph
@@ -106,10 +106,16 @@ namespace osgEarth
             }
 
             int getId() const { return _id; }
+
             const std::string& getName() const {
                 return _name;
             }
 
+            void setName(const std::string& name)
+            {
+                _name = name;
+            }
+
             AttributeType getType() const {
                 return _type;
             }
@@ -1303,20 +1309,7 @@ namespace osgEarth
                     // These are modified in place, this is faster but is destructive to the features from the input
                     set_output("Points", points->featuresValue);
                 }
-            }
-
-            unsigned int getCount() const
-            {
-                return _count;
-            }
-
-            void setCount(unsigned int count)
-            {
-                _count = count;
-            }
-
-            unsigned int _count = 10;
-            Random   _prng;
+            }           
         };
 
 
@@ -1753,51 +1746,6 @@ namespace osgEarth
         class OSGEARTHPROCEDURAL_EXPORT NodeGraph
         {
         public:
-#if 0
-            virtual void execute(const NodeGraphContext& context)
-            {
-                // The NodeGraph can be ran multiple times during threaded loading for each load.  Maybe it needs cloned or something for reach
-                // execution
-                // Lock it for now.     
-                std::lock_guard< std::mutex > lk(_mutex);
-
-                NodeOutputOperation* outputNode = nullptr;
-                // First reset all the operations and find the output node.
-                for (auto& op : operations)
-                {
-                    op->reset();
-
-                    if (!outputNode)
-                    {
-                        outputNode = dynamic_cast<NodeOutputOperation*>(op.get());
-                    }
-                }
-
-                if (!outputNode)
-                {
-                    OE_NOTICE << "No NodeOutputOperation found" << std::endl;
-                    return;
-                }
-
-
-                // Build the dependencies.  We could do this at connect/disconnect time instead but this should be fast enough.
-                for (auto& op : operations)
-                {
-                    for (auto& link : op->getLinks())
-                    {
-                        // Add a dependency for the destination
-                        link._destination->addDependency(op.get());
-                    }
-                }
-
-                // Execute only the output node with it's dependencies
-                outputNode->executeWithDependencies(context);
-
-                // In theory there is a final node now.
-                _output = outputNode->result.get();
-            }
-#endif
-
             template<typename T>
             NodeGraphResult* execute(const NodeGraphContext& context)
             {
@@ -1884,7 +1832,7 @@ namespace osgEarth
             }
 
             TileKey _tileKey;
-            const Map* _map;
+            const Map* _map = nullptr;
             std::shared_ptr< NodeGraph > _nodeGraph;
         };
 } }