[Bf-blender-cvs] [c5a0ce1ade6] master: Cleanup: naming for lattice deform functions
Campbell Barton
noreply at git.blender.org
Sat Jun 13 08:21:58 CEST 2020
Commit: c5a0ce1ade6d3dbaf5a3614f2ecb1a8abf9fbe2a
Author: Campbell Barton
Date: Sat Jun 13 15:41:34 2020 +1000
Branches: master
https://developer.blender.org/rBc5a0ce1ade6d3dbaf5a3614f2ecb1a8abf9fbe2a
Cleanup: naming for lattice deform functions
- BKE_lattice_deform_data_create was init_latt_deform.
- BKE_lattice_deform_data_destroy was end_latt_deform.
- BKE_lattice_deform_data_eval_co was calc_latt_deform.
===================================================================
M source/blender/blenkernel/BKE_lattice.h
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenkernel/intern/lattice_deform.c
M source/blender/blenkernel/intern/object_dupli.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
M source/blender/io/alembic/intern/abc_writer_points.cc
M source/blender/modifiers/intern/MOD_explode.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/render/intern/source/pointdensity.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index 045bea613f3..a1e335447fe 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -103,10 +103,12 @@ extern void (*BKE_lattice_batch_cache_free_cb)(struct Lattice *lt);
/** \name Deform 3D Coordinates by Lattice (lattice_deform.c)
* \{ */
-struct LatticeDeformData *init_latt_deform(struct Object *oblatt,
- struct Object *ob) ATTR_WARN_UNUSED_RESULT;
-void calc_latt_deform(struct LatticeDeformData *lattice_deform_data, float co[3], float weight);
-void end_latt_deform(struct LatticeDeformData *lattice_deform_data);
+struct LatticeDeformData *BKE_lattice_deform_data_create(struct Object *oblatt, struct Object *ob)
+ ATTR_WARN_UNUSED_RESULT;
+void BKE_lattice_deform_data_eval_co(struct LatticeDeformData *lattice_deform_data,
+ float co[3],
+ float weight);
+void BKE_lattice_deform_data_destroy(struct LatticeDeformData *lattice_deform_data);
void BKE_lattice_deform_coords(struct Object *ob_lattice,
struct Object *ob_target,
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index b889b91e366..9e6fbf829b8 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -286,11 +286,11 @@ void BKE_gpencil_lattice_init(Object *ob)
return;
}
if (mmd->cache_data) {
- end_latt_deform((struct LatticeDeformData *)mmd->cache_data);
+ BKE_lattice_deform_data_destroy((struct LatticeDeformData *)mmd->cache_data);
}
/* init deform data */
- mmd->cache_data = (struct LatticeDeformData *)init_latt_deform(latob, ob);
+ mmd->cache_data = (struct LatticeDeformData *)BKE_lattice_deform_data_create(latob, ob);
}
}
}
@@ -303,7 +303,7 @@ void BKE_gpencil_lattice_clear(Object *ob)
if (md->type == eGpencilModifierType_Lattice) {
LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md;
if ((mmd) && (mmd->cache_data)) {
- end_latt_deform((struct LatticeDeformData *)mmd->cache_data);
+ BKE_lattice_deform_data_destroy((struct LatticeDeformData *)mmd->cache_data);
mmd->cache_data = NULL;
}
}
diff --git a/source/blender/blenkernel/intern/lattice_deform.c b/source/blender/blenkernel/intern/lattice_deform.c
index 4dc3ed2397e..4b2f97d8df6 100644
--- a/source/blender/blenkernel/intern/lattice_deform.c
+++ b/source/blender/blenkernel/intern/lattice_deform.c
@@ -59,7 +59,7 @@ typedef struct LatticeDeformData {
float latmat[4][4];
} LatticeDeformData;
-LatticeDeformData *init_latt_deform(Object *oblatt, Object *ob)
+LatticeDeformData *BKE_lattice_deform_data_create(Object *oblatt, Object *ob)
{
/* we make an array with all differences */
Lattice *lt = oblatt->data;
@@ -127,7 +127,9 @@ LatticeDeformData *init_latt_deform(Object *oblatt, Object *ob)
return lattice_deform_data;
}
-void calc_latt_deform(LatticeDeformData *lattice_deform_data, float co[3], float weight)
+void BKE_lattice_deform_data_eval_co(LatticeDeformData *lattice_deform_data,
+ float co[3],
+ float weight)
{
Object *ob = lattice_deform_data->object;
Lattice *lt = ob->data;
@@ -260,7 +262,7 @@ void calc_latt_deform(LatticeDeformData *lattice_deform_data, float co[3], float
}
}
-void end_latt_deform(LatticeDeformData *lattice_deform_data)
+void BKE_lattice_deform_data_destroy(LatticeDeformData *lattice_deform_data)
{
if (lattice_deform_data->latticedata) {
MEM_freeN(lattice_deform_data->latticedata);
@@ -300,11 +302,13 @@ static void lattice_deform_vert_with_dvert(const LatticeDeformUserdata *data,
1.0f - BKE_defvert_find_weight(dvert, data->defgrp_index) :
BKE_defvert_find_weight(dvert, data->defgrp_index);
if (weight > 0.0f) {
- calc_latt_deform(data->lattice_deform_data, data->vert_coords[index], weight * data->fac);
+ BKE_lattice_deform_data_eval_co(
+ data->lattice_deform_data, data->vert_coords[index], weight * data->fac);
}
}
else {
- calc_latt_deform(data->lattice_deform_data, data->vert_coords[index], data->fac);
+ BKE_lattice_deform_data_eval_co(
+ data->lattice_deform_data, data->vert_coords[index], data->fac);
}
}
@@ -350,7 +354,7 @@ static void lattice_deform_coords_impl(Object *ob_lattice,
return;
}
- lattice_deform_data = init_latt_deform(ob_lattice, ob_target);
+ lattice_deform_data = BKE_lattice_deform_data_create(ob_lattice, ob_target);
/* Check whether to use vertex groups (only possible if ob_target is a Mesh or Lattice).
* We want either a Mesh/Lattice with no derived data, or derived data with deformverts.
@@ -408,7 +412,7 @@ static void lattice_deform_coords_impl(Object *ob_lattice,
BLI_task_parallel_range(0, vert_coords_len, &data, lattice_deform_vert_task, &settings);
}
- end_latt_deform(lattice_deform_data);
+ BKE_lattice_deform_data_destroy(lattice_deform_data);
}
void BKE_lattice_deform_coords(Object *ob_lattice,
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 474142e8555..4c6354f12a1 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -1053,7 +1053,7 @@ static void make_duplis_particle_system(const DupliContext *ctx, ParticleSystem
}
if (psys->lattice_deform_data) {
- end_latt_deform(psys->lattice_deform_data);
+ BKE_lattice_deform_data_destroy(psys->lattice_deform_data);
psys->lattice_deform_data = NULL;
}
}
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index eb485e1522f..c201cb83c44 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -410,7 +410,7 @@ struct LatticeDeformData *psys_create_lattice_deform_data(ParticleSimulationData
}
}
if (lattice) {
- lattice_deform_data = init_latt_deform(lattice, NULL);
+ lattice_deform_data = BKE_lattice_deform_data_create(lattice, NULL);
}
}
@@ -3150,7 +3150,8 @@ void psys_cache_paths(ParticleSimulationData *sim, float cfra, const bool use_re
/* lattices have to be calculated separately to avoid mixups between effector calculations */
if (psys->lattice_deform_data) {
for (k = 0, ca = cache[p]; k <= segments; k++, ca++) {
- calc_latt_deform(psys->lattice_deform_data, ca->co, psys->lattice_strength);
+ BKE_lattice_deform_data_eval_co(
+ psys->lattice_deform_data, ca->co, psys->lattice_strength);
}
}
}
@@ -3185,7 +3186,7 @@ void psys_cache_paths(ParticleSimulationData *sim, float cfra, const bool use_re
psys->totcached = totpart;
if (psys->lattice_deform_data) {
- end_latt_deform(psys->lattice_deform_data);
+ BKE_lattice_deform_data_destroy(psys->lattice_deform_data);
psys->lattice_deform_data = NULL;
}
@@ -4413,7 +4414,8 @@ void psys_get_particle_on_path(ParticleSimulationData *sim,
}
if (psys->lattice_deform_data && edit == 0) {
- calc_latt_deform(psys->lattice_deform_data, state->co, psys->lattice_strength);
+ BKE_lattice_deform_data_eval_co(
+ psys->lattice_deform_data, state->co, psys->lattice_strength);
}
}
}
@@ -4696,7 +4698,8 @@ int psys_get_particle_state(ParticleSimulationData *sim, int p, ParticleKey *sta
do_child_modifiers(&modifier_ctx, mat, state, t);
if (psys->lattice_deform_data) {
- calc_latt_deform(psys->lattice_deform_data, state->co, psys->lattice_strength);
+ BKE_lattice_deform_data_eval_co(
+ psys->lattice_deform_data, state->co, psys->lattice_strength);
}
}
else {
@@ -4760,7 +4763,8 @@ int psys_get_particle_state(ParticleSimulationData *sim, int p, ParticleKey *sta
}
if (sim->psys->lattice_deform_data) {
- calc_latt_deform(sim->psys->lattice_deform_data, state->co, psys->lattice_strength);
+ BKE_lattice_deform_data_eval_co(
+ sim->psys->lattice_deform_data, state->co, psys->lattice_strength);
}
}
@@ -4970,12 +4974,13 @@ void psys_apply_hair_lattice(Depsgraph *depsgraph, Scene *scene, Object *ob, Par
hkey = pa->hair;
for (h = 0; h < pa->totkey; h++, hkey++) {
mul_m4_v3(hairmat, hkey->co);
- calc_latt_deform(psys->lattice_deform_data, hkey->co, psys->lattice_strength);
+ BKE_lattice_deform_data_eval_co(
+ psys->lattice_deform_data, hkey->co, psys->lattice_strength);
mul_m4_v3(imat, hkey->co);
}
}
- end_latt_deform(psys->lattice_deform_data);
+ BKE_lattice_deform_data_destroy(psys->lattice_deform_data);
psys->lattice_deform_data = NULL;
/* protect the applied shape */
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 31d51a74e7f..606291a9ae0 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -536,7 +536,7 @@ void psys_thread_context_free(ParticleThreadContext *ctx)
}
if (ctx->sim.psys->lattice_deform_data) {
- end_latt_deform(ctx->sim.psys->lattice_deform_data);
+ BKE_lattice_deform_data_destroy(ctx->sim.psys->lattice_deform_data);
ctx->sim.psys->lattice_deform_data = NULL;
}
@@ -4126,7 +4126,7 @@ static void cached_step(ParticleSimulationData *sim, float cfra, const bool use_
}
if (psys->lattice_deform_data) {
- end_latt_deform(psys->lattice_deform_data);
+ BKE_lattice_deform_data_destroy(psys->lattice_deform_data);
psys->lattice_deform_data = NULL;
}
@@ -4616,7 +4616,7 @@ static void system_step(ParticleSimulationData *sim, float c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list