[Bf-blender-cvs] [6b55e29] object_nodes: Rudimentary node group classes for an instance node and inputs/outputs.
Lukas Tönne
noreply at git.blender.org
Sat Dec 5 11:34:29 CET 2015
Commit: 6b55e29baf1870c6280cdab5152c868bebb0a217
Author: Lukas Tönne
Date: Sat Dec 5 11:32:34 2015 +0100
Branches: object_nodes
https://developer.blender.org/rB6b55e29baf1870c6280cdab5152c868bebb0a217
Rudimentary node group classes for an instance node and inputs/outputs.
The node group instance prevents recursive groups by disallowing nested
node trees, both when selecting a different group tree for an existing
node instance, and when adding an existing node to a tree (copy/paste).
===================================================================
M release/scripts/nodes/__init__.py
M release/scripts/nodes/forcefield_nodes.py
M release/scripts/nodes/geometry_nodes.py
A release/scripts/nodes/group_nodes.py
M release/scripts/nodes/object_nodes.py
===================================================================
diff --git a/release/scripts/nodes/__init__.py b/release/scripts/nodes/__init__.py
index cfbb096..885e5d8 100644
--- a/release/scripts/nodes/__init__.py
+++ b/release/scripts/nodes/__init__.py
@@ -27,6 +27,7 @@ _modules = [
"common_nodes",
"forcefield_nodes",
"geometry_nodes",
+ "group_nodes",
"object_nodes",
]
diff --git a/release/scripts/nodes/forcefield_nodes.py b/release/scripts/nodes/forcefield_nodes.py
index eae4c28..8245f8a 100644
--- a/release/scripts/nodes/forcefield_nodes.py
+++ b/release/scripts/nodes/forcefield_nodes.py
@@ -36,26 +36,6 @@ class ForceFieldNodeCategory(NodeCategory):
tree = context.space_data.edit_tree
return tree and tree.bl_idname == 'ForceFieldNodeTree'
-node_categories = [
- ForceFieldNodeCategory("FORCE_INPUT", "Input", items=[
- NodeItem("ForcePointDataNode"),
- ]),
- ForceFieldNodeCategory("FORCE_OUTPUT", "Output", items=[
- NodeItem("ForceOutputNode"),
- ]),
- ForceFieldNodeCategory("FORCE_CONVERTER", "Converter", items=[
- NodeItem("ObjectSeparateVectorNode"),
- NodeItem("ObjectCombineVectorNode"),
- ]),
- ForceFieldNodeCategory("FORCE_MATH", "Math", items=[
- NodeItem("ObjectMathNode"),
- NodeItem("ObjectVectorMathNode"),
- ]),
- ForceFieldNodeCategory("FORCE_GEOMETRY", "Geometry", items=[
- NodeItem("ForceClosestPointNode"),
- ]),
- ]
-
###############################################################################
class ForceFieldNodeTree(NodeTreeBase, NodeTree):
@@ -151,6 +131,25 @@ class ForceFieldNodesNew(Operator):
def register():
bpy.utils.register_module(__name__)
+ node_categories = [
+ ForceFieldNodeCategory("FORCE_INPUT", "Input", items=[
+ NodeItem("ForcePointDataNode"),
+ ]),
+ ForceFieldNodeCategory("FORCE_OUTPUT", "Output", items=[
+ NodeItem("ForceOutputNode"),
+ ]),
+ ForceFieldNodeCategory("FORCE_CONVERTER", "Converter", items=[
+ NodeItem("ObjectSeparateVectorNode"),
+ NodeItem("ObjectCombineVectorNode"),
+ ]),
+ ForceFieldNodeCategory("FORCE_MATH", "Math", items=[
+ NodeItem("ObjectMathNode"),
+ NodeItem("ObjectVectorMathNode"),
+ ]),
+ ForceFieldNodeCategory("FORCE_GEOMETRY", "Geometry", items=[
+ NodeItem("ForceClosestPointNode"),
+ ]),
+ ]
nodeitems_utils.register_node_categories("FORCEFIELD_NODES", node_categories)
def unregister():
diff --git a/release/scripts/nodes/geometry_nodes.py b/release/scripts/nodes/geometry_nodes.py
index bd1556c..dddb68d 100644
--- a/release/scripts/nodes/geometry_nodes.py
+++ b/release/scripts/nodes/geometry_nodes.py
@@ -25,6 +25,7 @@ from bpy.props import *
from nodeitems_utils import NodeCategory, NodeItem
from mathutils import *
from common_nodes import NodeTreeBase
+import group_nodes
###############################################################################
# Socket Types
@@ -56,28 +57,6 @@ class GeometryNodeCategory(NodeCategory):
tree = context.space_data.edit_tree
return tree and tree.bl_idname == 'GeometryNodeTree'
-node_categories = [
- GeometryNodeCategory("GEO_INPUT", "Input", items=[
- NodeItem("ObjectIterationNode"),
- NodeItem("GeometryMeshLoadNode"),
- ]),
- GeometryNodeCategory("GEO_OUTPUT", "Output", items=[
- NodeItem("GeometryOutputNode"),
- ]),
- GeometryNodeCategory("GEO_MODIFIER", "Modifier", items=[
- NodeItem("GeometryMeshArrayNode"),
- ]),
- GeometryNodeCategory("GEO_CONVERTER", "Converter", items=[
- NodeItem("ObjectSeparateVectorNode"),
- NodeItem("ObjectCombineVectorNode"),
- NodeItem("GeometryMeshCombineNode"),
- ]),
- GeometryNodeCategory("GEO_MATH", "Math", items=[
- NodeItem("ObjectMathNode"),
- NodeItem("ObjectVectorMathNode"),
- ]),
- ]
-
###############################################################################
class GeometryNodeTree(NodeTreeBase, NodeTree):
@@ -241,7 +220,34 @@ class GeometryNodesNew(Operator):
def register():
bpy.utils.register_module(__name__)
-
+ gnode, ginput, goutput = group_nodes.make_node_group_types("Geometry", GeometryNodeTree, GeometryNodeBase)
+
+ node_categories = [
+ GeometryNodeCategory("GEO_INPUT", "Input", items=[
+ NodeItem("ObjectIterationNode"),
+ NodeItem("GeometryMeshLoadNode"),
+ NodeItem(ginput.bl_idname),
+ ]),
+ GeometryNodeCategory("GEO_OUTPUT", "Output", items=[
+ NodeItem("GeometryOutputNode"),
+ NodeItem(goutput.bl_idname),
+ ]),
+ GeometryNodeCategory("GEO_MODIFIER", "Modifier", items=[
+ NodeItem("GeometryMeshArrayNode"),
+ ]),
+ GeometryNodeCategory("GEO_CONVERTER", "Converter", items=[
+ NodeItem("ObjectSeparateVectorNode"),
+ NodeItem("ObjectCombineVectorNode"),
+ NodeItem("GeometryMeshCombineNode"),
+ ]),
+ GeometryNodeCategory("GEO_MATH", "Math", items=[
+ NodeItem("ObjectMathNode"),
+ NodeItem("ObjectVectorMathNode"),
+ ]),
+ GeometryNodeCategory("GEO_GROUP", "Group", items=[
+ NodeItem(gnode.bl_idname),
+ ]),
+ ]
nodeitems_utils.register_node_categories("GEOMETRY_NODES", node_categories)
def unregister():
diff --git a/release/scripts/nodes/group_nodes.py b/release/scripts/nodes/group_nodes.py
new file mode 100644
index 0000000..8d57b60
--- /dev/null
+++ b/release/scripts/nodes/group_nodes.py
@@ -0,0 +1,123 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+# 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.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8-80 compliant>
+
+import bpy
+import nodeitems_utils
+from bpy.types import Operator, NodeTree, Node, NodeSocket, ObjectNode
+from bpy.props import *
+
+def make_node_group_types(prefix, treetype, node_base):
+ ntree_idname = treetype.bl_idname
+ groupnode_idname = '%sGroupNode' % prefix
+
+ class NodeGroupNew(Operator):
+ """Create new object node tree"""
+ bl_idname = "object_nodes.%s_nodegroup_new" % prefix.lower()
+ bl_label = "New"
+ bl_options = {'REGISTER', 'UNDO'}
+ bl_ntree_idname = ntree_idname
+
+ name = StringProperty(
+ name="Name",
+ )
+
+ def execute(self, context):
+ return bpy.ops.node.new_node_tree(type=self.bl_ntree_idname, name="%s Node Group" % prefix)
+
+ def internal_group_nodes(ntree, visited=None):
+ if ntree is None:
+ return
+ if visited is None:
+ visited = set()
+ elif ntree in visited:
+ return
+ visited.add(ntree)
+
+ for node in ntree.nodes:
+ if not isinstance(node, GroupNode):
+ continue
+ yield node
+ for inode in internal_group_nodes(node.id, visited):
+ yield inode
+
+ class GroupNode(node_base, ObjectNode):
+ '''Group of nodes that can be used in other trees'''
+ bl_idname = groupnode_idname
+ bl_label = 'Group'
+ bl_ntree_idname = ntree_idname
+
+ bl_id_property_type = 'NODETREE'
+ def bl_id_property_poll(self, ntree):
+ if not isinstance(ntree, treetype):
+ return False
+ for node in internal_group_nodes(ntree):
+ if node == self:
+ return False
+ return True
+
+ def poll_instance(self, ntree):
+ if hasattr(super(), "poll_instance") and not super().poll_instance(ntree):
+ return False
+ if self.id == ntree:
+ return False
+ for node in internal_group_nodes(self.id):
+ if node.id == ntree:
+ return False
+ return True
+
+ def draw_buttons(self, context, layout):
+ layout.template_ID(self, "id", new="object_nodes.geometry_nodes_new")
+
+ def compile(self, compiler):
+ # TODO
+ pass
+
+ class GroupInputNode(node_base, ObjectNode):
+ '''Inputs of the node group inside the tree'''
+ bl_idname = '%sGroupInputNode' % prefix
+ bl_label = 'Group Inputs'
+
+ def compile(self, compiler):
+ # TODO
+ pass
+
+ class GroupOutputNode(node_base, ObjectNode):
+ '''Outputs of the node group inside the tree'''
+ bl_idname = '%sGroupOutputNode' % prefix
+ bl_label = 'Group Outputs'
+
+ def compile(self, compiler):
+ # TODO
+ pass
+
+ bpy.utils.register_class(NodeGroupNew)
+ bpy.utils.register_class(GroupNode)
+ bpy.utils.register_class(GroupInputNode)
+ bpy.utils.register_class(GroupOutputNode)
+
+ return GroupNode, GroupInputNode, GroupOutputNode
+
+###############################################################################
+
+def register():
+ pass
+
+def unregister():
+ pass
diff --git a/release/scripts/nodes/object_nodes.py b/release/scripts/nodes/object_nodes.py
index 0b4ec70..1581b9a 100644
--- a/release/scripts/nodes/object_nodes.py
+++ b/release/scripts/nodes/object_nodes.py
@@ -36,13 +36,6 @@ class ObjectNodeCategory(NodeCategory):
tree = context.space_data.edit_tree
return tree and tree.bl_idname == 'Objec
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list