[Bf-blender-cvs] [166e05b6ed1] functions: store node in declaration
Jacques Lucke
noreply at git.blender.org
Fri Mar 29 13:57:28 CET 2019
Commit: 166e05b6ed1a6ce44b0a1015d6c272cc3124d537
Author: Jacques Lucke
Date: Fri Mar 29 09:53:36 2019 +0100
Branches: functions
https://developer.blender.org/rB166e05b6ed1a6ce44b0a1015d6c272cc3124d537
store node in declaration
===================================================================
M release/scripts/startup/function_nodes/base.py
M release/scripts/startup/function_nodes/nodes/call.py
M release/scripts/startup/function_nodes/nodes/clamp.py
M release/scripts/startup/function_nodes/nodes/combine_vector.py
M release/scripts/startup/function_nodes/nodes/float_math.py
M release/scripts/startup/function_nodes/nodes/function_input.py
M release/scripts/startup/function_nodes/nodes/function_output.py
M release/scripts/startup/function_nodes/nodes/get_list_element.py
M release/scripts/startup/function_nodes/nodes/map_range.py
M release/scripts/startup/function_nodes/nodes/object_transforms.py
M release/scripts/startup/function_nodes/nodes/pack_list.py
M release/scripts/startup/function_nodes/nodes/random_number.py
M release/scripts/startup/function_nodes/nodes/separate_vector.py
M release/scripts/startup/function_nodes/nodes/switch.py
M release/scripts/startup/function_nodes/nodes/vector_distance.py
M release/scripts/startup/function_nodes/socket_decl.py
M release/scripts/startup/function_nodes/update.py
===================================================================
diff --git a/release/scripts/startup/function_nodes/base.py b/release/scripts/startup/function_nodes/base.py
index 5b02bfa1cb6..f40ae30abfc 100644
--- a/release/scripts/startup/function_nodes/base.py
+++ b/release/scripts/startup/function_nodes/base.py
@@ -29,13 +29,13 @@ class NodeStorage:
self.inputs_per_decl = {}
sockets = iter(self.node.inputs)
for decl in self.inputs_decl:
- group = tuple(itertools.islice(sockets, decl.amount(self.node)))
+ group = tuple(itertools.islice(sockets, decl.amount()))
self.inputs_per_decl[decl] = group
self.outputs_per_decl = {}
sockets = iter(self.node.outputs)
for decl in self.outputs_decl:
- group = tuple(itertools.islice(sockets, decl.amount(self.node)))
+ group = tuple(itertools.islice(sockets, decl.amount()))
self.outputs_per_decl[decl] = group
self.sockets_per_decl = {}
@@ -76,9 +76,9 @@ class BaseNode:
with managed_update():
inputs, outputs = self.get_sockets()
for decl in inputs:
- decl.build(self, self.inputs)
+ decl.build(self.inputs)
for decl in outputs:
- decl.build(self, self.outputs)
+ decl.build(self.outputs)
@classmethod
def get_search_terms(cls):
@@ -107,9 +107,9 @@ class BaseNode:
inputs, outputs = self.get_sockets()
for decl in inputs:
- decl.build(self, self.inputs)
+ decl.build(self.inputs)
for decl in outputs:
- decl.build(self, self.outputs)
+ decl.build(self.outputs)
self.storage.set_current_declaration(inputs, outputs)
self.storage.try_restore_socket_states()
@@ -145,7 +145,7 @@ class BaseNode:
def draw_buttons(self, context, layout):
self.draw(layout)
for decl in self.storage.sockets_per_decl.keys():
- decl.draw_node(layout, self)
+ decl.draw_node(layout)
def draw(self, layout):
pass
@@ -175,7 +175,7 @@ class BaseNode:
storage = self.storage
decl = storage.decl_per_socket[socket]
index = storage.decl_index_per_socket[socket]
- decl.draw_socket(layout, self, socket, index)
+ decl.draw_socket(layout, socket, index)
@classmethod
def iter_final_subclasses(cls):
diff --git a/release/scripts/startup/function_nodes/nodes/call.py b/release/scripts/startup/function_nodes/nodes/call.py
index f82277c2a50..b5c6d18942b 100644
--- a/release/scripts/startup/function_nodes/nodes/call.py
+++ b/release/scripts/startup/function_nodes/nodes/call.py
@@ -18,9 +18,9 @@ class CallNode(bpy.types.Node, FunctionNode):
return [], []
return [
- TreeInterfaceDecl("inputs", self.function_tree, "IN"),
+ TreeInterfaceDecl(self, "inputs", self.function_tree, "IN"),
], [
- TreeInterfaceDecl("outputs", self.function_tree, "OUT"),
+ TreeInterfaceDecl(self, "outputs", self.function_tree, "OUT"),
]
def draw(self, layout):
diff --git a/release/scripts/startup/function_nodes/nodes/clamp.py b/release/scripts/startup/function_nodes/nodes/clamp.py
index e4c646703a9..090ee7ba8c9 100644
--- a/release/scripts/startup/function_nodes/nodes/clamp.py
+++ b/release/scripts/startup/function_nodes/nodes/clamp.py
@@ -8,9 +8,9 @@ class ClampNode(bpy.types.Node, FunctionNode):
def get_sockets(self):
return [
- FixedSocketDecl("value", "Value", "Float"),
- FixedSocketDecl("min", "Min", "Float"),
- FixedSocketDecl("max", "Max", "Float"),
+ FixedSocketDecl(self, "value", "Value", "Float"),
+ FixedSocketDecl(self, "min", "Min", "Float"),
+ FixedSocketDecl(self, "max", "Max", "Float"),
], [
- FixedSocketDecl("result", "Result", "Float"),
+ FixedSocketDecl(self, "result", "Result", "Float"),
]
\ No newline at end of file
diff --git a/release/scripts/startup/function_nodes/nodes/combine_vector.py b/release/scripts/startup/function_nodes/nodes/combine_vector.py
index f13c2d1bfcc..1e58956f673 100644
--- a/release/scripts/startup/function_nodes/nodes/combine_vector.py
+++ b/release/scripts/startup/function_nodes/nodes/combine_vector.py
@@ -8,9 +8,9 @@ class CombineVectorNode(bpy.types.Node, FunctionNode):
def get_sockets(self):
return [
- FixedSocketDecl("x", "X", "Float"),
- FixedSocketDecl("y", "Y", "Float"),
- FixedSocketDecl("z", "Z", "Float"),
+ FixedSocketDecl(self, "x", "X", "Float"),
+ FixedSocketDecl(self, "y", "Y", "Float"),
+ FixedSocketDecl(self, "z", "Z", "Float"),
], [
- FixedSocketDecl("result", "Result", "Vector"),
+ FixedSocketDecl(self, "result", "Result", "Vector"),
]
\ No newline at end of file
diff --git a/release/scripts/startup/function_nodes/nodes/float_math.py b/release/scripts/startup/function_nodes/nodes/float_math.py
index 959c00225a1..2a47813e21d 100644
--- a/release/scripts/startup/function_nodes/nodes/float_math.py
+++ b/release/scripts/startup/function_nodes/nodes/float_math.py
@@ -26,10 +26,10 @@ class FloatMathNode(bpy.types.Node, FunctionNode):
def get_sockets(self):
return [
- FixedSocketDecl("a", "A", "Float"),
- FixedSocketDecl("b", "B", "Float"),
+ FixedSocketDecl(self, "a", "A", "Float"),
+ FixedSocketDecl(self, "b", "B", "Float"),
], [
- FixedSocketDecl("result", "Result", "Float"),
+ FixedSocketDecl(self, "result", "Result", "Float"),
]
def draw(self, layout):
diff --git a/release/scripts/startup/function_nodes/nodes/function_input.py b/release/scripts/startup/function_nodes/nodes/function_input.py
index fc87d5b4896..570839487ff 100644
--- a/release/scripts/startup/function_nodes/nodes/function_input.py
+++ b/release/scripts/startup/function_nodes/nodes/function_input.py
@@ -10,5 +10,5 @@ class FunctionInputNode(BaseNode, bpy.types.Node):
def get_sockets(self):
return [], [
- AnyVariadicDecl("outputs", "variadic", "New Input")
+ AnyVariadicDecl(self, "outputs", "variadic", "New Input")
]
diff --git a/release/scripts/startup/function_nodes/nodes/function_output.py b/release/scripts/startup/function_nodes/nodes/function_output.py
index a60adf8990d..795b1245e7a 100644
--- a/release/scripts/startup/function_nodes/nodes/function_output.py
+++ b/release/scripts/startup/function_nodes/nodes/function_output.py
@@ -10,5 +10,5 @@ class FunctionOutputNode(BaseNode, bpy.types.Node):
def get_sockets(self):
return [
- AnyVariadicDecl("inputs", "variadic", "New Output"),
+ AnyVariadicDecl(self, "inputs", "variadic", "New Output"),
], []
\ No newline at end of file
diff --git a/release/scripts/startup/function_nodes/nodes/get_list_element.py b/release/scripts/startup/function_nodes/nodes/get_list_element.py
index 066e23d4e6f..6c164f11d9a 100644
--- a/release/scripts/startup/function_nodes/nodes/get_list_element.py
+++ b/release/scripts/startup/function_nodes/nodes/get_list_element.py
@@ -10,9 +10,9 @@ class GetListElementNode(bpy.types.Node, FunctionNode):
def get_sockets(self):
return [
- ListSocketDecl("list", "List", "active_type", "LIST"),
- FixedSocketDecl("index", "Index", "Integer"),
- ListSocketDecl("fallback", "Fallback", "active_type", "BASE"),
+ ListSocketDecl(self, "list", "List", "active_type", "LIST"),
+ FixedSocketDecl(self, "index", "Index", "Integer"),
+ ListSocketDecl(self, "fallback", "Fallback", "active_type", "BASE"),
], [
- ListSocketDecl("value", "Value", "active_type", "BASE"),
+ ListSocketDecl(self, "value", "Value", "active_type", "BASE"),
]
\ No newline at end of file
diff --git a/release/scripts/startup/function_nodes/nodes/map_range.py b/release/scripts/startup/function_nodes/nodes/map_range.py
index 258586cc585..bbf2c61178b 100644
--- a/release/scripts/startup/function_nodes/nodes/map_range.py
+++ b/release/scripts/startup/function_nodes/nodes/map_range.py
@@ -9,11 +9,11 @@ class MapRangeNode(bpy.types.Node, FunctionNode):
def get_sockets(self):
return [
- FixedSocketDecl("value", "Value", "Float"),
- FixedSocketDecl("from_min", "From Min", "Float"),
- FixedSocketDecl("from_max", "From Max", "Float"),
- FixedSocketDecl("to_min", "To Min", "Float"),
- FixedSocketDecl("to_max", "To Max", "Float"),
+ FixedSocketDecl(self, "value", "Value", "Float"),
+ FixedSocketDecl(self, "from_min", "From Min", "Float"),
+ FixedSocketDecl(self, "from_max", "From Max", "Float"),
+ FixedSocketDecl(self, "to_min", "To Min", "Float"),
+ FixedSocketDecl(self, "to_max", "To Max", "Float"),
], [
- FixedSocketDecl("value", "Value", "Float"),
+ FixedSocketDecl(self, "value", "Value", "Float"),
]
\ No newline at end of file
diff --git a/release/scripts/startup/function_nodes/nodes/object_transforms.py b/release/scripts/startup/function_nodes/nodes/object_transforms.py
index b253ad077ca..780121d3aa0 100644
--- a/release/scripts/startup/function_nodes/nodes/object_transforms.py
+++ b/release/scripts/startup/function_nodes/nodes/object_transforms.py
@@ -14,7 +14,7 @@ class ObjectTransformsNode(bpy.types.Node, FunctionNode):
def get_sockets(self):
return [], [
- FixedSocketDecl("location", "Location", "Vector"),
+ FixedSocketDecl(self, "location", "Location", "Vector"),
]
def draw(self, layout):
diff --git a/release/scripts/startup/function_nodes/nodes/pack_list.py b/release/scripts/startup/function_nodes/nodes/pack_list.py
index 1d709e06faa..47067e6c382 100644
--- a/release/scripts/startup/function_nodes/nodes/pack_list.py
+++ b/release/scripts/startup/function_nodes/nodes/pack_list.py
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list