[Bf-blender-cvs] [e1a1112c472] builtin-simulation-nodes: new Emit Particles node ui

[Jacques Lucke]

Commit: e1a1112c4721ef48b9365d0e7ca2180971c301ff
Author: Jacques Lucke
Date:   Thu Mar 12 15:10:31 2020 +0100
Branches: builtin-simulation-nodes
https://developer.blender.org/rBe1a1112c4721ef48b9365d0e7ca2180971c301ff

new Emit Particles node ui

===================================================================

M	release/scripts/startup/nodeitems_builtins.py
M	source/blender/blenkernel/BKE_node.h
M	source/blender/blenkernel/intern/node.c
M	source/blender/nodes/CMakeLists.txt
M	source/blender/nodes/NOD_simulation.h
M	source/blender/nodes/NOD_static_types.h
A	source/blender/nodes/simulation/nodes/node_sim_emit_particles.cc

===================================================================

diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 6dec22b08c8..3fdf6fadc72 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -486,6 +486,7 @@ simulation_node_categories = [
     ]),
     SimulationNodeCategory("EMITTERS", "Emitters", items=[
         NodeItem("SimulationNodeParticleMeshEmitter"),
+        NodeItem("SimulationNodeEmitParticles"),
     ]),
     SimulationNodeCategory("EVENTS", "Events", items=[
         NodeItem("SimulationNodeParticleBirthEvent"),
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 1aa884c8489..01828c5ce95 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1012,6 +1012,7 @@ void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree,
 #define SIM_NODE_MULTI_EXECUTE 1006
 #define SIM_NODE_PARTICLE_MESH_EMITTER 1007
 #define SIM_NODE_PARTICLE_MESH_COLLISION_EVENT 1008
+#define SIM_NODE_EMIT_PARTICLES 1009
 
 #define FN_NODE_COMBINE_VECTOR 1100
 
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 776d236fc35..869379ce746 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -4207,6 +4207,7 @@ static void registerSimulationNodes(void)
   register_node_type_sim_multi_execute();
   register_node_type_sim_particle_mesh_emitter();
   register_node_type_sim_particle_mesh_collision_event();
+  register_node_type_sim_emit_particles();
 }
 
 static void registerFunctionNodes(void)
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index d1160d16e60..0482a0eb081 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -226,6 +226,7 @@ set(SRC
   shader/node_shader_util.c
 
   simulation/nodes/node_sim_common.cc
+  simulation/nodes/node_sim_emit_particles.cc
   simulation/nodes/node_sim_execute_condition.cc
   simulation/nodes/node_sim_force.cc
   simulation/nodes/node_sim_multi_execute.cc
diff --git a/source/blender/nodes/NOD_simulation.h b/source/blender/nodes/NOD_simulation.h
index 999e1b8f355..06d0ec8027e 100644
--- a/source/blender/nodes/NOD_simulation.h
+++ b/source/blender/nodes/NOD_simulation.h
@@ -20,6 +20,7 @@ void register_node_type_sim_execute_condition(void);
 void register_node_type_sim_multi_execute(void);
 void register_node_type_sim_particle_mesh_emitter(void);
 void register_node_type_sim_particle_mesh_collision_event(void);
+void register_node_type_sim_emit_particles(void);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index a6655ee0418..cfa0e52df3f 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -267,6 +267,7 @@ DefNode(SimulationNode, SIM_NODE_EXECUTE_CONDITION,   0,                 "EXECUT
 DefNode(SimulationNode, SIM_NODE_MULTI_EXECUTE,       0,                 "MULTI_EXECUTE",       MultiExecute,       "Multi Execute",        "")
 DefNode(SimulationNode, SIM_NODE_PARTICLE_MESH_EMITTER,  0,              "PARTICLE_MESH_EMITTER",  ParticleMeshEmitter,  "Particle Mesh Emitter", "")
 DefNode(SimulationNode, SIM_NODE_PARTICLE_MESH_COLLISION_EVENT, 0,       "PARTICLE_MESH_COLLISION_EVENT", ParticleMeshCollisionEvent, "Particle Mesh Collision Event", "")
+DefNode(SimulationNode, SIM_NODE_EMIT_PARTICLES, 0,                      "EMIT_PARTICLES",      EmitParticles,      "Emit Particles",       "")
 
 DefNode(FunctionNode, FN_NODE_COMBINE_VECTOR, 0, "COMBINE_VECTOR", CombineVector, "Combine Vector", "")
 
diff --git a/source/blender/nodes/simulation/nodes/node_sim_emit_particles.cc b/source/blender/nodes/simulation/nodes/node_sim_emit_particles.cc
new file mode 100644
index 00000000000..47c239e0bca
--- /dev/null
+++ b/source/blender/nodes/simulation/nodes/node_sim_emit_particles.cc
@@ -0,0 +1,22 @@
+#include "node_sim_util.h"
+
+static bNodeSocketTemplate sim_node_emit_particle_in[] = {
+    {SOCK_INT, N_("Amount"), 10, 0, 0, 0, 0, 10000000},
+    {SOCK_CONTROL_FLOW, N_("Execute")},
+    {-1, ""},
+};
+
+static bNodeSocketTemplate sim_node_emit_particle_out[] = {
+    {SOCK_CONTROL_FLOW, N_("Execute")},
+    {SOCK_EMITTERS, N_("Emitter")},
+    {-1, ""},
+};
+
+void register_node_type_sim_emit_particles()
+{
+  static bNodeType ntype;
+
+  sim_node_type_base(&ntype, SIM_NODE_EMIT_PARTICLES, "Emit Particles", 0, 0);
+  node_type_socket_templates(&ntype, sim_node_emit_particle_in, sim_node_emit_particle_out);
+  nodeRegisterType(&ntype);
+}