blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 742 Projects 19 Wiki Activity

Cleanup/Refactor: Move FOREACH_TRANS_DATA_CONTAINER to outside of some functions 

So we can reuse the same loop for different corrections.
This commit is contained in:
Germano Cavalcante 2021-04-24 11:15:55 -03:00
parent b06d9069ad
commit f8d5d03ebc
4 changed files with 134 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
source/blender/editors/transform/transform_convert.c
View File

@ -1472,91 +1472,89 @@ void createTransData(bContext *C, TransInfo *t)
/** \name Transform Data Recalc/Flush
* \{ */
void transform_convert_clip_mirror_modifier_apply(TransInfo *t)
void transform_convert_clip_mirror_modifier_apply(TransDataContainer *tc)
{
FOREACH_TRANS_DATA_CONTAINER (t, tc) {
Object *ob = tc->obedit;
ModifierData *md = ob->modifiers.first;
float tolerance[3] = {0.0f, 0.0f, 0.0f};
int axis = 0;
Object *ob = tc->obedit;
ModifierData *md = ob->modifiers.first;
float tolerance[3] = {0.0f, 0.0f, 0.0f};
int axis = 0;
for (; md; md = md->next) {
if ((md->type == eModifierType_Mirror) && (md->mode & eModifierMode_Realtime)) {
MirrorModifierData *mmd = (MirrorModifierData *)md;
for (; md; md = md->next) {
if ((md->type == eModifierType_Mirror) && (md->mode & eModifierMode_Realtime)) {
MirrorModifierData *mmd = (MirrorModifierData *)md;
if (mmd->flag & MOD_MIR_CLIPPING) {
axis = 0;
if (mmd->flag & MOD_MIR_AXIS_X) {
axis |= 1;
tolerance[0] = mmd->tolerance;
if (mmd->flag & MOD_MIR_CLIPPING) {
axis = 0;
if (mmd->flag & MOD_MIR_AXIS_X) {
axis |= 1;
tolerance[0] = mmd->tolerance;
}
if (mmd->flag & MOD_MIR_AXIS_Y) {
axis |= 2;
tolerance[1] = mmd->tolerance;
}
if (mmd->flag & MOD_MIR_AXIS_Z) {
axis |= 4;
tolerance[2] = mmd->tolerance;
}
if (axis) {
float mtx[4][4], imtx[4][4];
int i;
if (mmd->mirror_ob) {
float obinv[4][4];
invert_m4_m4(obinv, mmd->mirror_ob->obmat);
mul_m4_m4m4(mtx, obinv, ob->obmat);
invert_m4_m4(imtx, mtx);
}
if (mmd->flag & MOD_MIR_AXIS_Y) {
axis |= 2;
tolerance[1] = mmd->tolerance;
}
if (mmd->flag & MOD_MIR_AXIS_Z) {
axis |= 4;
tolerance[2] = mmd->tolerance;
}
if (axis) {
float mtx[4][4], imtx[4][4];
int i;
if (mmd->mirror_ob) {
float obinv[4][4];
TransData *td = tc->data;
for (i = 0; i < tc->data_len; i++, td++) {
int clip;
float loc[3], iloc[3];
invert_m4_m4(obinv, mmd->mirror_ob->obmat);
mul_m4_m4m4(mtx, obinv, ob->obmat);
invert_m4_m4(imtx, mtx);
if (td->loc == NULL) {
break;
}
TransData *td = tc->data;
for (i = 0; i < tc->data_len; i++, td++) {
int clip;
float loc[3], iloc[3];
if (td->flag & TD_SKIP) {
continue;
}
if (td->loc == NULL) {
break;
copy_v3_v3(loc, td->loc);
copy_v3_v3(iloc, td->iloc);
if (mmd->mirror_ob) {
mul_m4_v3(mtx, loc);
mul_m4_v3(mtx, iloc);
}
clip = 0;
if (axis & 1) {
if (fabsf(iloc[0]) <= tolerance[0] || loc[0] * iloc[0] < 0.0f) {
loc[0] = 0.0f;
clip = 1;
}
}
if (td->flag & TD_SKIP) {
continue;
if (axis & 2) {
if (fabsf(iloc[1]) <= tolerance[1] || loc[1] * iloc[1] < 0.0f) {
loc[1] = 0.0f;
clip = 1;
}
copy_v3_v3(loc, td->loc);
copy_v3_v3(iloc, td->iloc);
}
if (axis & 4) {
if (fabsf(iloc[2]) <= tolerance[2] || loc[2] * iloc[2] < 0.0f) {
loc[2] = 0.0f;
clip = 1;
}
}
if (clip) {
if (mmd->mirror_ob) {
mul_m4_v3(mtx, loc);
mul_m4_v3(mtx, iloc);
}
clip = 0;
if (axis & 1) {
if (fabsf(iloc[0]) <= tolerance[0] || loc[0] * iloc[0] < 0.0f) {
loc[0] = 0.0f;
clip = 1;
}
}
if (axis & 2) {
if (fabsf(iloc[1]) <= tolerance[1] || loc[1] * iloc[1] < 0.0f) {
loc[1] = 0.0f;
clip = 1;
}
}
if (axis & 4) {
if (fabsf(iloc[2]) <= tolerance[2] || loc[2] * iloc[2] < 0.0f) {
loc[2] = 0.0f;
clip = 1;
}
}
if (clip) {
if (mmd->mirror_ob) {
mul_m4_v3(imtx, loc);
}
copy_v3_v3(td->loc, loc);
mul_m4_v3(imtx, loc);
}
copy_v3_v3(td->loc, loc);
}
}
}

2
source/blender/editors/transform/transform_convert.h
View File

@ -62,7 +62,7 @@ void calc_distanceCurveVerts(TransData *head, TransData *tail, bool cyclic);
struct TransDataCurveHandleFlags *initTransDataCurveHandles(TransData *td, struct BezTriple *bezt);
char transform_convert_frame_side_dir_get(TransInfo *t, float cframe);
bool FrameOnMouseSide(char side, float frame, float cframe);
void transform_convert_clip_mirror_modifier_apply(TransInfo *t);
void transform_convert_clip_mirror_modifier_apply(TransDataContainer *tc);
void animrecord_check_state(TransInfo *t, struct Object *ob);
/* transform_convert_action.c */

6
source/blender/editors/transform/transform_convert_curve.c
View File

@ -441,7 +441,6 @@ void createTransCurveVerts(TransInfo *t)
void recalcData_curve(TransInfo *t)
{
if (t->state != TRANS_CANCEL) {
transform_convert_clip_mirror_modifier_apply(t);
applyProject(t);
}
@ -460,7 +459,10 @@ void recalcData_curve(TransInfo *t)
}
}
else {
/* Normal updating */
/* Apply clipping after so we never project past the clip plane T25423. */
transform_convert_clip_mirror_modifier_apply(tc);
/* Normal updating. */
BKE_curve_dimension_update(cu);
}
}

119
source/blender/editors/transform/transform_convert_mesh.c
View File

@ -1519,33 +1519,30 @@ static void tc_mesh_customdatacorrect_apply_vert(struct TransCustomDataLayer *tc
}
}
static void tc_mesh_customdatacorrect_apply(TransInfo *t, bool is_final)
static void tc_mesh_customdatacorrect_apply(TransDataContainer *tc, bool is_final)
{
FOREACH_TRANS_DATA_CONTAINER (t, tc) {
if (!tc->custom.type.data) {
continue;
if (!tc->custom.type.data) {
return;
}
struct TransCustomDataLayer *tcld = tc->custom.type.data;
const bool use_merge_group = tcld->use_merge_group;
struct TransCustomDataMergeGroup *merge_data = tcld->merge_group.data;
TransData *tob = tc->data;
for (int i = tc->data_len; i--; tob++) {
tc_mesh_customdatacorrect_apply_vert(tcld, (TransDataBasic *)tob, merge_data, is_final);
if (use_merge_group) {
merge_data++;
}
struct TransCustomDataLayer *tcld = tc->custom.type.data;
const bool use_merge_group = tcld->use_merge_group;
}
struct TransCustomDataMergeGroup *merge_data = tcld->merge_group.data;
TransData *tob = tc->data;
for (int i = tc->data_len; i--; tob++) {
tc_mesh_customdatacorrect_apply_vert(tcld, (TransDataBasic *)tob, merge_data, is_final);
TransDataMirror *td_mirror = tc->data_mirror;
for (int i = tc->data_mirror_len; i--; td_mirror++) {
tc_mesh_customdatacorrect_apply_vert(tcld, (TransDataBasic *)td_mirror, merge_data, is_final);
if (use_merge_group) {
merge_data++;
}
}
TransDataMirror *td_mirror = tc->data_mirror;
for (int i = tc->data_mirror_len; i--; td_mirror++) {
tc_mesh_customdatacorrect_apply_vert(
tcld, (TransDataBasic *)td_mirror, merge_data, is_final);
if (use_merge_group) {
merge_data++;
}
if (use_merge_group) {
merge_data++;
}
}
}
@ -1585,38 +1582,36 @@ static void tc_mesh_customdatacorrect_restore(struct TransInfo *t)
/** \name Recalc Mesh Data
* \{ */
static void tc_mesh_transdata_mirror_apply(TransInfo *t)
static void tc_mesh_transdata_mirror_apply(TransDataContainer *tc)
{
FOREACH_TRANS_DATA_CONTAINER (t, tc) {
if (tc->use_mirror_axis_any) {
int i;
TransData *td;
for (i = 0, td = tc->data; i < tc->data_len; i++, td++) {
if (td->flag & (TD_MIRROR_EDGE_X | TD_MIRROR_EDGE_Y | TD_MIRROR_EDGE_Z)) {
if (td->flag & TD_MIRROR_EDGE_X) {
td->loc[0] = 0.0f;
}
if (td->flag & TD_MIRROR_EDGE_Y) {
td->loc[1] = 0.0f;
}
if (td->flag & TD_MIRROR_EDGE_Z) {
td->loc[2] = 0.0f;
}
if (tc->use_mirror_axis_any) {
int i;
TransData *td;
for (i = 0, td = tc->data; i < tc->data_len; i++, td++) {
if (td->flag & (TD_MIRROR_EDGE_X | TD_MIRROR_EDGE_Y | TD_MIRROR_EDGE_Z)) {
if (td->flag & TD_MIRROR_EDGE_X) {
td->loc[0] = 0.0f;
}
if (td->flag & TD_MIRROR_EDGE_Y) {
td->loc[1] = 0.0f;
}
if (td->flag & TD_MIRROR_EDGE_Z) {
td->loc[2] = 0.0f;
}
}
}
TransDataMirror *td_mirror = tc->data_mirror;
for (i = 0; i < tc->data_mirror_len; i++, td_mirror++) {
copy_v3_v3(td_mirror->loc, td_mirror->loc_src);
if (td_mirror->flag & TD_MIRROR_X) {
td_mirror->loc[0] *= -1;
}
if (td_mirror->flag & TD_MIRROR_Y) {
td_mirror->loc[1] *= -1;
}
if (td_mirror->flag & TD_MIRROR_Z) {
td_mirror->loc[2] *= -1;
}
TransDataMirror *td_mirror = tc->data_mirror;
for (i = 0; i < tc->data_mirror_len; i++, td_mirror++) {
copy_v3_v3(td_mirror->loc, td_mirror->loc_src);
if (td_mirror->flag & TD_MIRROR_X) {
td_mirror->loc[0] *= -1;
}
if (td_mirror->flag & TD_MIRROR_Y) {
td_mirror->loc[1] *= -1;
}
if (td_mirror->flag & TD_MIRROR_Z) {
td_mirror->loc[2] *= -1;
}
}
}
@ -1625,17 +1620,21 @@ static void tc_mesh_transdata_mirror_apply(TransInfo *t)
void recalcData_mesh(TransInfo *t)
{
bool is_canceling = t->state == TRANS_CANCEL;
/* mirror modifier clipping? */
/* Apply corrections. */
if (!is_canceling) {
/* apply clipping after so we never project past the clip plane T25423. */
applyProject(t);
transform_convert_clip_mirror_modifier_apply(t);
if ((t->flag & T_NO_MIRROR) == 0 && (t->options & CTX_NO_MIRROR) == 0) {
tc_mesh_transdata_mirror_apply(t);
bool do_mirror = !(t->flag & T_NO_MIRROR) && !(t->options & CTX_NO_MIRROR);
FOREACH_TRANS_DATA_CONTAINER (t, tc) {
/* Apply clipping after so we never project past the clip plane T25423. */
transform_convert_clip_mirror_modifier_apply(tc);
if (do_mirror) {
tc_mesh_transdata_mirror_apply(tc);
}
tc_mesh_customdatacorrect_apply(tc, false);
}
tc_mesh_customdatacorrect_apply(t, false);
}
else {
tc_mesh_customdatacorrect_restore(t);
@ -1662,7 +1661,9 @@ void special_aftertrans_update__mesh(bContext *UNUSED(C), TransInfo *t)
if (!is_canceling && ELEM(t->mode, TFM_EDGE_SLIDE, TFM_VERT_SLIDE)) {
/* NOTE(joeedh): Handle multi-res re-projection,
* done on transform completion since it's really slow. */
tc_mesh_customdatacorrect_apply(t, true);
FOREACH_TRANS_DATA_CONTAINER (t, tc) {
tc_mesh_customdatacorrect_apply(tc, true);
}
}
if (use_automerge) {