Page MenuHome
Differential D14908 Diff 51344 source/blender/editors/curves/intern/curves_ops.cc

Changeset View

Standalone View

View Options

source/blender/editors/curves/intern/curves_ops.cc

Show All 14 Lines
#include "WM_api.h" #include "WM_api.h"
#include "BKE_bvhutils.h" #include "BKE_bvhutils.h"
#include "BKE_context.h" #include "BKE_context.h"
#include "BKE_curves.hh" #include "BKE_curves.hh"
#include "BKE_layer.h" #include "BKE_layer.h"
#include "BKE_mesh.h" #include "BKE_mesh.h"
#include "BKE_mesh_runtime.h" #include "BKE_mesh_runtime.h"
#include "BKE_object.h"
#include "BKE_paint.h" #include "BKE_paint.h"
#include "BKE_particle.h" #include "BKE_particle.h"
#include "BKE_report.h" #include "BKE_report.h"
#include "DNA_mesh_types.h" #include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h" #include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h" #include "DNA_modifier_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "DNA_particle_types.h" #include "DNA_particle_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DEG_depsgraph.h" #include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"
#include "RNA_access.h" #include "RNA_access.h"
#include "RNA_define.h" #include "RNA_define.h"
#include "RNA_prototypes.h"
/** /**
* The code below uses a suffix naming convention to indicate the coordinate space: * The code below uses a suffix naming convention to indicate the coordinate space:
* `cu`: Local space of the curves object that is being edited. * `cu`: Local space of the curves object that is being edited.
* `su`: Local space of the surface object. * `su`: Local space of the surface object.
* `wo`: World space. * `wo`: World space.
* `ha`: Local space of an individual hair in the legacy hair system. * `ha`: Local space of an individual hair in the legacy hair system.
*/ */
▲ Show 20 Lines • Show All 264 Lines • ▼ Show 20 Linesstatic void CURVES_OT_convert_to_particle_system(wmOperatorType *ot)
ot->description = "Add a new or update an existing hair particle system on the surface object"; ot->description = "Add a new or update an existing hair particle system on the surface object";
ot->poll = convert_to_particle_system::curves_convert_to_particle_system_poll; ot->poll = convert_to_particle_system::curves_convert_to_particle_system_poll;
ot->exec = convert_to_particle_system::curves_convert_to_particle_system_exec; ot->exec = convert_to_particle_system::curves_convert_to_particle_system_exec;
ot->flag = OPTYPE_UNDO | OPTYPE_REGISTER; ot->flag = OPTYPE_UNDO | OPTYPE_REGISTER;
} }
namespace convert_from_particle_system {
static void particles_to_curves(Object &object,
HooglyBooglyUnsubmitted
Not Done
Inline Actions

I think it's a bit nicer to return bke::CurvesGeometry by value:

static bke::CurvesGeometry particles_to_curves(Object &object, ParticleSystem &psys)
{
  ParticleSettings &settings = *psys.part;
  if (psys.part->type != PART_HAIR) {
    return {};
  }
  ...
  bke::CurvesGeometry curves(points_num, curves_num);
  ...
  return curves;
}
...
  bke::CurvesGeometry::wrap(curves_id->geometry) = particles_to_curves(*ob_from_eval, *psys_eval);
HooglyBoogly: I think it's a bit nicer to return `bke::CurvesGeometry` by value: ``` static bke…
Mesh *mesh,
ParticleSystem &psys,
Curves &r_curves_id)
{
ParticleSettings &settings = *psys.part;
if (psys.part->type != PART_HAIR) {
return;
}
const int curves_num = psys.totpart;
int points_num = 0;
Array<int> curve_offsets(curves_num + 1);
for (const int curve_i : IndexRange(curves_num)) {
curve_offsets[curve_i] = points_num;
points_num += psys.particles[curve_i].totkey;
}
curve_offsets[curves_num] = points_num;
bke::CurvesGeometry &curves = bke::CurvesGeometry::wrap(r_curves_id.geometry);
curves.resize(points_num, curves_num);
HooglyBooglyUnsubmitted
Not Done
Inline Actions

I don't really care here given the nature of this code, but where we care about performance I've usually been resizing once and using the new offsets array but keeping the point count the same, then resizing again with the final point count.

HooglyBoogly: I don't really care here given the nature of this code, but where we care about performance…
curves.offsets_for_write().copy_from(curve_offsets);
MutableSpan<float3> positions = curves.positions_for_write();
threading::parallel_for(IndexRange(curves_num), 256, [&](const IndexRange range) {
for (const int curve_i : range) {
const IndexRange points = curves.points_for_curve(curve_i);
ParticleData &particle = psys.particles[curve_i];
float4x4 hair_to_object_mat;
psys_mat_hair_to_object(&object, mesh, settings.from, &particle, hair_to_object_mat.values);
for (const int key_i : IndexRange(particle.totkey)) {
const float3 &key_pos_ha = particle.hair[key_i].co;
const float3 key_pos_ob = hair_to_object_mat * key_pos_ha;
positions[points[key_i]] = key_pos_ob;
}
}
});
}
static int curves_convert_from_particle_system_exec(bContext *C, wmOperator *UNUSED(op))
{
Main &bmain = *CTX_data_main(C);
ViewLayer &view_layer = *CTX_data_view_layer(C);
Depsgraph &depsgraph = *CTX_data_depsgraph_pointer(C);
Object *ob_from_orig = ED_object_active_context(C);
ParticleSystem *psys_orig = static_cast<ParticleSystem *>(
CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem).data);
if (psys_orig == nullptr) {
psys_orig = psys_get_current(ob_from_orig);
}
if (psys_orig == nullptr) {
return OPERATOR_CANCELLED;
}
Object *ob_from_eval = DEG_get_evaluated_object(&depsgraph, ob_from_orig);
ParticleSystem *psys_eval = nullptr;
Mesh *mesh_src = nullptr;
LISTBASE_FOREACH (ModifierData *, md, &ob_from_eval->modifiers) {
if (md->type != eModifierType_ParticleSystem) {
continue;
}
ParticleSystemModifierData *psmd = reinterpret_cast<ParticleSystemModifierData *>(md);
if (!STREQ(psmd->psys->name, psys_orig->name)) {
continue;
}
psys_eval = psmd->psys;
mesh_src = psmd->mesh_final;
}
Object *ob_new = BKE_object_add(&bmain, &view_layer, OB_CURVES, psys_eval->name);
Curves *curves_id = static_cast<Curves *>(ob_new->data);
BKE_object_apply_mat4(ob_new, ob_from_orig->obmat, true, false);
particles_to_curves(*ob_from_eval, mesh_src, *psys_eval, *curves_id);
DEG_relations_tag_update(&bmain);
WM_main_add_notifier(NC_OBJECT | NA_EDITED, nullptr);
return OPERATOR_FINISHED;
}
static bool curves_convert_from_particle_system_poll(bContext *C)
{
return ED_object_active_context(C) != nullptr;
}
} // namespace convert_from_particle_system
static void CURVES_OT_convert_from_particle_system(wmOperatorType *ot)
{
HooglyBooglyUnsubmitted
Not Done
Inline Actions

ob_new->dtx |= OB_DRAWBOUNDOX; /* TODO: remove once there is actual drawing. */

HooglyBoogly: `ob_new->dtx |= OB_DRAWBOUNDOX; /* TODO: remove once there is actual drawing. */`
ot->name = "Convert Particle System to Curves";
ot->idname = "CURVES_OT_convert_from_particle_system";
ot->description = "Add a new curves object based on the current state of the particle system";
ot->poll = convert_from_particle_system::curves_convert_from_particle_system_poll;
ot->exec = convert_from_particle_system::curves_convert_from_particle_system_exec;
ot->flag = OPTYPE_UNDO | OPTYPE_REGISTER;
}
namespace snap_curves_to_surface { namespace snap_curves_to_surface {
enum class AttachMode { enum class AttachMode {
Nearest, Nearest,
Deform, Deform,
}; };
static bool snap_curves_to_surface_poll(bContext *C) static bool snap_curves_to_surface_poll(bContext *C)
▲ Show 20 Lines • Show All 183 Lines • ▼ Show 20 Lines
} }
} // namespace blender::ed::curves } // namespace blender::ed::curves
void ED_operatortypes_curves() void ED_operatortypes_curves()
{ {
using namespace blender::ed::curves; using namespace blender::ed::curves;
WM_operatortype_append(CURVES_OT_convert_to_particle_system); WM_operatortype_append(CURVES_OT_convert_to_particle_system);
WM_operatortype_append(CURVES_OT_convert_from_particle_system);
WM_operatortype_append(CURVES_OT_snap_curves_to_surface); WM_operatortype_append(CURVES_OT_snap_curves_to_surface);
} }