[Bf-blender-cvs] [5da27a41c14] functions: improve naming

[Jacques Lucke]

Commit: 5da27a41c145e8cad96832ccbd555ad19610104d
Author: Jacques Lucke
Date:   Sun Jun 9 12:59:41 2019 +0200
Branches: functions
https://developer.blender.org/rB5da27a41c145e8cad96832ccbd555ad19610104d

improve naming

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

M	source/blender/simulations/bparticles/c_wrapper.cpp
M	source/blender/simulations/bparticles/core.hpp
M	source/blender/simulations/bparticles/playground_solver.cpp

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

diff --git a/source/blender/simulations/bparticles/c_wrapper.cpp b/source/blender/simulations/bparticles/c_wrapper.cpp
index ca4a210a362..0866ddb3927 100644
--- a/source/blender/simulations/bparticles/c_wrapper.cpp
+++ b/source/blender/simulations/bparticles/c_wrapper.cpp
@@ -15,7 +15,7 @@
 
 using BParticles::AttributeType;
 using BParticles::Description;
-using BParticles::EmitterDestination;
+using BParticles::EmitterBuffers;
 using BParticles::EmitterInfoBuilder;
 using BParticles::NamedBuffers;
 using BParticles::ParticlesBlock;
@@ -58,9 +58,9 @@ class TestEmitter : public BParticles::Emitter {
     builder.inits_vec3_attribute("Velocity");
   }
 
-  void emit(std::function<EmitterDestination &()> request_destination) override
+  void emit(std::function<EmitterBuffers &()> request_buffers) override
   {
-    EmitterDestination &dst = request_destination();
+    EmitterBuffers &dst = request_buffers();
     BLI_assert(dst.size() > 0);
 
     auto positions = dst.vec3_buffer("Position");
@@ -70,7 +70,7 @@ class TestEmitter : public BParticles::Emitter {
       positions[i] = {(float)(rand() % 10000) / 3000.0f, 0, 1};
       velocities[i] = {0, 1, 1};
     }
-    dst.initialized_n(dst.size());
+    dst.set_initialized(dst.size());
   }
 };
 
diff --git a/source/blender/simulations/bparticles/core.hpp b/source/blender/simulations/bparticles/core.hpp
index b395740c6a0..a5492f62d7b 100644
--- a/source/blender/simulations/bparticles/core.hpp
+++ b/source/blender/simulations/bparticles/core.hpp
@@ -44,17 +44,17 @@ class Force {
   virtual void add_force(NamedBuffers &buffers, ArrayRef<Vec3> dst) = 0;
 };
 
-class EmitterDestination {
+class EmitterBuffers {
  private:
   NamedBuffers &m_buffers;
   uint m_emitted_amount = 0;
 
  public:
-  EmitterDestination(NamedBuffers &buffers) : m_buffers(buffers)
+  EmitterBuffers(NamedBuffers &buffers) : m_buffers(buffers)
   {
   }
 
-  void initialized_n(uint n)
+  void set_initialized(uint n)
   {
     m_emitted_amount += n;
     BLI_assert(m_emitted_amount <= m_buffers.size());
@@ -155,7 +155,7 @@ class Emitter {
   virtual ~Emitter();
 
   virtual void info(EmitterInfoBuilder &info) const = 0;
-  virtual void emit(std::function<EmitterDestination &()> request_destination) = 0;
+  virtual void emit(std::function<EmitterBuffers &()> request_buffers) = 0;
 };
 
 class Description {
diff --git a/source/blender/simulations/bparticles/playground_solver.cpp b/source/blender/simulations/bparticles/playground_solver.cpp
index c98fa702ff3..b393dc0e95f 100644
--- a/source/blender/simulations/bparticles/playground_solver.cpp
+++ b/source/blender/simulations/bparticles/playground_solver.cpp
@@ -126,18 +126,18 @@ class SimpleSolver : public Solver {
   void emit_from_emitter(MyState &state, EmitterInfo &emitter, float elapsed_seconds)
   {
     SmallVector<ParticlesBlockSlice> block_slices;
-    SmallVector<EmitterDestination> destinations;
-    auto request_destination = [&state, &block_slices, &destinations]() -> EmitterDestination & {
+    SmallVector<EmitterBuffers> destinations;
+    auto request_buffers = [&state, &block_slices, &destinations]() -> EmitterBuffers & {
       ParticlesBlock *block = state.particles->new_block();
       block_slices.append(block->slice_all());
-      destinations.append(EmitterDestination{block_slices.last()});
+      destinations.append(EmitterBuffers{block_slices.last()});
       return destinations.last();
     };
 
-    emitter.emitter().emit(request_destination);
+    emitter.emitter().emit(request_buffers);
 
     for (uint i = 0; i < destinations.size(); i++) {
-      EmitterDestination &dst = destinations[i];
+      EmitterBuffers &dst = destinations[i];
       ParticlesBlockSlice emitted_data = block_slices[i].take_front(dst.emitted_amount());
       ParticlesBlock *block = emitted_data.block();