[Bf-blender-cvs] [d5bcdeef9ff] functions-experimental-refactor: rename pack list socket declaration to something more generic
Jacques Lucke
noreply at git.blender.org
Sun Nov 3 15:31:36 CET 2019
Commit: d5bcdeef9ff04329ad2de8d399ca321c14fd4259
Author: Jacques Lucke
Date: Sun Nov 3 15:31:30 2019 +0100
Branches: functions-experimental-refactor
https://developer.blender.org/rBd5bcdeef9ff04329ad2de8d399ca321c14fd4259
rename pack list socket declaration to something more generic
===================================================================
M release/scripts/startup/nodes/declaration/__init__.py
R087 release/scripts/startup/nodes/declaration/pack_list.py release/scripts/startup/nodes/declaration/base_list_variadic.py
M release/scripts/startup/nodes/function_nodes/list.py
M release/scripts/startup/nodes/inferencing.py
M release/scripts/startup/nodes/node_builder.py
===================================================================
diff --git a/release/scripts/startup/nodes/declaration/__init__.py b/release/scripts/startup/nodes/declaration/__init__.py
index dc01854fa2e..c61aeae8406 100644
--- a/release/scripts/startup/nodes/declaration/__init__.py
+++ b/release/scripts/startup/nodes/declaration/__init__.py
@@ -1,7 +1,7 @@
from . base import NoDefaultValue
from . fixed_type import FixedSocketDecl
from . dynamic_list import ListSocketDecl
-from . pack_list import PackListDecl
+from . base_list_variadic import BaseListVariadic
from . tree_interface import TreeInterfaceDecl
from . variadic import AnyVariadicDecl
from . vectorized import VectorizedInputDecl, VectorizedOutputDecl
diff --git a/release/scripts/startup/nodes/declaration/pack_list.py b/release/scripts/startup/nodes/declaration/base_list_variadic.py
similarity index 87%
rename from release/scripts/startup/nodes/declaration/pack_list.py
rename to release/scripts/startup/nodes/declaration/base_list_variadic.py
index 908bda99683..35e74c0e6c4 100644
--- a/release/scripts/startup/nodes/declaration/pack_list.py
+++ b/release/scripts/startup/nodes/declaration/base_list_variadic.py
@@ -6,7 +6,7 @@ from .. base import DataSocket
from .. types import type_infos
from .. sockets import OperatorSocket
-class PackListDecl(SocketDeclBase):
+class BaseListVariadic(SocketDeclBase):
def __init__(self, node, identifier: str, prop_name: str, base_type: str, default_amount: int):
self.node = node
self.identifier_suffix = identifier
@@ -53,14 +53,14 @@ class PackListDecl(SocketDeclBase):
def draw_socket(self, layout, socket, index):
if isinstance(socket, OperatorSocket):
- props = layout.operator("fn.new_pack_list_input", text="New Input", icon='ADD')
+ props = layout.operator("fn.new_base_list_variadic_input", text="New Input", icon='ADD')
props.tree_name = self.node.tree.name
props.node_name = self.node.name
props.prop_name = self.prop_name
else:
row = layout.row(align=True)
socket.draw_self(row, self.node, str(index))
- props = row.operator("fn.remove_pack_list_input", text="", icon='X')
+ props = row.operator("fn.remove_base_list_variadic_input", text="", icon='X')
props.tree_name = self.node.tree.name
props.node_name = self.node.name
props.prop_name = self.prop_name
@@ -102,10 +102,10 @@ class PackListDecl(SocketDeclBase):
@classmethod
def Property(cls):
- return CollectionProperty(type=PackListPropertyGroup)
+ return CollectionProperty(type=BaseListVariadicPropertyGroup)
-class PackListPropertyGroup(bpy.types.PropertyGroup):
- bl_idname = "fn_PackListPropertyGroup"
+class BaseListVariadicPropertyGroup(bpy.types.PropertyGroup):
+ bl_idname = "fn_BaseListVariadicPropertyGroup"
state: EnumProperty(
default="BASE",
@@ -114,8 +114,8 @@ class PackListPropertyGroup(bpy.types.PropertyGroup):
("LIST", "Base", "", "NONE", 1)])
identifier_prefix: StringProperty()
-class NewPackListInputOperator(bpy.types.Operator):
- bl_idname = "fn.new_pack_list_input"
+class NewBaseListVariadicInputOperator(bpy.types.Operator):
+ bl_idname = "fn.new_base_list_variadic_input"
bl_label = "New Pack List Input"
bl_options = {'INTERNAL'}
@@ -135,8 +135,8 @@ class NewPackListInputOperator(bpy.types.Operator):
tree.sync()
return {'FINISHED'}
-class RemovePackListInputOperator(bpy.types.Operator):
- bl_idname = "fn.remove_pack_list_input"
+class RemoveBaseListVariadicInputOperator(bpy.types.Operator):
+ bl_idname = "fn.remove_base_list_variadic_input"
bl_label = "Remove Pack List Input"
bl_options = {'INTERNAL'}
diff --git a/release/scripts/startup/nodes/function_nodes/list.py b/release/scripts/startup/nodes/function_nodes/list.py
index 26991fb6119..70c7617dba4 100644
--- a/release/scripts/startup/nodes/function_nodes/list.py
+++ b/release/scripts/startup/nodes/function_nodes/list.py
@@ -37,7 +37,7 @@ class PackListNode(bpy.types.Node, FunctionNode):
default="Float",
update=FunctionNode.sync_tree)
- variadic: NodeBuilder.PackListProperty()
+ variadic: NodeBuilder.BaseListVariadicProperty()
def declaration(self, builder):
builder.pack_list_input("inputs", "variadic", self.active_type)
diff --git a/release/scripts/startup/nodes/inferencing.py b/release/scripts/startup/nodes/inferencing.py
index 55b1326665c..569d5a49064 100644
--- a/release/scripts/startup/nodes/inferencing.py
+++ b/release/scripts/startup/nodes/inferencing.py
@@ -6,7 +6,7 @@ from . tree_data import TreeData
from . declaration import (
FixedSocketDecl,
ListSocketDecl,
- PackListDecl,
+ BaseListVariadic,
AnyVariadicDecl,
TreeInterfaceDecl,
VectorizedInputDecl,
@@ -18,12 +18,12 @@ DecisionID = namedtuple("DecisionID", ("node", "group", "prop_name"))
def get_inferencing_decisions(tree_data: TreeData):
list_decisions = make_list_decisions(tree_data)
vector_decisions = make_vector_decisions(tree_data, list_decisions)
- pack_list_decisions = make_pack_list_decisions(tree_data, list_decisions, vector_decisions)
+ base_list_variadic_decisions = make_base_list_variadic_decisions(tree_data, list_decisions, vector_decisions)
decisions = dict()
decisions.update(list_decisions)
decisions.update(vector_decisions)
- decisions.update(pack_list_decisions)
+ decisions.update(base_list_variadic_decisions)
return decisions
@@ -84,7 +84,7 @@ def iter_possible_list_component_types(component, decision_users, tree_data):
data_type = other_socket.data_type
if type_infos.is_list(data_type):
yield type_infos.to_base(data_type)
- elif isinstance(other_decl, PackListDecl):
+ elif isinstance(other_decl, BaseListVariadic):
yield other_decl.base_type
elif isinstance(other_decl, VectorizedInputDecl):
yield other_decl.base_type
@@ -97,7 +97,7 @@ def iter_possible_list_component_types(component, decision_users, tree_data):
data_type = other_socket.data_type
if type_infos.is_base(data_type):
yield data_type
- elif isinstance(other_decl, PackListDecl):
+ elif isinstance(other_decl, BaseListVariadic):
yield other_decl.base_type
elif isinstance(other_decl, VectorizedInputDecl):
yield other_decl.base_type
@@ -226,10 +226,10 @@ def iter_obligatory_vector_decisions(graph, input_sockets, output_sockets, tree_
# Inference pack list decisions
########################################
-def make_pack_list_decisions(tree_data, list_decisions, vector_decisions):
+def make_base_list_variadic_decisions(tree_data, list_decisions, vector_decisions):
decisions = dict()
- for decision_id, decl, socket in iter_pack_list_sockets(tree_data):
+ for decision_id, decl, socket in iter_base_list_variadic_sockets(tree_data):
assert not socket.is_output
origin_node, origin_socket = tree_data.try_get_origin_with_node(socket)
@@ -283,10 +283,10 @@ def make_pack_list_decisions(tree_data, list_decisions, vector_decisions):
def data_sockets_are_static(decl):
return isinstance(decl, (FixedSocketDecl, AnyVariadicDecl, TreeInterfaceDecl))
-def iter_pack_list_sockets(tree_data):
+def iter_base_list_variadic_sockets(tree_data):
for node in tree_data.iter_nodes():
for decl, sockets in node.decl_map.iter_decl_with_sockets():
- if isinstance(decl, PackListDecl):
+ if isinstance(decl, BaseListVariadic):
collection = decl.get_collection()
for i, socket in enumerate(sockets[:-1]):
decision_id = DecisionID(node, collection[i], "state")
diff --git a/release/scripts/startup/nodes/node_builder.py b/release/scripts/startup/nodes/node_builder.py
index b0bedd1756f..fe7522ca104 100644
--- a/release/scripts/startup/nodes/node_builder.py
+++ b/release/scripts/startup/nodes/node_builder.py
@@ -1,7 +1,7 @@
from . declaration import (
FixedSocketDecl,
ListSocketDecl,
- PackListDecl,
+ BaseListVariadic,
AnyVariadicDecl,
TreeInterfaceDecl,
VectorizedInputDecl,
@@ -108,11 +108,11 @@ class NodeBuilder:
###################################
@staticmethod
- def PackListProperty():
- return PackListDecl.Property()
+ def BaseListVariadicProperty():
+ return BaseListVariadic.Property()
def pack_list_input(self, identifier, prop_name, base_type, default_amount=2):
- decl = PackListDecl(self.node, identifier, prop_name, base_type, default_amount)
+ decl = BaseListVariadic(self.node, identifier, prop_name, base_type, default_amount)
self._add_input(decl)
More information about the Bf-blender-cvs
mailing list