1 files changed, 62 insertions, 1 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_viewer.cc b/source/blender/nodes/geometry/nodes/node_geo_viewer.cc
index 3331962341f..194d1a751ed 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_viewer.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_viewer.cc
@@ -14,13 +14,69 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include "UI_interface.h"
+#include "UI_resources.h"
+
 #include "node_geometry_util.hh"
 
 namespace blender::nodes {
 static void geo_node_viewer_declare(NodeDeclarationBuilder &b)
 {
-  b.add_input<decl::Geometry>("Geometry");
+  b.add_input<decl::Geometry>(N_("Geometry"));
+  b.add_input<decl::Float>(N_("Value")).supports_field().hide_value();
+  b.add_input<decl::Vector>(N_("Value"), "Value_001").supports_field().hide_value();
+  b.add_input<decl::Color>(N_("Value"), "Value_002").supports_field().hide_value();
+  b.add_input<decl::Int>(N_("Value"), "Value_003").supports_field().hide_value();
+  b.add_input<decl::Bool>(N_("Value"), "Value_004").supports_field().hide_value();
+}
+
+static void geo_node_viewer_init(bNodeTree *UNUSED(tree), bNode *node)
+{
+  NodeGeometryViewer *data = (NodeGeometryViewer *)MEM_callocN(sizeof(NodeGeometryViewer),
+                                                               __func__);
+  data->data_type = CD_PROP_FLOAT;
+
+  node->storage = data;
+}
+
+static void geo_node_viewer_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
+{
+  uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE);
 }
+
+static eNodeSocketDatatype custom_data_type_to_socket_type(const CustomDataType type)
+{
+  switch (type) {
+    case CD_PROP_FLOAT:
+      return SOCK_FLOAT;
+    case CD_PROP_INT32:
+      return SOCK_INT;
+    case CD_PROP_FLOAT3:
+      return SOCK_VECTOR;
+    case CD_PROP_BOOL:
+      return SOCK_BOOLEAN;
+    case CD_PROP_COLOR:
+      return SOCK_RGBA;
+    default:
+      BLI_assert_unreachable();
+      return SOCK_FLOAT;
+  }
+}
+
+static void geo_node_viewer_update(bNodeTree *UNUSED(ntree), bNode *node)
+{
+  const NodeGeometryViewer &storage = *(const NodeGeometryViewer *)node->storage;
+  const CustomDataType data_type = static_cast<CustomDataType>(storage.data_type);
+  const eNodeSocketDatatype socket_type = custom_data_type_to_socket_type(data_type);
+
+  LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) {
+    if (socket->type == SOCK_GEOMETRY) {
+      continue;
+    }
+    nodeSetSocketAvailability(socket, socket->type == socket_type);
+  }
+}
+
 }  // namespace blender::nodes
 
 void register_node_type_geo_viewer()
@@ -28,6 +84,11 @@ void register_node_type_geo_viewer()
   static bNodeType ntype;
 
   geo_node_type_base(&ntype, GEO_NODE_VIEWER, "Viewer", NODE_CLASS_OUTPUT, 0);
+  node_type_storage(
+      &ntype, "NodeGeometryViewer", node_free_standard_storage, node_copy_standard_storage);
+  node_type_update(&ntype, blender::nodes::geo_node_viewer_update);
+  node_type_init(&ntype, blender::nodes::geo_node_viewer_init);
   ntype.declare = blender::nodes::geo_node_viewer_declare;
+  ntype.draw_buttons_ex = blender::nodes::geo_node_viewer_layout;
   nodeRegisterType(&ntype);
 }