Commit: db8c116f5c6b91020d69f5cc4154b9dc29076bbe Author: Jacques Lucke Date: Thu Jun 27 11:21:59 2019 +0200 Branches: functions https://developer.blender.org/rBdb8c116f5c6b91020d69f5cc4154b9dc29076bbe
remove request_raw function from public emitter interface =================================================================== M source/blender/simulations/bparticles/core.hpp M source/blender/simulations/bparticles/emitters.cpp =================================================================== diff --git a/source/blender/simulations/bparticles/core.hpp b/source/blender/simulations/bparticles/core.hpp index 88c50215926..3317a78ea0c 100644 --- a/source/blender/simulations/bparticles/core.hpp +++ b/source/blender/simulations/bparticles/core.hpp @@ -209,11 +209,6 @@ class EmitterInterface { private: RequestEmitterTarget &m_request_target; - public: - EmitterInterface(RequestEmitterTarget &request_target) : m_request_target(request_target) - { - } - EmitterTarget &request_raw(uint particle_type_id) { EmitterTarget &target = m_request_target(particle_type_id); @@ -221,6 +216,11 @@ class EmitterInterface { return target; } + public: + EmitterInterface(RequestEmitterTarget &request_target) : m_request_target(request_target) + { + } + JoinedAttributeArrays request(uint particle_type_id, uint size) { SmallVector<AttributeArrays> arrays_list; diff --git a/source/blender/simulations/bparticles/emitters.cpp b/source/blender/simulations/bparticles/emitters.cpp index 948db9c4a35..73cdafb52b4 100644 --- a/source/blender/simulations/bparticles/emitters.cpp +++ b/source/blender/simulations/bparticles/emitters.cpp @@ -22,13 +22,9 @@ class PointEmitter : public Emitter { void emit(EmitterInterface &interface) override { - auto &target = interface.request_raw(0); - auto positions = target.attributes().get_float3("Position"); - auto velocities = target.attributes().get_float3("Velocity"); - - positions[0] = m_point; - velocities[0] = float3{-1, -1, 0}; - target.set_initialized(1); + auto attributes = interface.request(0, 1); + attributes.set_float3("Position", {m_point}); + attributes.set_float3("Velocity", {float3{-1, -1, 0}}); } }; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs