blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Nodes: Panel declarations for grouping sockets #108649

Merged
Lukas Tönne merged 27 commits from LukasTonne/blender:node-socket-categories into main 2023-06-14 18:02:46 +02:00
Conversation 18 Commits 27 Files Changed 13 +20 -11
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ab52f3e5b1 - Show all commits

2
source/blender/blenkernel/BKE_node_runtime.hh
View File

@ -516,7 +516,7 @@ inline blender::Span<bNode *> bNodeTree::root_frames() const
return this->runtime->root_frames;
}
inline blender::Span<bNodePanel *> bNodeTree::panels() const
inline blender::Span<const bNodePanel *> bNodeTree::panels() const
{
return blender::Span(panels_array, panels_num);
}

27
source/blender/blenkernel/intern/node.cc
View File

@ -3835,12 +3835,14 @@ int ntreeGetPanelIndex(const bNodeTree *ntree, const bNodePanel *panel)
bNodePanel *ntreeAddPanel(bNodeTree *ntree, const char *name, int flag)
{
LukasTonne marked this conversation as resolved Outdated
Hans Goudey commented 2023-06-06 14:22:30 +02:00
Outdated
Review
Copy Link

Don't have a strong preference, but this seems a bit more idiomatic and clear to me:
std::copy(old_categories.begin(), old_categories.end(), new_categories.data());

Don't have a strong preference, but this seems a bit more idiomatic and clear to me: ` std::copy(old_categories.begin(), old_categories.end(), new_categories.data());`
bNodePanel **old_panels_array = ntree->panels_array;
const Span<bNodePanel *> old_panels = ntree->panels();
const Span<const bNodePanel *> old_panels = ntree->panels();
ntree->panels_array = MEM_cnew_array<bNodePanel *>(ntree->panels_num + 1, __func__);
++ntree->panels_num;
const MutableSpan<bNodePanel *> new_panels = ntree->panels_for_write();
std::copy(old_panels.begin(), old_panels.end(), new_panels.data());
std::copy(const_cast<bNodePanel **>(old_panels.begin()),
const_cast<bNodePanel **>(old_panels.end()),
new_panels.data());
bNodePanel *new_panel = MEM_cnew<bNodePanel>(__func__);
*new_panel = {BLI_strdup(name), flag, ntree->next_panel_identifier++};
@ -3860,16 +3862,19 @@ bNodePanel *ntreeInsertPanel(bNodeTree *ntree, const char *name, int flag, int i
}
bNodePanel **old_panels_array = ntree->panels_array;
const Span<bNodePanel *> old_panels = ntree->panels();
const Span<const bNodePanel *> old_panels = ntree->panels();
ntree->panels_array = MEM_cnew_array<bNodePanel *>(ntree->panels_num + 1, __func__);
++ntree->panels_num;
const MutableSpan<bNodePanel *> new_panels = ntree->panels_for_write();
Span old_panels_front = old_panels.take_front(index);
Span old_panels_back = old_panels.drop_front(index);
std::copy(old_panels_front.begin(), old_panels_front.end(), new_panels.data());
std::copy(
old_panels_back.begin(), old_panels_back.end(), new_panels.drop_front(index + 1).data());
std::copy(const_cast<bNodePanel **>(old_panels_front.begin()),
const_cast<bNodePanel **>(old_panels_front.end()),
new_panels.data());
std::copy(const_cast<bNodePanel **>(old_panels_back.begin()),
const_cast<bNodePanel **>(old_panels_back.end()),
new_panels.drop_front(index + 1).data());
bNodePanel *new_panel = MEM_cnew<bNodePanel>(__func__);
*new_panel = {BLI_strdup(name), flag, ntree->next_panel_identifier++};
@ -3902,15 +3907,19 @@ void ntreeRemovePanel(bNodeTree *ntree, bNodePanel *panel)
}
bNodePanel **old_panels_array = ntree->panels_array;
const Span<bNodePanel *> old_panels = ntree->panels();
const Span<const bNodePanel *> old_panels = ntree->panels();
ntree->panels_array = MEM_cnew_array<bNodePanel *>(ntree->panels_num - 1, __func__);
--ntree->panels_num;
const MutableSpan<bNodePanel *> new_panels = ntree->panels_for_write();
Span old_panels_front = old_panels.take_front(index);
Span old_panels_back = old_panels.drop_front(index + 1);
std::copy(old_panels_front.begin(), old_panels_front.end(), new_panels.data());
std::copy(old_panels_back.begin(), old_panels_back.end(), new_panels.drop_front(index).data());
std::copy(const_cast<bNodePanel **>(old_panels_front.begin()),
const_cast<bNodePanel **>(old_panels_front.end()),
new_panels.data());
std::copy(const_cast<bNodePanel **>(old_panels_back.begin()),
const_cast<bNodePanel **>(old_panels_back.end()),
new_panels.drop_front(index).data());
MEM_SAFE_FREE(panel->name);
MEM_SAFE_FREE(panel);

2
source/blender/makesdna/DNA_node_types.h
View File

@ -674,7 +674,7 @@ typedef struct bNodeTree {
blender::Span<const bNodeSocket *> interface_inputs() const;
blender::Span<const bNodeSocket *> interface_outputs() const;
blender::Span<bNodePanel *> panels() const;
blender::Span<const bNodePanel *> panels() const;
LukasTonne marked this conversation as resolved Outdated
Hans Goudey commented 2023-06-12 18:23:54 +02:00
Outdated
Review
Copy Link

panels() should return Span<const bNodePanel *>, so a const bNodeSocket * doesn't give you a mutable bNodePanel

`panels()` should return `Span<const bNodePanel *>`, so a `const bNodeSocket *` doesn't give you a mutable `bNodePanel`
blender::MutableSpan<bNodePanel *> panels_for_write();
#endif
} bNodeTree;