diff options
author | Jacques Lucke <jacques@blender.org> | 2020-07-22 15:16:08 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-07-22 15:16:08 +0300 |
commit | 980dd43bd4be7d5f2d893148984e5fd96c5747f4 (patch) | |
tree | bcfd4a1f02358f97ea1804f81f469689be00f31a /source/blender/modifiers/intern/MOD_simulation.cc | |
parent | 47b6c332587ca45eddc98e75b3f563e2f17a0d47 (diff) |
Particles: give emitter its own state
High quality emitters need to maintain state themselves. For example,
this it needs to remember when it spawned the last particle.
This is especially important when the birth rate is changing over time.
Otherwise, there will be very visible artifacts.
It is quite likely that other components of the simulation need their own
state as well. Therefore, I refactored the `SimulationState` type a bit,
to make it more extensible. Instead of using hardcoded type numbers, a
string is used to identify the state type. Also, instead of having switch
statements in many places, there is a new `SimulationStateType` that
encapsulates information about how a specific state is created/freed/copied/...
I removed the integration with the point cache for now, because it was
not used anyway in it's current state.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_simulation.cc')
-rw-r--r-- | source/blender/modifiers/intern/MOD_simulation.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/source/blender/modifiers/intern/MOD_simulation.cc b/source/blender/modifiers/intern/MOD_simulation.cc index 819ed320255..d9cc9840e08 100644 --- a/source/blender/modifiers/intern/MOD_simulation.cc +++ b/source/blender/modifiers/intern/MOD_simulation.cc @@ -93,20 +93,8 @@ static bool isDisabled(const struct Scene *UNUSED(scene), static const ParticleSimulationState *find_particle_state(SimulationModifierData *smd) { - if (smd->simulation == nullptr) { - return nullptr; - } - if (smd->data_path == nullptr) { - return nullptr; - } - LISTBASE_FOREACH (const SimulationState *, state, &smd->simulation->states) { - if (STREQ(smd->data_path, state->name)) { - if (state->type == SIM_STATE_TYPE_PARTICLES) { - return (ParticleSimulationState *)state; - } - } - } - return nullptr; + return (const ParticleSimulationState *)BKE_simulation_state_try_find_by_name_and_type( + smd->simulation, smd->data_path, SIM_TYPE_NAME_PARTICLE_SIMULATION); } static PointCloud *modifyPointCloud(ModifierData *md, |