blender
/
blender
136
411
Fork 595
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

Simulation nodes: UI for simulation state items in sidebar #106919

Merged
Lukas Tönne merged 40 commits from LukasTonne/blender:geometry-nodes-simulation-item-ui into geometry-nodes-simulation 2023-04-24 14:26:28 +02:00
Conversation 5 Commits 40 Files Changed 14 -14
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 877986ccda - Show all commits

3
source/blender/nodes/NOD_geometry.h
View File

@ -43,9 +43,6 @@ bool NOD_geometry_simulation_output_item_set_unique_name(struct NodeGeometrySimu
const char *name,
const char *defname);
/** Find the node owning this simulation output data. */
bNode *NOD_geometry_simulation_output_find_node_by_data(
struct bNodeTree *ntree, const struct NodeGeometrySimulationOutput *sim);
/** Find the node owning this simulation state item. */
bNode *NOD_geometry_simulation_output_find_node_by_item(struct bNodeTree *ntree,
const struct NodeSimulationItem *item);

11
source/blender/nodes/geometry/nodes/node_geo_simulation_output.cc
View File

@ -323,17 +323,6 @@ bool NOD_geometry_simulation_output_item_socket_type_supported(const eNodeSocket
return ELEM(socket_type, SOCK_GEOMETRY);
}
Hans Goudey commented 2023-04-18 21:47:36 +02:00
Outdated
Review
Copy Link

NOD_geometry_simulation_output_find_node_by_data is unused, and it doesn't seem like we should need this. If we do, I'd keep it local to RNA.

`NOD_geometry_simulation_output_find_node_by_data` is unused, and it doesn't seem like we should need this. If we do, I'd keep it local to RNA.
Lukas Tönne commented 2023-04-21 10:50:56 +02:00
Outdated
Review
Copy Link

Downside of putting this in RNA is that we don't have access to the C++ functions like ntree->nodes_by_type there.

Downside of putting this in RNA is that we don't have access to the C++ functions like `ntree->nodes_by_type` there.
Lukas Tönne commented 2023-04-21 11:58:15 +02:00
Outdated
Review
Copy Link

Removed the unused function though.

Removed the unused function though.
bNode *NOD_geometry_simulation_output_find_node_by_data(bNodeTree *ntree,
const NodeGeometrySimulationOutput *sim)
{
for (bNode *node : ntree->nodes_by_type("GeometryNodeSimulationOutput")) {
if (node->storage == sim) {
return node;
}
}
return nullptr;
}
bNode *NOD_geometry_simulation_output_find_node_by_item(bNodeTree *ntree,
const NodeSimulationItem *item)
Hans Goudey commented 2023-04-21 21:36:49 +02:00
Outdated
Review
Copy Link

I guess this is slightly different, but usually a method like this is called items_for_write(). Either way is fine with me.

I guess this is slightly different, but usually a method like this is called `items_for_write()`. Either way is fine with me.
Lukas Tönne commented 2023-04-24 11:46:51 +02:00
Outdated
Review
Copy Link

We already have NodeSimulationItem *items for the array, so Span<NodeSimulationItem> items() is a conflict, otherwise items + items_for_write would work.

We already have `NodeSimulationItem *items` for the array, so `Span<NodeSimulationItem> items()` is a conflict, otherwise `items` + `items_for_write` would work.
Lukas Tönne commented 2023-04-24 11:53:02 +02:00
Outdated
Review
Copy Link

I opted for items_span_for_write now, if that's ok for you.

I opted for `items_span_for_write` now, if that's ok for you.
{