add ability to insert existing objects into a layer node

Author: jeffamstutz

tsd/apps/interactive/common/tsd_ui.cpp

@@ -27,31 +27,6 @@ static bool UI_stringList_callback(void *p, int index, const char **out_text)
   return true;
 }
 
-static size_t buildUI_objects_menulist(const Context &ctx, anari::DataType type)
-{
-  size_t retval = INVALID_INDEX;
-
-  for (size_t i = 0; i < ctx.numberOfObjects(type); i++) {
-    auto *obj = ctx.getObject(type, i);
-    if (!obj)
-      continue;
-
-    ImGui::PushID(i);
-
-    static std::string oTitle;
-    oTitle = '[';
-    oTitle += std::to_string(i);
-    oTitle += ']';
-    oTitle += obj->name();
-    if (ImGui::MenuItem(oTitle.c_str()))
-      retval = i;
-
-    ImGui::PopID();
-  }
-
-  return retval;
-}
-
 static void buildUI_parameter_contextMenu(Context &ctx, Parameter *p)
 {
   if (ImGui::BeginPopup("buildUI_parameter_contextMenu")) {
@@ -465,6 +440,31 @@ void buildUI_parameter(tsd::Parameter &p, tsd::Context &ctx, bool useTable)
   ImGui::PopID();
 }
 
+size_t buildUI_objects_menulist(const Context &ctx, anari::DataType type)
+{
+  size_t retval = INVALID_INDEX;
+
+  for (size_t i = 0; i < ctx.numberOfObjects(type); i++) {
+    auto *obj = ctx.getObject(type, i);
+    if (!obj)
+      continue;
+
+    ImGui::PushID(i);
+
+    static std::string oTitle;
+    oTitle = '[';
+    oTitle += std::to_string(i);
+    oTitle += ']';
+    oTitle += obj->name();
+    if (ImGui::MenuItem(oTitle.c_str()))
+      retval = i;
+
+    ImGui::PopID();
+  }
+
+  return retval;
+}
+
 void addDefaultRendererParameters(Object &o)
 {
   o.addParameter("background")

tsd/apps/interactive/common/tsd_ui.h

@@ -18,9 +18,10 @@ void buildUI_object(tsd::Object &o,
     int level = 0);
 void buildUI_parameter(
     tsd::Parameter &p, tsd::Context &ctx, bool asTable = false);
+size_t buildUI_objects_menulist(const Context &ctx, anari::DataType type);
 
 void addDefaultRendererParameters(Object &o);
 Object parseANARIObject(
     anari::Device d, ANARIDataType type, const char *subtype);
 
-} // namespace tsd::ui
+} // namespace tsd::ui

tsd/apps/interactive/common/windows/ObjectTree.cpp

@@ -198,6 +198,24 @@ void ObjectTree::buildUI_objectContextMenu()
         clearSelectedNode = true;
       }
 
+      ImGui::Separator();
+
+      if (ImGui::BeginMenu("existing")) {
+#define OBJECT_UI_MENU_ITEM(text, type)                                        \
+  if (ImGui::BeginMenu(text)) {                                                \
+    if (auto i = tsd::ui::buildUI_objects_menulist(ctx, type);                 \
+        i != tsd::INVALID_INDEX)                                               \
+      ctx.insertChildObjectNode(menuNode, type, i);                            \
+    ImGui::EndMenu();                                                          \
+  }
+        OBJECT_UI_MENU_ITEM("surface", ANARI_SURFACE);
+        OBJECT_UI_MENU_ITEM("volume", ANARI_VOLUME);
+        OBJECT_UI_MENU_ITEM("light", ANARI_LIGHT);
+        ImGui::EndMenu();
+      }
+
+      ImGui::Separator();
+
       if (ImGui::BeginMenu("procedural")) {
         if (ImGui::MenuItem("cylinders")) {
           generate_cylinders(ctx, menuNode);

tsd/src/tsd/core/Context.cpp

@@ -261,6 +261,17 @@ LayerNodeRef Context::insertChildTransformNode(
   return inst;
 }
 
+LayerNodeRef Context::insertChildObjectNode(LayerNodeRef parent,
+    anari::DataType type,
+    size_t idx,
+    const char *name)
+{
+  auto inst = parent->insert_last_child(tsd::utility::Any{type, idx});
+  (*inst)->name = name;
+  signalLayerChange();
+  return inst;
+}
+
 void Context::removeInstancedObject(LayerNodeRef obj)
 {
   if (obj->isRoot())

tsd/src/tsd/core/Context.hpp

@@ -105,6 +105,10 @@ struct Context
   template <typename T>
   LayerNodeRef insertChildObjectNode(
       LayerNodeRef parent, IndexedVectorRef<T> obj, const char *name = "");
+  LayerNodeRef insertChildObjectNode(LayerNodeRef parent,
+      anari::DataType type,
+      size_t idx,
+      const char *name = "");
 
   // NOTE: convenience to create an object _and_ insert it into the tree
   template <typename T>
@@ -293,22 +297,15 @@ template <typename T>
 inline LayerNodeRef Context::insertChildObjectNode(
     LayerNodeRef parent, IndexedVectorRef<T> obj, const char *name)
 {
-  auto inst =
-      parent->insert_last_child(tsd::utility::Any{obj->type(), obj->index()});
-  (*inst)->name = name;
-  signalLayerChange();
-  return inst;
+  return insertChildObjectNode(parent, obj->type(), obj->index(), name);
 }
 
 template <typename T>
 inline Context::AddedObject<T> Context::insertNewChildObjectNode(
     LayerNodeRef parent, Token subtype, const char *name)
 {
   auto obj = createObject<T>(subtype);
-  auto inst =
-      parent->insert_last_child(tsd::utility::Any{obj->type(), obj->index()});
-  (*inst)->name = name;
-  signalLayerChange();
+  auto inst = insertChildObjectNode(parent, obj, name);
   return std::make_pair(inst, obj);
 }