[Bf-blender-cvs] [27149c94ee6] functions: rename EventAction to Event + interface name changes
Jacques Lucke
noreply at git.blender.org
Sun Jun 30 16:01:17 CEST 2019
Commit: 27149c94ee661dea800606aa170fcb0d9869e714
Author: Jacques Lucke
Date: Sun Jun 30 13:54:22 2019 +0200
Branches: functions
https://developer.blender.org/rB27149c94ee661dea800606aa170fcb0d9869e714
rename EventAction to Event + interface name changes
===================================================================
M source/blender/simulations/bparticles/actions.cpp
M source/blender/simulations/bparticles/c_wrapper.cpp
M source/blender/simulations/bparticles/core.cpp
M source/blender/simulations/bparticles/core.hpp
M source/blender/simulations/bparticles/events.cpp
M source/blender/simulations/bparticles/simulate.cpp
===================================================================
diff --git a/source/blender/simulations/bparticles/actions.cpp b/source/blender/simulations/bparticles/actions.cpp
index 5005985f0a6..b63049b81bb 100644
--- a/source/blender/simulations/bparticles/actions.cpp
+++ b/source/blender/simulations/bparticles/actions.cpp
@@ -5,7 +5,7 @@
namespace BParticles {
class KillAction : public Action {
- void execute(ActionInterface &interface) override
+ void execute(EventExecuteInterface &interface) override
{
interface.kill(interface.particles().indices());
}
@@ -20,7 +20,7 @@ class MoveAction : public Action {
{
}
- void execute(ActionInterface &interface) override
+ void execute(EventExecuteInterface &interface) override
{
ParticleSet &particles = interface.particles();
@@ -32,7 +32,7 @@ class MoveAction : public Action {
};
class SpawnAction : public Action {
- void execute(ActionInterface &interface) override
+ void execute(EventExecuteInterface &interface) override
{
ParticleSet &particles = interface.particles();
@@ -68,7 +68,7 @@ static float3 random_direction()
}
class ExplodeAction : public Action {
- void execute(ActionInterface &interface) override
+ void execute(EventExecuteInterface &interface) override
{
ParticleSet &particles = interface.particles();
diff --git a/source/blender/simulations/bparticles/c_wrapper.cpp b/source/blender/simulations/bparticles/c_wrapper.cpp
index efd0dc440c5..a8563b64f46 100644
--- a/source/blender/simulations/bparticles/c_wrapper.cpp
+++ b/source/blender/simulations/bparticles/c_wrapper.cpp
@@ -122,7 +122,7 @@ class EulerIntegrator : public Integrator {
}
};
-class EventActionTest : public EventAction {
+class EventActionTest : public Event {
public:
EventFilter *m_event;
Action *m_action;
@@ -137,12 +137,12 @@ class EventActionTest : public EventAction {
delete m_action;
}
- void filter(EventInterface &interface) override
+ void filter(EventFilterInterface &interface) override
{
m_event->filter(interface);
}
- void execute(ActionInterface &interface) override
+ void execute(EventExecuteInterface &interface) override
{
m_action->execute(interface);
}
@@ -150,21 +150,21 @@ class EventActionTest : public EventAction {
class ModifierParticleType : public ParticleType {
public:
- SmallVector<EventAction *> m_event_actions;
+ SmallVector<Event *> m_events;
EulerIntegrator *m_integrator;
~ModifierParticleType()
{
delete m_integrator;
- for (EventAction *event_action : m_event_actions) {
- delete event_action;
+ for (Event *event : m_events) {
+ delete event;
}
}
- ArrayRef<EventAction *> event_actions() override
+ ArrayRef<Event *> events() override
{
- return m_event_actions;
+ return m_events;
}
Integrator &integrator() override
@@ -229,7 +229,7 @@ void BParticles_simulate_modifier(NodeParticlesModifierData *npmd,
auto *type0 = new ModifierParticleType();
description.m_types.add_new(0, type0);
- type0->m_event_actions.append(new EventActionTest(EVENT_age_reached(30.0f), ACTION_kill()));
+ type0->m_events.append(new EventActionTest(EVENT_age_reached(30.0f), ACTION_kill()));
// if (npmd->emitter_object) {
// description.m_emitters.append(EMITTER_mesh_surface(
@@ -243,7 +243,7 @@ void BParticles_simulate_modifier(NodeParticlesModifierData *npmd,
// EventActionTest *event_action = new EventActionTest();
// event_action->m_event = EVENT_mesh_collection(&treedata, npmd->collision_object->obmat);
// event_action->m_action = ACTION_explode();
- // type0->m_event_actions.append(event_action);
+ // type0->m_events.append(event_action);
// }
type0->m_integrator = new EulerIntegrator();
type0->m_integrator->m_forces.append(FORCE_directional({0, 0, -2}));
@@ -254,7 +254,7 @@ void BParticles_simulate_modifier(NodeParticlesModifierData *npmd,
// EventActionTest *event_action = new EventActionTest();
// event_action->m_event = EVENT_age_reached(0.3f);
// event_action->m_action = ACTION_kill();
- // type1->m_event_actions.append(event_action);
+ // type1->m_events.append(event_action);
// }
// type1->m_integrator = new EulerIntegrator();
diff --git a/source/blender/simulations/bparticles/core.cpp b/source/blender/simulations/bparticles/core.cpp
index eff256e65d6..c35356e35a4 100644
--- a/source/blender/simulations/bparticles/core.cpp
+++ b/source/blender/simulations/bparticles/core.cpp
@@ -22,7 +22,7 @@ EventFilter::~EventFilter()
{
}
-EventAction::~EventAction()
+Event::~Event()
{
}
@@ -127,15 +127,15 @@ TimeSpanEmitTarget &EmitterInterface::request(uint particle_type_id, uint size)
/* Action Interface
**************************************/
-ActionInterface::~ActionInterface()
+EventExecuteInterface::~EventExecuteInterface()
{
for (InstantEmitTarget *target : m_emit_targets) {
delete target;
}
}
-InstantEmitTarget &ActionInterface::request_emit_target(uint particle_type_id,
- ArrayRef<uint> original_indices)
+InstantEmitTarget &EventExecuteInterface::request_emit_target(uint particle_type_id,
+ ArrayRef<uint> original_indices)
{
uint size = original_indices.size();
diff --git a/source/blender/simulations/bparticles/core.hpp b/source/blender/simulations/bparticles/core.hpp
index a88bcfb48bd..083b92d0b88 100644
--- a/source/blender/simulations/bparticles/core.hpp
+++ b/source/blender/simulations/bparticles/core.hpp
@@ -295,7 +295,7 @@ class Force {
virtual void add_force(ParticlesBlock &block, ArrayRef<float3> r_force) = 0;
};
-class EventInterface {
+class EventFilterInterface {
private:
ParticleSet m_particles;
AttributeArrays &m_attribute_offsets;
@@ -306,12 +306,12 @@ class EventInterface {
SmallVector<float> &m_filtered_time_factors;
public:
- EventInterface(ParticleSet particles,
- AttributeArrays &attribute_offsets,
- ArrayRef<float> durations,
- float end_time,
- SmallVector<uint> &r_filtered_indices,
- SmallVector<float> &r_filtered_time_factors)
+ EventFilterInterface(ParticleSet particles,
+ AttributeArrays &attribute_offsets,
+ ArrayRef<float> durations,
+ float end_time,
+ SmallVector<uint> &r_filtered_indices,
+ SmallVector<float> &r_filtered_time_factors)
: m_particles(particles),
m_attribute_offsets(attribute_offsets),
m_durations(durations),
@@ -358,10 +358,10 @@ class EventFilter {
public:
virtual ~EventFilter();
- virtual void filter(EventInterface &interface) = 0;
+ virtual void filter(EventFilterInterface &interface) = 0;
};
-class ActionInterface {
+class EventExecuteInterface {
private:
ParticleSet m_particles;
BlockAllocator &m_block_allocator;
@@ -370,9 +370,9 @@ class ActionInterface {
ArrayRef<uint8_t> m_kill_states;
public:
- ActionInterface(ParticleSet particles,
- BlockAllocator &block_allocator,
- ArrayRef<float> current_times)
+ EventExecuteInterface(ParticleSet particles,
+ BlockAllocator &block_allocator,
+ ArrayRef<float> current_times)
: m_particles(particles),
m_block_allocator(block_allocator),
m_current_times(current_times),
@@ -380,7 +380,7 @@ class ActionInterface {
{
}
- ~ActionInterface();
+ ~EventExecuteInterface();
BlockAllocator &block_allocator()
{
@@ -416,15 +416,15 @@ class Action {
public:
virtual ~Action();
- virtual void execute(ActionInterface &interface) = 0;
+ virtual void execute(EventExecuteInterface &interface) = 0;
};
-class EventAction {
+class Event {
public:
- virtual ~EventAction();
+ virtual ~Event();
- virtual void filter(EventInterface &interface) = 0;
- virtual void execute(ActionInterface &interface) = 0;
+ virtual void filter(EventFilterInterface &interface) = 0;
+ virtual void execute(EventExecuteInterface &interface) = 0;
};
class Emitter {
@@ -450,7 +450,7 @@ class ParticleType {
virtual ~ParticleType();
virtual Integrator &integrator() = 0;
- virtual ArrayRef<EventAction *> event_actions() = 0;
+ virtual ArrayRef<Event *> events() = 0;
virtual ArrayRef<std::string> byte_attributes()
{
diff --git a/source/blender/simulations/bparticles/events.cpp b/source/blender/simulations/bparticles/events.cpp
index 0008c36944a..acc8814607f 100644
--- a/source/blender/simulations/bparticles/events.cpp
+++ b/source/blender/simulations/bparticles/events.cpp
@@ -15,7 +15,7 @@ class AgeReachedEvent : public EventFilter {
{
}
- void filter(EventInterface &interface) override
+ void filter(EventFilterInterface &interface) override
{
ParticleSet particles = interface.particles();
auto birth_times = particles.attributes().get_float("Birth Time");
@@ -45,7 +45,7 @@ class MeshCollisionEvent : public EventFilter {
{
}
- void filter(EventInterface &interface) override
+ void filter(EventFilterInterface &interface) override
{
ParticleSet &particles = interface.particles();
auto positions = particles.attributes().get_float3("Position");
diff --git a/source/blender/simulations/bparticles/simulate.cpp b/source/blender/simulations/bparticles/simulate.cpp
index d8fc4c44f47..371644b0ea8 100644
--- a/source/blender/simulations/bparticles/simulate.cpp
+++ b/source/blender/simulations/bparticles/simulate.cpp
@@ -40,7 +40,7 @@ BLI_NOINLINE static void find_next_event_per_particle(ParticleSet particles,
AttributeArrays &attribute_offsets,
ArrayRef<float> durations,
float end_time,
- ArrayRef<EventAction *> event_actions,
+ ArrayRef<Event *> events,
A
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list