[Bf-blender-cvs] [4b5a23b0968] functions: rename EmitterHelper to EmitterInterface

Jacques Lucke noreply at git.blender.org
Mon Jun 24 12:38:13 CEST 2019


Commit: 4b5a23b0968d05cffd5146f5e9e6fe7e114df528
Author: Jacques Lucke
Date:   Mon Jun 24 09:44:14 2019 +0200
Branches: functions
https://developer.blender.org/rB4b5a23b0968d05cffd5146f5e9e6fe7e114df528

rename EmitterHelper to EmitterInterface

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

M	source/blender/simulations/bparticles/core.hpp
M	source/blender/simulations/bparticles/emitters.cpp
M	source/blender/simulations/bparticles/simulate.cpp

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

diff --git a/source/blender/simulations/bparticles/core.hpp b/source/blender/simulations/bparticles/core.hpp
index 42070819b24..9af1e33caf4 100644
--- a/source/blender/simulations/bparticles/core.hpp
+++ b/source/blender/simulations/bparticles/core.hpp
@@ -131,12 +131,12 @@ class EmitterTarget {
 
 using RequestEmitterTarget = std::function<EmitterTarget &()>;
 
-class EmitterHelper {
+class EmitterInterface {
  private:
   RequestEmitterTarget &m_request_target;
 
  public:
-  EmitterHelper(RequestEmitterTarget &request_target) : m_request_target(request_target)
+  EmitterInterface(RequestEmitterTarget &request_target) : m_request_target(request_target)
   {
   }
 
@@ -171,7 +171,7 @@ class Emitter {
  public:
   virtual ~Emitter();
 
-  virtual void emit(EmitterHelper helper) = 0;
+  virtual void emit(EmitterInterface interface) = 0;
 };
 
 class ParticleInfluences {
diff --git a/source/blender/simulations/bparticles/emitters.cpp b/source/blender/simulations/bparticles/emitters.cpp
index acb23b8db3f..335c445eae7 100644
--- a/source/blender/simulations/bparticles/emitters.cpp
+++ b/source/blender/simulations/bparticles/emitters.cpp
@@ -20,9 +20,9 @@ class PointEmitter : public Emitter {
   {
   }
 
-  void emit(EmitterHelper helper) override
+  void emit(EmitterInterface interface) override
   {
-    auto &target = helper.request_raw();
+    auto &target = interface.request_raw();
     auto positions = target.attributes().get_float3("Position");
     auto velocities = target.attributes().get_float3("Velocity");
 
@@ -44,7 +44,7 @@ class SurfaceEmitter : public Emitter {
   {
   }
 
-  void emit(EmitterHelper helper) override
+  void emit(EmitterInterface interface) override
   {
     MLoop *loops = m_mesh->mloop;
     MVert *verts = m_mesh->mvert;
@@ -69,7 +69,7 @@ class SurfaceEmitter : public Emitter {
       velocities.append(m_transform.transform_direction(normal * m_normal_velocity));
     }
 
-    auto target = helper.request(positions.size());
+    auto target = interface.request(positions.size());
     target.set_float3("Position", positions);
     target.set_float3("Velocity", velocities);
   }
@@ -85,7 +85,7 @@ class PathEmitter : public Emitter {
   {
   }
 
-  void emit(EmitterHelper helper) override
+  void emit(EmitterInterface interface) override
   {
     SmallVector<float3> positions;
     for (uint i = 0; i < m_path.len - 1; i++) {
@@ -100,7 +100,7 @@ class PathEmitter : public Emitter {
       }
     }
 
-    auto target = helper.request(positions.size());
+    auto target = interface.request(positions.size());
     target.set_float3("Position", positions);
     target.set_float3("Velocity", SmallVector<float3>(positions.size()));
   }
diff --git a/source/blender/simulations/bparticles/simulate.cpp b/source/blender/simulations/bparticles/simulate.cpp
index 300993e7223..26ac40a0771 100644
--- a/source/blender/simulations/bparticles/simulate.cpp
+++ b/source/blender/simulations/bparticles/simulate.cpp
@@ -376,7 +376,7 @@ BLI_NOINLINE static void emit_new_particles_from_emitter(ParticlesContainer &con
     return targets.last();
   };
 
-  emitter.emit(EmitterHelper{request_target});
+  emitter.emit(EmitterInterface{request_target});
 
   for (uint i = 0; i < targets.size(); i++) {
     EmitterTarget &target = targets[i];



More information about the Bf-blender-cvs mailing list