[Bf-blender-cvs] [459b54b45cd] functions: remove unused code

[Jacques Lucke]

Commit: 459b54b45cd5e609d7bc8f35d96ca23b63937a41
Author: Jacques Lucke
Date:   Fri Nov 15 15:06:36 2019 +0100
Branches: functions
https://developer.blender.org/rB459b54b45cd5e609d7bc8f35d96ca23b63937a41

remove unused code

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

M	source/blender/simulations/bparticles/events.cpp
M	source/blender/simulations/bparticles/particle_function.cpp
M	source/blender/simulations/bparticles/particle_function.hpp

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

diff --git a/source/blender/simulations/bparticles/events.cpp b/source/blender/simulations/bparticles/events.cpp
index 067e402b8f6..e894efe8404 100644
--- a/source/blender/simulations/bparticles/events.cpp
+++ b/source/blender/simulations/bparticles/events.cpp
@@ -80,12 +80,7 @@ void CustomEvent::filter(EventFilterInterface &interface)
     }
   }
 
-  auto inputs = m_inputs_fn->compute(
-      pindices_to_check,
-      interface.attributes(),
-      ParticleTimes::FromDurationsAndEnd(interface.remaining_durations(),
-                                         interface.step_end_time()),
-      nullptr);
+  auto inputs = m_inputs_fn->compute(pindices_to_check, interface.attributes(), nullptr);
 
   for (uint pindex : pindices_to_check) {
     bool condition = inputs->get<bool>("Condition", 0, pindex);
diff --git a/source/blender/simulations/bparticles/particle_function.cpp b/source/blender/simulations/bparticles/particle_function.cpp
index 3aa5187f44e..e8641e2c9fc 100644
--- a/source/blender/simulations/bparticles/particle_function.cpp
+++ b/source/blender/simulations/bparticles/particle_function.cpp
@@ -27,43 +27,27 @@ ParticleFunction::~ParticleFunction()
 
 std::unique_ptr<ParticleFunctionResult> ParticleFunction::compute(ActionInterface &interface)
 {
-  return this->compute(interface.pindices(),
-                       interface.attributes(),
-                       ParticleTimes::FromCurrentTimes(interface.current_times()),
-                       &interface.context());
+  return this->compute(interface.pindices(), interface.attributes(), &interface.context());
 }
 
 std::unique_ptr<ParticleFunctionResult> ParticleFunction::compute(
     OffsetHandlerInterface &interface)
 {
-  return this->compute(interface.pindices(),
-                       interface.attributes(),
-                       ParticleTimes::FromDurationsAndEnd(interface.remaining_durations(),
-                                                          interface.step_end_time()),
-                       nullptr);
+  return this->compute(interface.pindices(), interface.attributes(), nullptr);
 }
 
 std::unique_ptr<ParticleFunctionResult> ParticleFunction::compute(ForceInterface &interface)
 {
-  return this->compute(interface.pindices(),
-                       interface.attributes(),
-                       ParticleTimes::FromDurationsAndEnd(interface.remaining_durations(),
-                                                          interface.step_end_time()),
-                       nullptr);
+  return this->compute(interface.pindices(), interface.attributes(), nullptr);
 }
 
 std::unique_ptr<ParticleFunctionResult> ParticleFunction::compute(EventFilterInterface &interface)
 {
-  return this->compute(interface.pindices(),
-                       interface.attributes(),
-                       ParticleTimes::FromDurationsAndEnd(interface.remaining_durations(),
-                                                          interface.step_end_time()),
-                       nullptr);
+  return this->compute(interface.pindices(), interface.attributes(), nullptr);
 }
 
 std::unique_ptr<ParticleFunctionResult> ParticleFunction::compute(ArrayRef<uint> pindices,
                                                                   AttributesRef attributes,
-                                                                  ParticleTimes particle_times,
                                                                   ActionContext *action_context)
 {
   uint array_size = attributes.size();
@@ -89,7 +73,7 @@ std::unique_ptr<ParticleFunctionResult> ParticleFunction::compute(ArrayRef<uint>
         break;
       case FN::MFParamType::Category::ReadonlySingleInput: {
         auto *provider = m_input_providers[param_index];
-        InputProviderInterface interface(pindices, attributes, particle_times, action_context);
+        InputProviderInterface interface(pindices, attributes, action_context);
         auto optional_array = provider->get(interface);
         if (optional_array.has_value()) {
           ParticleFunctionInputArray array = optional_array.extract();
diff --git a/source/blender/simulations/bparticles/particle_function.hpp b/source/blender/simulations/bparticles/particle_function.hpp
index 2d35ad1352b..fe27dd124a6 100644
--- a/source/blender/simulations/bparticles/particle_function.hpp
+++ b/source/blender/simulations/bparticles/particle_function.hpp
@@ -61,81 +61,17 @@ struct ParticleFunctionInputArray {
   }
 };
 
-struct ParticleTimes {
- public:
-  enum Type {
-    Current,
-    DurationAndEnd,
-  };
-
- private:
-  Type m_type;
-  ArrayRef<float> m_current_times;
-  ArrayRef<float> m_remaining_durations;
-  float m_end_time;
-
-  ParticleTimes(Type type,
-                ArrayRef<float> current_times,
-                ArrayRef<float> remaining_durations,
-                float end_time)
-      : m_type(type),
-        m_current_times(current_times),
-        m_remaining_durations(remaining_durations),
-        m_end_time(end_time)
-  {
-  }
-
- public:
-  static ParticleTimes FromCurrentTimes(ArrayRef<float> current_times)
-  {
-    return ParticleTimes(Type::Current, current_times, {}, 0);
-  }
-
-  static ParticleTimes FromDurationsAndEnd(ArrayRef<float> remaining_durations, float end_time)
-  {
-    return ParticleTimes(Type::DurationAndEnd, {}, remaining_durations, end_time);
-  }
-
-  Type type()
-  {
-    return m_type;
-  }
-
-  ArrayRef<float> current_times()
-  {
-    BLI_assert(m_type == Type::Current);
-    return m_current_times;
-  }
-
-  ArrayRef<float> remaining_durations()
-  {
-    BLI_assert(m_type == Type::DurationAndEnd);
-    return m_remaining_durations;
-  }
-
-  float end_time()
-  {
-    BLI_assert(m_type == Type::DurationAndEnd);
-    return m_end_time;
-  }
-};
-
 class InputProviderInterface {
  private:
   ArrayRef<uint> m_pindices;
   AttributesRef m_attributes;
-  ParticleTimes m_particle_times;
   ActionContext *m_action_context;
 
  public:
   InputProviderInterface(ArrayRef<uint> pindices,
                          AttributesRef attributes,
-                         ParticleTimes particle_times,
                          ActionContext *action_context)
-      : m_pindices(pindices),
-        m_attributes(attributes),
-        m_particle_times(particle_times),
-        m_action_context(action_context)
+      : m_pindices(pindices), m_attributes(attributes), m_action_context(action_context)
   {
   }
 
@@ -149,11 +85,6 @@ class InputProviderInterface {
     return m_attributes;
   }
 
-  ParticleTimes &particle_times()
-  {
-    return m_particle_times;
-  }
-
   ActionContext *action_context()
   {
     return m_action_context;
@@ -185,7 +116,6 @@ class ParticleFunction {
 
   std::unique_ptr<ParticleFunctionResult> compute(ArrayRef<uint> pindices,
                                                   AttributesRef attributes,
-                                                  ParticleTimes particle_times,
                                                   ActionContext *action_context);
 };