Work on integrating procedural nodes into osgEarth.

gwaldron · Jan 30, 2025 · c891a82 · c891a82
1 parent 7501ae1
commit c891a82
Show file tree

Hide file tree

Showing 14 changed files with 7,081 additions and 3 deletions.
diff --git a/src/applications/osgearth_imgui/osgearth_imgui.cpp b/src/applications/osgearth_imgui/osgearth_imgui.cpp
@@ -51,6 +51,7 @@
 #include <osgEarthImGui/TerrainEditGUI>
 #include <osgEarthImGui/TextureSplattingLayerGUI>
 #include <osgEarthImGui/VegetationLayerGUI>
+#include <osgEarthImGui/NodeGraphGUI>
 #endif
 
 #ifdef OSGEARTH_HAVE_CESIUM_NODEKIT
@@ -132,6 +133,7 @@ main(int argc, char** argv)
         ui->add("Procedural", new osgEarth::Procedural::TerrainEditGUI);
         ui->add("Procedural", new osgEarth::Procedural::TextureSplattingLayerGUI());
         ui->add("Procedural", new osgEarth::Procedural::VegetationLayerGUI());
+        ui->add("Procedural", new osgEarth::Procedural::NodeGraphGUI());
 #endif
 
         ui->onStartup = []()

diff --git a/src/osgEarth/TiledModelLayer b/src/osgEarth/TiledModelLayer
@@ -105,7 +105,7 @@ namespace osgEarth
         mutable std::vector<Texture::WeakPtr> _texturesCache;
         mutable std::mutex _texturesCacheMutex;
 
-    private:
+    protected:
         osg::observer_ptr< const Map > _map;
         osg::ref_ptr< osg::Group > _root;
         bool _graphDirty;

diff --git a/src/osgEarthImGui/CMakeLists.txt b/src/osgEarthImGui/CMakeLists.txt
@@ -11,8 +11,8 @@ set(LIB_NAME osgEarthImGui)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 # embedded ImGui source code:
-set(IMGUI_HEADERS imgui.h imgui_internal.h imgui_impl_opengl3.h imconfig.h)
-set(IMGUI_SOURCES imgui.cpp imgui_demo.cpp imgui_draw.cpp imgui_tables.cpp imgui_widgets.cpp imgui_impl_opengl3.cpp)
+set(IMGUI_HEADERS imgui.h imgui_internal.h imgui_impl_opengl3.h imconfig.h imnodes.h)
+set(IMGUI_SOURCES imgui.cpp imgui_demo.cpp imgui_draw.cpp imgui_tables.cpp imgui_widgets.cpp imgui_impl_opengl3.cpp imnodes.cpp)
 
 set(STOCK_PANELS
     AnnotationsGUI
@@ -25,6 +25,7 @@ set(STOCK_PANELS
     NotifyGUI
     OpenEarthFileGUI
     LiveCamerasGUI
+    NodeGraphGUI
     PickerGUI
     RenderingGUI
     SceneGraphGUI

diff --git a/src/osgEarthImGui/Common b/src/osgEarthImGui/Common
@@ -17,4 +17,5 @@
 #ifndef IMGUI_VERSION
 #include <GL/glew.h>
 #include <osgEarthImGui/imgui.h>
+#include <osgEarthImGui/imnodes.h>
 #endif
diff --git a/src/osgEarthImGui/ImGuiEventHandler.cpp b/src/osgEarthImGui/ImGuiEventHandler.cpp
@@ -71,6 +71,12 @@ ImGuiEventHandler::newFrame(osg::RenderInfo& renderInfo)
     if (_firstFrame)
     {
         ImGui::CreateContext();
+        ImNodes::CreateContext();
+        ImNodes::PushAttributeFlag(ImNodesAttributeFlags_EnableLinkDetachWithDragClick);
+        ImNodesIO& imNodesio = ImNodes::GetIO();
+        imNodesio.LinkDetachWithModifierClick.Modifier = &ImGui::GetIO().KeyCtrl;
+        imNodesio.MultipleSelectModifier.Modifier = &ImGui::GetIO().KeyCtrl;
+
         ImGui_ImplOpenGL3_Init();
         auto& io = ImGui::GetIO();
 #ifdef IMGUI_HAS_DOCK

diff --git a/src/osgEarthImGui/NodeGraphGUI b/src/osgEarthImGui/NodeGraphGUI