[Bf-blender-cvs] [913e130897f] functions: naming cleanup
Jacques Lucke
noreply at git.blender.org
Tue Jun 18 14:32:01 CEST 2019
Commit: 913e130897fdc69144113a2c4f205d6de81ad34d
Author: Jacques Lucke
Date: Tue Jun 18 14:26:57 2019 +0200
Branches: functions
https://developer.blender.org/rB913e130897fdc69144113a2c4f205d6de81ad34d
naming cleanup
===================================================================
M source/blender/simulations/bparticles/c_wrapper.cpp
M source/blender/simulations/bparticles/core.hpp
M source/blender/simulations/bparticles/emitter.cpp
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 9d6d24ac625..447bc17395b 100644
--- a/source/blender/simulations/bparticles/c_wrapper.cpp
+++ b/source/blender/simulations/bparticles/c_wrapper.cpp
@@ -45,7 +45,7 @@ class TestForce : public BParticles::Force {
{
}
- void add_force(AttributeArrays &UNUSED(buffers), ArrayRef<float3> dst) override
+ void add_force(AttributeArrays UNUSED(attributes), ArrayRef<float3> dst) override
{
for (uint i = 0; i < dst.size(); i++) {
dst[i].z += m_strength;
@@ -62,9 +62,9 @@ class TurbulenceForce : public BParticles::Force {
{
}
- void add_force(AttributeArrays &buffers, ArrayRef<float3> dst) override
+ void add_force(AttributeArrays attributes, ArrayRef<float3> dst) override
{
- auto positions = buffers.get_float3("Position");
+ auto positions = attributes.get_float3("Position");
for (uint i = 0; i < dst.size(); i++) {
float3 pos = positions[i];
float value = BLI_hnoise(0.5f, pos.x, pos.y, pos.z);
@@ -85,8 +85,8 @@ class TestEmitter : public BParticles::Emitter {
{
EmitterTarget &dst = helper.request_raw();
- auto positions = dst.buffers().get_float3("Position");
- auto velocities = dst.buffers().get_float3("Velocity");
+ auto positions = dst.attributes().get_float3("Position");
+ auto velocities = dst.attributes().get_float3("Velocity");
for (uint i = 0; i < dst.size(); i++) {
positions[i] = {(float)(rand() % 10000) / 3000.0f, 0, 1};
diff --git a/source/blender/simulations/bparticles/core.hpp b/source/blender/simulations/bparticles/core.hpp
index 93188538978..ed719e6df3f 100644
--- a/source/blender/simulations/bparticles/core.hpp
+++ b/source/blender/simulations/bparticles/core.hpp
@@ -31,14 +31,14 @@ using std::unique_ptr;
class Force {
public:
virtual ~Force();
- virtual void add_force(AttributeArrays &attributes, ArrayRef<float3> dst) = 0;
+ virtual void add_force(AttributeArrays attributes, ArrayRef<float3> dst) = 0;
};
class Action {
public:
virtual ~Action();
- virtual void execute(AttributeArrays &attributes, ArrayRef<uint> indices_to_influence) = 0;
+ virtual void execute(AttributeArrays attributes, ArrayRef<uint> indices_to_influence) = 0;
};
class PositionalEvent {
@@ -143,18 +143,18 @@ class EmitterInfoBuilder {
class EmitterTarget {
private:
- AttributeArrays m_buffers;
+ AttributeArrays m_attributes;
uint m_emitted_amount = 0;
public:
- EmitterTarget(AttributeArrays buffers) : m_buffers(buffers)
+ EmitterTarget(AttributeArrays attributes) : m_attributes(attributes)
{
}
void set_initialized(uint n)
{
m_emitted_amount += n;
- BLI_assert(m_emitted_amount <= m_buffers.size());
+ BLI_assert(m_emitted_amount <= m_attributes.size());
}
uint emitted_amount()
@@ -162,14 +162,14 @@ class EmitterTarget {
return m_emitted_amount;
}
- AttributeArrays &buffers()
+ AttributeArrays &attributes()
{
- return m_buffers;
+ return m_attributes;
}
uint size()
{
- return m_buffers.size();
+ return m_attributes.size();
}
};
@@ -200,11 +200,11 @@ class EmitterHelper {
uint size_to_use = std::min(target.size(), remaining_size);
target.set_initialized(size_to_use);
- arrays_list.append(target.buffers().take_front(size_to_use));
+ arrays_list.append(target.attributes().take_front(size_to_use));
remaining_size -= size_to_use;
}
- AttributesInfo &info = (arrays_list.size() == 0) ? this->request_raw().buffers().info() :
+ AttributesInfo &info = (arrays_list.size() == 0) ? this->request_raw().attributes().info() :
arrays_list[0].info();
return JoinedAttributeArrays(info, arrays_list);
diff --git a/source/blender/simulations/bparticles/emitter.cpp b/source/blender/simulations/bparticles/emitter.cpp
index d95db084d93..cfae437f943 100644
--- a/source/blender/simulations/bparticles/emitter.cpp
+++ b/source/blender/simulations/bparticles/emitter.cpp
@@ -23,13 +23,13 @@ class PointEmitter : public Emitter {
void emit(EmitterHelper helper) override
{
- auto &buffer = helper.request_raw();
- auto positions = buffer.buffers().get_float3("Position");
- auto velocities = buffer.buffers().get_float3("Velocity");
+ auto &target = helper.request_raw();
+ auto positions = target.attributes().get_float3("Position");
+ auto velocities = target.attributes().get_float3("Velocity");
positions[0] = m_point;
velocities[0] = float3{-1, -1, 0};
- buffer.set_initialized(1);
+ target.set_initialized(1);
}
};
diff --git a/source/blender/simulations/bparticles/playground_solver.cpp b/source/blender/simulations/bparticles/playground_solver.cpp
index 1405b89084d..6e334597f75 100644
--- a/source/blender/simulations/bparticles/playground_solver.cpp
+++ b/source/blender/simulations/bparticles/playground_solver.cpp
@@ -8,9 +8,9 @@ namespace BParticles {
class MoveUpAction : public BParticles::Action {
public:
- void execute(AttributeArrays &buffers, ArrayRef<uint> indices_to_influence) override
+ void execute(AttributeArrays attributes, ArrayRef<uint> indices_to_influence) override
{
- auto positions = buffers.get_float3(buffers.info().attribute_index("Position"));
+ auto positions = attributes.get_float3("Position");
for (uint i : indices_to_influence) {
positions[i].y += 5.0f;
@@ -257,9 +257,9 @@ class SimpleSolver : public Solver {
emitter.emitter().emit(EmitterHelper{request_target});
for (uint i = 0; i < targets.size(); i++) {
- EmitterTarget &dst = targets[i];
+ EmitterTarget &target = targets[i];
ParticlesBlock *block = blocks[i];
- AttributeArrays emitted_data = dst.buffers().take_front(dst.emitted_amount());
+ AttributeArrays emitted_data = target.attributes().take_front(target.emitted_amount());
for (uint i : m_attributes.byte_attributes()) {
if (!emitter.uses_byte_attribute(m_attributes.name_of(i))) {
@@ -282,7 +282,7 @@ class SimpleSolver : public Solver {
float fac = (rand() % 1000) / 1000.0f;
birth_time = state.seconds_since_start - elapsed_seconds * fac;
}
- block->active_amount() += dst.emitted_amount();
+ block->active_amount() += target.emitted_amount();
this->step_new_particles(emitted_data, state);
}
}
More information about the Bf-blender-cvs
mailing list