[Bf-blender-cvs] [8e2b11badfc] temp-geometry-nodes-evaluator-refactor: fixes
Jacques Lucke
noreply at git.blender.org
Tue Aug 23 12:27:34 CEST 2022
Commit: 8e2b11badfcb688c30d679ce32dc9198cfc34fc7
Author: Jacques Lucke
Date: Tue Aug 23 12:26:54 2022 +0200
Branches: temp-geometry-nodes-evaluator-refactor
https://developer.blender.org/rB8e2b11badfcb688c30d679ce32dc9198cfc34fc7
fixes
===================================================================
M source/blender/editors/space_node/node_draw.cc
===================================================================
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index 74df17782d9..138c43d34f7 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -793,139 +793,6 @@ struct SocketTooltipData {
bNodeSocket *socket;
};
-// static void create_inspection_string_for_generic_value(const GPointer value, std::stringstream
-// &ss)
-// {
-// auto id_to_inspection_string = [&](const ID *id, const short idcode) {
-// ss << (id ? id->name + 2 : TIP_("None")) << " (" << TIP_(BKE_idtype_idcode_to_name(idcode))
-// << ")";
-// };
-
-// const CPPType &type = *value.type();
-// const void *buffer = value.get();
-// if (type.is<Object *>()) {
-// id_to_inspection_string(*static_cast<const ID *const *>(buffer), ID_OB);
-// }
-// else if (type.is<Material *>()) {
-// id_to_inspection_string(*static_cast<const ID *const *>(buffer), ID_MA);
-// }
-// else if (type.is<Tex *>()) {
-// id_to_inspection_string(*static_cast<const ID *const *>(buffer), ID_TE);
-// }
-// else if (type.is<Image *>()) {
-// id_to_inspection_string(*static_cast<const ID *const *>(buffer), ID_IM);
-// }
-// else if (type.is<Collection *>()) {
-// id_to_inspection_string(*static_cast<const ID *const *>(buffer), ID_GR);
-// }
-// else if (type.is<int>()) {
-// ss << *(int *)buffer << TIP_(" (Integer)");
-// }
-// else if (type.is<float>()) {
-// ss << *(float *)buffer << TIP_(" (Float)");
-// }
-// else if (type.is<blender::float3>()) {
-// ss << *(blender::float3 *)buffer << TIP_(" (Vector)");
-// }
-// else if (type.is<bool>()) {
-// ss << ((*(bool *)buffer) ? TIP_("True") : TIP_("False")) << TIP_(" (Boolean)");
-// }
-// else if (type.is<std::string>()) {
-// ss << *(std::string *)buffer << TIP_(" (String)");
-// }
-// }
-
-// static void create_inspection_string_for_gfield(const geo_log::GFieldValueLog &value_log,
-// std::stringstream &ss)
-// {
-// const CPPType &type = value_log.type();
-// const GField &field = value_log.field();
-// const Span<std::string> input_tooltips = value_log.input_tooltips();
-
-// if (input_tooltips.is_empty()) {
-// if (field) {
-// BUFFER_FOR_CPP_TYPE_VALUE(type, buffer);
-// blender::fn::evaluate_constant_field(field, buffer);
-// create_inspection_string_for_generic_value({type, buffer}, ss);
-// type.destruct(buffer);
-// }
-// else {
-// /* Constant values should always be logged. */
-// BLI_assert_unreachable();
-// ss << "Value has not been logged";
-// }
-// }
-// else {
-// if (type.is<int>()) {
-// ss << TIP_("Integer field");
-// }
-// else if (type.is<float>()) {
-// ss << TIP_("Float field");
-// }
-// else if (type.is<blender::float3>()) {
-// ss << TIP_("Vector field");
-// }
-// else if (type.is<bool>()) {
-// ss << TIP_("Boolean field");
-// }
-// else if (type.is<std::string>()) {
-// ss << TIP_("String field");
-// }
-// else if (type.is<blender::ColorGeometry4f>()) {
-// ss << TIP_("Color field");
-// }
-// ss << TIP_(" based on:\n");
-
-// for (const int i : input_tooltips.index_range()) {
-// const blender::StringRef tooltip = input_tooltips[i];
-// ss << "\u2022 " << tooltip;
-// if (i < input_tooltips.size() - 1) {
-// ss << ".\n";
-// }
-// }
-// }
-// }
-}
-
-static std::optional<std::string> create_socket_inspection_string(bContext *C,
- bNode &node,
- bNodeSocket &socket)
-{
- SpaceNode *snode = CTX_wm_space_node(C);
- if (snode == nullptr) {
- return {};
- };
-
- const geo_log::SocketLog *socket_log = geo_log::ModifierLog::find_socket_by_node_editor_context(
- *snode, node, socket);
- if (socket_log == nullptr) {
- return {};
- }
- const geo_log::ValueLog *value_log = socket_log->value();
- if (value_log == nullptr) {
- return {};
- }
-
- std::stringstream ss;
- if (const geo_log::GenericValueLog *generic_value_log =
- dynamic_cast<const geo_log::GenericValueLog *>(value_log)) {
- create_inspection_string_for_generic_value(generic_value_log->value(), ss);
- }
- if (const geo_log::GFieldValueLog *gfield_value_log =
- dynamic_cast<const geo_log::GFieldValueLog *>(value_log)) {
- create_inspection_string_for_gfield(*gfield_value_log, ss);
- }
- else if (const geo_log::GeometryValueLog *geo_value_log =
- dynamic_cast<const geo_log::GeometryValueLog *>(value_log)) {
- create_inspection_string_for_geometry(
- *geo_value_log,
- ss,
- dynamic_cast<const nodes::decl::Geometry *>(socket.runtime->declaration));
- }
-
- return ss.str();
-}
-
static bool node_socket_has_tooltip(bNodeTree *ntree, bNodeSocket *socket)
{
if (ntree->type == NTREE_GEOMETRY) {
More information about the Bf-blender-cvs
mailing list