[Bf-blender-cvs] [8a69395d6a8] functions: rename SocketBuilder to NodeBuilder
Jacques Lucke
noreply at git.blender.org
Mon Jul 22 18:13:03 CEST 2019
Commit: 8a69395d6a83ea387661e78fa8788a09464220bc
Author: Jacques Lucke
Date: Mon Jul 22 12:41:02 2019 +0200
Branches: functions
https://developer.blender.org/rB8a69395d6a83ea387661e78fa8788a09464220bc
rename SocketBuilder to NodeBuilder
===================================================================
M release/scripts/startup/nodes/base.py
M release/scripts/startup/nodes/bparticle_nodes/age_reached_event.py
M release/scripts/startup/nodes/bparticle_nodes/change_direction.py
M release/scripts/startup/nodes/bparticle_nodes/close_by_points.py
M release/scripts/startup/nodes/bparticle_nodes/condition.py
M release/scripts/startup/nodes/bparticle_nodes/custom_emitter.py
M release/scripts/startup/nodes/bparticle_nodes/explode_particle.py
M release/scripts/startup/nodes/bparticle_nodes/gravity_force.py
M release/scripts/startup/nodes/bparticle_nodes/initial_grid_emitter.py
M release/scripts/startup/nodes/bparticle_nodes/kill_particle.py
M release/scripts/startup/nodes/bparticle_nodes/mesh_collision_event.py
M release/scripts/startup/nodes/bparticle_nodes/mesh_emitter.py
M release/scripts/startup/nodes/bparticle_nodes/particle_info.py
M release/scripts/startup/nodes/bparticle_nodes/particle_type.py
M release/scripts/startup/nodes/bparticle_nodes/point_emitter.py
M release/scripts/startup/nodes/bparticle_nodes/trails.py
M release/scripts/startup/nodes/bparticle_nodes/turbulence_force.py
M release/scripts/startup/nodes/function_nodes/combine_vector.py
M release/scripts/startup/nodes/function_nodes/compare.py
M release/scripts/startup/nodes/function_nodes/float_math.py
M release/scripts/startup/nodes/function_nodes/float_range.py
M release/scripts/startup/nodes/function_nodes/function_input.py
M release/scripts/startup/nodes/function_nodes/function_output.py
M release/scripts/startup/nodes/function_nodes/get_list_element.py
M release/scripts/startup/nodes/function_nodes/list_length.py
M release/scripts/startup/nodes/function_nodes/pack_list.py
M release/scripts/startup/nodes/function_nodes/separate_vector.py
M release/scripts/startup/nodes/function_nodes/vector_math.py
R099 release/scripts/startup/nodes/socket_builder.py release/scripts/startup/nodes/node_builder.py
M release/scripts/startup/nodes/sync.py
===================================================================
diff --git a/release/scripts/startup/nodes/base.py b/release/scripts/startup/nodes/base.py
index cabd99a8049..310e165287e 100644
--- a/release/scripts/startup/nodes/base.py
+++ b/release/scripts/startup/nodes/base.py
@@ -83,8 +83,8 @@ class BaseNode:
return self.id_data
def get_socket_builder(self):
- from . socket_builder import SocketBuilder
- builder = SocketBuilder(self)
+ from . node_builder import NodeBuilder
+ builder = NodeBuilder(self)
self.declaration(builder)
return builder
diff --git a/release/scripts/startup/nodes/bparticle_nodes/age_reached_event.py b/release/scripts/startup/nodes/bparticle_nodes/age_reached_event.py
index b03a36d58b5..300523a55fa 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/age_reached_event.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/age_reached_event.py
@@ -1,13 +1,13 @@
import bpy
from bpy.props import *
from .. base import BParticlesNode
-from .. socket_builder import SocketBuilder
+from .. node_builder import NodeBuilder
class AgeReachedEventNode(bpy.types.Node, BParticlesNode):
bl_idname = "bp_AgeReachedEventNode"
bl_label = "Age Reached Event"
- def declaration(self, builder : SocketBuilder):
+ def declaration(self, builder : NodeBuilder):
builder.event_input("event", "Event")
builder.fixed_input("age", "Age", "Float", default=3)
builder.control_flow_output("on_event", "On Event")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/change_direction.py b/release/scripts/startup/nodes/bparticle_nodes/change_direction.py
index b3487c13ffa..ba7be1ebaeb 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/change_direction.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/change_direction.py
@@ -1,13 +1,13 @@
import bpy
from bpy.props import *
from .. base import BParticlesNode
-from .. socket_builder import SocketBuilder
+from .. node_builder import NodeBuilder
class ChangeParticleDirectionNode(bpy.types.Node, BParticlesNode):
bl_idname = "bp_ChangeParticleDirectionNode"
bl_label = "Change Particle Direction"
- def declaration(self, builder : SocketBuilder):
+ def declaration(self, builder : NodeBuilder):
builder.control_flow_input("control_in", "(In)")
builder.fixed_input("direction", "Direction", "Vector")
builder.control_flow_output("control_out", "(Out)")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/close_by_points.py b/release/scripts/startup/nodes/bparticle_nodes/close_by_points.py
index 9b499566730..f592b7677c0 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/close_by_points.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/close_by_points.py
@@ -1,13 +1,13 @@
import bpy
from bpy.props import *
from .. base import BParticlesNode
-from .. socket_builder import SocketBuilder
+from .. node_builder import NodeBuilder
class CloseByPointsEventNode(bpy.types.Node, BParticlesNode):
bl_idname = "bp_CloseByPointsEventNode"
bl_label = "Close By Points Event"
- def declaration(self, builder : SocketBuilder):
+ def declaration(self, builder : NodeBuilder):
builder.event_input("event", "Event")
builder.fixed_input("points", "Points", "Vector List")
builder.fixed_input("distance", "Distance", "Float", default=1)
diff --git a/release/scripts/startup/nodes/bparticle_nodes/condition.py b/release/scripts/startup/nodes/bparticle_nodes/condition.py
index b2c3335344e..87bdb64a7dd 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/condition.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/condition.py
@@ -1,13 +1,13 @@
import bpy
from bpy.props import *
from .. base import BParticlesNode
-from .. socket_builder import SocketBuilder
+from .. node_builder import NodeBuilder
class ParticleConditionNode(bpy.types.Node, BParticlesNode):
bl_idname = "bp_ParticleConditionNode"
bl_label = "Particle Condition"
- def declaration(self, builder : SocketBuilder):
+ def declaration(self, builder : NodeBuilder):
builder.control_flow_input("control_in", "(In)")
builder.fixed_input("condition", "Condition", "Boolean")
builder.control_flow_output("if_true", "If True")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/custom_emitter.py b/release/scripts/startup/nodes/bparticle_nodes/custom_emitter.py
index aed71ca419f..40823439d18 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/custom_emitter.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/custom_emitter.py
@@ -1,7 +1,7 @@
import bpy
from bpy.props import *
from .. base import FunctionNode
-from .. socket_builder import SocketBuilder
+from .. node_builder import NodeBuilder
from .. node_operators import new_function_tree
class CustomEmitterNode(bpy.types.Node, FunctionNode):
@@ -14,7 +14,7 @@ class CustomEmitterNode(bpy.types.Node, FunctionNode):
update=FunctionNode.refresh,
)
- def declaration(self, builder: SocketBuilder):
+ def declaration(self, builder: NodeBuilder):
if self.function_tree:
builder.tree_interface_input("inputs", self.function_tree, 'IN',
ignored={("Float", "Time Step"), ("Float", "Start Time")})
diff --git a/release/scripts/startup/nodes/bparticle_nodes/explode_particle.py b/release/scripts/startup/nodes/bparticle_nodes/explode_particle.py
index 47107bcd3bc..b987ff1b367 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/explode_particle.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/explode_particle.py
@@ -1,7 +1,7 @@
import bpy
from bpy.props import *
from .. base import BParticlesNode
-from .. socket_builder import SocketBuilder
+from .. node_builder import NodeBuilder
class ExplodeParticleNode(bpy.types.Node, BParticlesNode):
bl_idname = "bp_ExplodeParticleNode"
@@ -9,7 +9,7 @@ class ExplodeParticleNode(bpy.types.Node, BParticlesNode):
particle_type_name: StringProperty(maxlen=64)
- def declaration(self, builder : SocketBuilder):
+ def declaration(self, builder : NodeBuilder):
builder.control_flow_input("control_in", "(In)")
builder.fixed_input("amount", "Amount", "Integer", default=10)
builder.fixed_input("speed", "Speed", "Float", default=2)
diff --git a/release/scripts/startup/nodes/bparticle_nodes/gravity_force.py b/release/scripts/startup/nodes/bparticle_nodes/gravity_force.py
index 99842ef8d74..c7886dc2f5d 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/gravity_force.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/gravity_force.py
@@ -1,12 +1,12 @@
import bpy
from bpy.props import *
from .. base import BParticlesNode
-from .. socket_builder import SocketBuilder
+from .. node_builder import NodeBuilder
class GravityForceNode(bpy.types.Node, BParticlesNode):
bl_idname = "bp_GravityForceNode"
bl_label = "Gravity Force"
- def declaration(self, builder : SocketBuilder):
+ def declaration(self, builder : NodeBuilder):
builder.fixed_input("direction", "Direction", "Vector", default=(0, 0, -1))
builder.particle_modifier_output("force", "Force")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/initial_grid_emitter.py b/release/scripts/startup/nodes/bparticle_nodes/initial_grid_emitter.py
index 5bd7a1f3a06..99c92eaee29 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/initial_grid_emitter.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/initial_grid_emitter.py
@@ -1,13 +1,13 @@
import bpy
from bpy.props import *
from .. base import BParticlesNode
-from .. socket_builder import SocketBuilder
+from .. node_builder import NodeBuilder
class InitialGridEmitterNode(bpy.types.Node, BParticlesNode):
bl_idname = "bp_InitialGridEmitterNode"
bl_label = "Initial Grid Emitter"
- def declaration(self, builder : SocketBuilder):
+ def declaration(self, builder : NodeBuilder):
builder.fixed_input("amount_x", "Amount X", "Integer", default=10)
builder.fixed_input("amount_y", "Amount Y", "Integer", default=10)
builder.fixed_input("step_x", "Step X", "Float", default=0.2)
diff --git a/release/scripts/startup/nodes/bparticle_nodes/kill_particle.py b/release/scripts/startup/nodes/bparticle_nodes/kill_particle.py
index 72ef2da2ca2..31e14260d8f 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/kill_particle.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/kill_particle.py
@@ -1,11 +1,11 @@
import bpy
from bpy.props import *
from .. base import BParticlesNode
-from .. socket_builder import SocketBuilder
+from .. node_builder import NodeBuilder
class KillParticleNode(bpy.types.Node, BParticlesNode):
bl_idname = "bp_KillParticleNode"
bl_label = "Kill Particle"
- def declaration(self, builder : SocketBuilder):
+ def declaration(self, builder : NodeBuilder):
builder.control_flow_input("control_in", "(In)")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/mesh_collision_event.py b/release/scripts/startup/nodes/bparticle_nodes/mesh_collision_event.py
index dacb5e4e517..0846161ada0 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/mesh_collision_event.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/mesh_collision_event.py
@@ -1,7 +1,7 @@
import bpy
from bpy.props import *
from .. base import BParticlesNode
-from .. socket_builder import SocketBuilder
+from .. node_builder import NodeBuilder
class MeshCollisionEventNode(bpy.types.Node, BParticlesNode):
bl_idname = "bp_MeshCollisionEventNode"
@@ -12,7 +12,7 @@ class MeshCollisionEventNode(bpy.types.Node, BParticlesNode):
type=bpy.types.Object,
)
- def declaration(self, builder : SocketBuilder):
+ def declaration(self, builder : NodeBuilder):
builder.event_input("event", "Event")
builder.control_flow_output("on_event", "On event")
builder.fixed_output("normal", "Normal", "Vector")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/mesh_emitter.py b/release/scripts/startup/nodes/bparticle_nodes/mesh_emitter.py
index 93d659fa1de..75a2e43270a 100644
--- a/release/scripts/startup/node
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list