[Bf-blender-cvs] [acef1af28dc] temp-node-tree-pages-prototype: portal nodes
Jacques Lucke
noreply at git.blender.org
Thu Mar 18 13:51:19 CET 2021
Commit: acef1af28dc844f48e4a24530d7daa1ff2976206
Author: Jacques Lucke
Date: Thu Mar 18 12:01:58 2021 +0100
Branches: temp-node-tree-pages-prototype
https://developer.blender.org/rBacef1af28dc844f48e4a24530d7daa1ff2976206
portal nodes
===================================================================
M release/scripts/startup/nodeitems_builtins.py
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/intern/node.cc
M source/blender/editors/space_node/node_relationships.c
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_geometry.h
M source/blender/nodes/NOD_node_tree_ref.hh
M source/blender/nodes/NOD_static_types.h
A source/blender/nodes/geometry/nodes/node_geo_portals.cc
M source/blender/nodes/intern/derived_node_tree.cc
M source/blender/nodes/intern/node_tree_ref.cc
===================================================================
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 6e1397ff971..1b931bf963e 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -561,6 +561,8 @@ geometry_node_categories = [
GeometryNodeCategory("GEO_LAYOUT", "Layout", items=[
NodeItem("NodeFrame"),
NodeItem("NodeReroute"),
+ NodeItem("NodePortalIn"),
+ NodeItem("NodePortalOut"),
]),
# NodeItem("FunctionNodeCombineStrings"),
# NodeItem("FunctionNodeGroupInstanceID"),
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 013c90197b2..7780d0836dd 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -858,6 +858,8 @@ bool BKE_node_is_connected_to_output(struct bNodeTree *ntree, struct bNode *node
#define NODE_GROUP_INPUT 7
#define NODE_GROUP_OUTPUT 8
#define NODE_CUSTOM_GROUP 9
+#define NODE_PORTAL_IN 10
+#define NODE_PORTAL_OUT 11
void BKE_node_tree_unlink_id(ID *id, struct bNodeTree *ntree);
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 5041f914ef9..ac4b2c6a1ad 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -4942,6 +4942,8 @@ static void registerGeometryNodes()
register_node_type_geo_transform();
register_node_type_geo_triangulate();
register_node_type_geo_volume_to_mesh();
+ register_node_type_portal_in();
+ register_node_type_portal_out();
}
static void registerFunctionNodes()
diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c
index 2cc44d72c72..3fd0320cb1b 100644
--- a/source/blender/editors/space_node/node_relationships.c
+++ b/source/blender/editors/space_node/node_relationships.c
@@ -137,6 +137,7 @@ bool node_connected_to_output(Main *bmain, bNodeTree *ntree, bNode *node)
if (ntree_has_drivers(ntree)) {
return true;
}
+ return true;
LISTBASE_FOREACH (bNode *, current_node, &ntree->nodes) {
/* Special case for group nodes -- if modified node connected to a group
* with active output inside we consider refresh is needed.
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index c61a39a20f0..bebf723da6a 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -1274,6 +1274,14 @@ typedef struct NodeGeometryMeshCone {
uint8_t fill_type;
} NodeGeometryMeshCone;
+typedef struct NodePortalIn {
+ int portal_id;
+} NodePortalIn;
+
+typedef struct NodePortalOut {
+ int portal_id;
+} NodePortalOut;
+
typedef struct NodeGeometryMeshLine {
/* GeometryNodeMeshLineMode. */
uint8_t mode;
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index fc1f692a8bf..7fa9e82b481 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -9525,6 +9525,28 @@ static void def_geo_mesh_line(StructRNA *srna)
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
}
+static void def_portal_in(StructRNA *srna)
+{
+ PropertyRNA *prop;
+
+ RNA_def_struct_sdna_from(srna, "NodePortalIn", "storage");
+
+ prop = RNA_def_property(srna, "portal_id", PROP_INT, PROP_NONE);
+ RNA_def_property_ui_text(prop, "Portal ID", "");
+ RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+}
+
+static void def_portal_out(StructRNA *srna)
+{
+ PropertyRNA *prop;
+
+ RNA_def_struct_sdna_from(srna, "NodePortalOut", "storage");
+
+ prop = RNA_def_property(srna, "portal_id", PROP_INT, PROP_NONE);
+ RNA_def_property_ui_text(prop, "Portal ID", "");
+ RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+}
+
/* -------------------------------------------------------------------------- */
static void rna_def_shader_node(BlenderRNA *brna)
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 366cac48a40..e3dcb66e10d 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -178,6 +178,7 @@ set(SRC
geometry/nodes/node_geo_point_separate.cc
geometry/nodes/node_geo_point_translate.cc
geometry/nodes/node_geo_points_to_volume.cc
+ geometry/nodes/node_geo_portals.cc
geometry/nodes/node_geo_subdivide.cc
geometry/nodes/node_geo_subdivision_surface.cc
geometry/nodes/node_geo_transform.cc
diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h
index 03115852d80..4904f8b8412 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -66,6 +66,8 @@ void register_node_type_geo_subdivision_surface(void);
void register_node_type_geo_transform(void);
void register_node_type_geo_triangulate(void);
void register_node_type_geo_volume_to_mesh(void);
+void register_node_type_portal_in(void);
+void register_node_type_portal_out(void);
#ifdef __cplusplus
}
diff --git a/source/blender/nodes/NOD_node_tree_ref.hh b/source/blender/nodes/NOD_node_tree_ref.hh
index 6b8eb21bf9a..14bb708bdff 100644
--- a/source/blender/nodes/NOD_node_tree_ref.hh
+++ b/source/blender/nodes/NOD_node_tree_ref.hh
@@ -169,6 +169,8 @@ class NodeRef : NonCopyable, NonMovable {
bool is_group_input_node() const;
bool is_group_output_node() const;
bool is_muted() const;
+ bool is_portal_in() const;
+ bool is_portal_out() const;
};
class LinkRef : NonCopyable, NonMovable {
@@ -213,6 +215,8 @@ class NodeTreeRef : NonCopyable, NonMovable {
Vector<OutputSocketRef *> output_sockets_;
Vector<LinkRef *> links_;
MultiValueMap<const bNodeType *, NodeRef *> nodes_by_type_;
+ MultiValueMap<int, NodeRef *> portal_in_nodes_by_id_;
+ MultiValueMap<int, NodeRef *> portal_out_nodes_by_id_;
public:
NodeTreeRef(bNodeTree *btree);
@@ -228,6 +232,9 @@ class NodeTreeRef : NonCopyable, NonMovable {
Span<const LinkRef *> links() const;
+ Span<const NodeRef *> portal_in_nodes_by_id(int portal_id) const;
+ Span<const NodeRef *> portal_out_nodes_by_id(int portal_id) const;
+
bool has_link_cycles() const;
bNodeTree *btree() const;
@@ -507,6 +514,16 @@ inline bool NodeRef::is_muted() const
return (bnode_->flag & NODE_MUTED) != 0;
}
+inline bool NodeRef::is_portal_in() const
+{
+ return bnode_->type == NODE_PORTAL_IN;
+}
+
+inline bool NodeRef::is_portal_out() const
+{
+ return bnode_->type == NODE_PORTAL_OUT;
+}
+
/* --------------------------------------------------------------------
* LinkRef inline methods.
*/
@@ -590,6 +607,16 @@ inline Span<const LinkRef *> NodeTreeRef::links() const
return links_;
}
+inline Span<const NodeRef *> NodeTreeRef::portal_in_nodes_by_id(int portal_id) const
+{
+ return portal_in_nodes_by_id_.lookup(portal_id);
+}
+
+inline Span<const NodeRef *> NodeTreeRef::portal_out_nodes_by_id(int portal_id) const
+{
+ return portal_out_nodes_by_id_.lookup(portal_id);
+}
+
inline bNodeTree *NodeTreeRef::btree() const
{
return btree_;
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index abb467961b1..59ca8ed62d3 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -36,6 +36,9 @@ DefNode(Node, NODE_GROUP, def_group, "GROUP"
DefNode(Node, NODE_GROUP_INPUT, def_group_input, "GROUP_INPUT", GroupInput, "Group Input", "" )
DefNode(Node, NODE_GROUP_OUTPUT, def_group_output, "GROUP_OUTPUT", GroupOutput, "Group Output", "" )
DefNode(Node, NODE_REROUTE, 0, "REROUTE", Reroute, "Reroute", "" )
+DefNode(Node, NODE_PORTAL_IN, def_portal_in, "PORTAL_IN", PortalIn, "Portal In", "" )
+DefNode(Node, NODE_PORTAL_OUT, def_portal_out, "PORTAL_OUT", PortalOut, "Portal Out", "" )
+
DefNode(ShaderNode, SH_NODE_RGB, 0, "RGB", RGB, "RGB", "" )
DefNode(ShaderNode, SH_NODE_VALUE, 0, "VALUE", Value, "Value", "" )
diff --git a/source/blender/nodes/geometry/nodes/node_geo_portals.cc b/source/blender/nodes/geometry/nodes/node_geo_portals.cc
new file mode 100644
index 00000000000..b0796147a90
--- /dev/null
+++ b/source/blender/nodes/geometry/nodes/node_geo_portals.cc
@@ -0,0 +1,98 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "node_geometry_util.hh"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+
+static bNodeSocketTemplate node_portal_in[] = {
+ {SOCK_GEOMETRY, N_("Geometry")},
+ {-1, ""},
+};
+
+static bNodeSocketTemplate node_portal_out[] = {
+ {SOCK_GEOMETRY, N_("Geometry")},
+ {-1, ""},
+};
+
+static void node_portal_in_layout(uiLayout *UNUSED(layout),
+ bContext *UNUSED(C),
+ PointerRNA *UNUSED(ptr))
+{
+}
+
+static void node_portal_out_layout(uiLayout *UNUSED(layout),
+ bContext *UNUSED(C),
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list