bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Snap System: Replace creation and destruction of the object list by a Macro

Browse Source 
The macro got a little strange, but it's better than using the MEM_mallocN inside a loop, or repeat the lines
This commit is contained in:
mano-wii 2017-07-13 19:39:17 -03:00
parent 7daae642d8
commit c9817c67fc
1 changed files with 51 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
source/blender/editors/transform/transform_snap_object.c
View File

@ -138,88 +138,44 @@ struct SnapObjectContext {
/** Common utilities /** Common utilities
* \{ */ * \{ */
struct SnapObject {
struct SnapObject *next, *prev;
bool use_obedit; #define ITER_SNAP_OBJECTS(use_obedit, ob, obmat, sctx, snap_select, obedit, CODE) \
struct Object *ob; Base *base_act = sctx->scene->basact;\
float obmat[4][4]; /* Need an exception for particle edit because the base is flagged with BA_HAS_RECALC_DATA\
}; * which makes the loop skip it, even the derived mesh will never change\
*\
/** * To solve that problem, we do it first as an exception.\
* Walks through all objects in the scene to create the list of objets to snap. * */\
* if (base_act && base_act->object && base_act->object->mode & OB_MODE_PARTICLE_EDIT) {\
* \param sctx: Snap context to store data. use_obedit = false;\
* \param snap_select : from enum SnapSelect. ob = base_act->object;\
* \param use_object_edit_cage : Uses the coordinates of BMesh(if any) to do the snapping. obmat = ob->obmat;\
* CODE\
*/ }\
static void create_object_list( for (Base *base = sctx->scene->base.first; base != NULL; base = base->next) {\
SnapObjectContext *sctx, if ((BASE_VISIBLE_BGMODE(sctx->v3d_data.v3d, sctx->scene, base)) &&\
const SnapSelect snap_select, const bool use_object_edit_cage, ListBase *r_obj_list) (base->flag & (BA_HAS_RECALC_OB | BA_HAS_RECALC_DATA)) == 0 &&\
{ !((snap_select == SNAP_NOT_SELECTED && (base->flag & (SELECT | BA_WAS_SEL))) ||\
r_obj_list->first = r_obj_list->last = NULL; (snap_select == SNAP_NOT_ACTIVE && base == base_act)))\
{\
Object *obedit = use_object_edit_cage ? sctx->scene->obedit : NULL; Object *obj = base->object;\
if (ob->transflag & OB_DUPLI) {\
bool ignore_object_selected = false, ignore_object_active = false; DupliObject *dupli_ob;\
switch (snap_select) { ListBase *lb = object_duplilist(sctx->bmain->eval_ctx, sctx->scene, obj);\
case SNAP_ALL: for (dupli_ob = lb->first; dupli_ob; dupli_ob = dupli_ob->next) {\
break; use_obedit = obedit && dupli_ob->ob->data == obedit->data;;\
case SNAP_NOT_SELECTED: ob = use_obedit ? obedit : dupli_ob->ob;\
ignore_object_selected = true; obmat = dupli_ob->mat;\
break; CODE\
case SNAP_NOT_ACTIVE: }\
ignore_object_active = true; free_object_duplilist(lb);\
break; }\
} use_obedit = obedit && ob->data == obedit->data;\
ob = use_obedit ? obedit : obj;\
/* Need an exception for particle edit because the base is flagged with BA_HAS_RECALC_DATA obmat = ob->obmat;\
* which makes the loop skip it, even the derived mesh will never change CODE\
* }\
* To solve that problem, we do it first as an exception. }\
* */
Base *base_act = sctx->scene->basact;
if (base_act && base_act->object && base_act->object->mode & OB_MODE_PARTICLE_EDIT) {
struct SnapObject *sobj = MEM_mallocN(sizeof(*sobj), __func__);
sobj->use_obedit = false;
sobj->ob = base_act->object;
copy_m4_m4(sobj->obmat, sobj->ob->obmat);
BLI_addtail(r_obj_list, sobj);
}
for (Base *base = sctx->scene->base.first; base != NULL; base = base->next) {
if ((BASE_VISIBLE_BGMODE(sctx->v3d_data.v3d, sctx->scene, base)) &&
(base->flag & (BA_HAS_RECALC_OB | BA_HAS_RECALC_DATA)) == 0 &&
!((ignore_object_selected && (base->flag & (SELECT | BA_WAS_SEL))) ||
(ignore_object_active && base == base_act)))
{
Object *ob = base->object;
if (ob->transflag & OB_DUPLI) {
DupliObject *dupli_ob;
ListBase *lb = object_duplilist(sctx->bmain->eval_ctx, sctx->scene, ob);
for (dupli_ob = lb->first; dupli_ob; dupli_ob = dupli_ob->next) {
struct SnapObject *sobj = MEM_mallocN(sizeof(*sobj), __func__);
sobj->use_obedit = obedit && dupli_ob->ob->data == obedit->data;
sobj->ob = sobj->use_obedit ? obedit : dupli_ob->ob;;
copy_m4_m4(sobj->obmat, dupli_ob->mat);
BLI_addtail(r_obj_list, sobj);
}
free_object_duplilist(lb);
}
struct SnapObject *sobj = MEM_mallocN(sizeof(*sobj), __func__);
sobj->use_obedit = obedit && ob->data == obedit->data;
sobj->ob = sobj->use_obedit ? obedit : ob;
copy_m4_m4(sobj->obmat, sobj->ob->obmat);
BLI_addtail(r_obj_list, sobj);
}
}
}
/** /**
@ -853,21 +809,21 @@ static bool raycastObjects(
ListBase *r_hit_list) ListBase *r_hit_list)
{ {
bool retval = false; bool retval = false;
bool use_obedit;
unsigned int ob_index = 0; unsigned int ob_index = 0;
ListBase obj_list; Object *ob, *obedit;
create_object_list(sctx, snap_select, use_object_edit_cage, &obj_list); float (*obmat)[4];
for (struct SnapObject *sobj = obj_list.first; sobj; sobj = sobj->next) { obedit = use_object_edit_cage ? sctx->scene->obedit : NULL;
ITER_SNAP_OBJECTS(use_obedit, ob, obmat, sctx, snap_select, obedit,
retval |= raycastObj( retval |= raycastObj(
sctx, sctx,
ray_orig, ray_start, ray_dir, depth_range, ray_orig, ray_start, ray_dir, depth_range,
sobj->ob, sobj->obmat, ob_index++, sobj->use_obedit, ob, obmat, ob_index++, use_obedit,
ray_depth, r_loc, r_no, r_index, r_ob, r_obmat, r_hit_list); ray_depth, r_loc, r_no, r_index, r_ob, r_obmat, r_hit_list);
} )
BLI_freelistN(&obj_list);
return retval; return retval;
} }
@ -2080,18 +2036,18 @@ static bool snapObjectsRay(
Object **r_ob, float r_obmat[4][4]) Object **r_ob, float r_obmat[4][4])
{ {
bool retval = false; bool retval = false;
bool use_obedit;
ListBase obj_list; Object *ob, *obedit;
create_object_list(sctx, snap_select, use_object_edit_cage, &obj_list); float (*obmat)[4];
for (struct SnapObject *sobj = obj_list.first; sobj; sobj = sobj->next) { obedit = use_object_edit_cage ? sctx->scene->obedit : NULL;
ITER_SNAP_OBJECTS(use_obedit, ob, obmat, sctx, snap_select, obedit,
retval |= snapObject( retval |= snapObject(
sctx, snapdata, sobj->ob, sobj->obmat, sobj->use_obedit, sctx, snapdata, ob, obmat, use_obedit,
ray_depth, dist_px, ray_depth, dist_px,
r_loc, r_no, r_ob, r_obmat); r_loc, r_no, r_ob, r_obmat);
} )
BLI_freelistN(&obj_list);
return retval; return retval;
} }