griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Manipulator: Use 2D manipulators in the 3D view

Browse Source 
Also split update flag into draw-steps,
since drawing 3D manipulators was tagging 2D as being refreshed.
This commit is contained in:
Campbell Barton
2017-08-03 15:12:47 +10:00
parent fc9da74942
commit 4fada2e10f
5 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/draw/intern/draw_view.c
View File

@@ -728,5 +728,29 @@ void DRW_draw_manipulator(void)
/* draw depth culled manipulators - manipulators need to be updated *after* view matrix was set up */
/* TODO depth culling manipulators is not yet supported, just drawing _3D here, should
* later become _IN_SCENE (and draw _3D separate) */
WM_manipulatormap_draw(ar->manipulator_map, draw_ctx->evil_C, WM_MANIPULATORMAP_DRAWSTEP_3D);
WM_manipulatormap_draw(
ar->manipulator_map, draw_ctx->evil_C,
WM_MANIPULATORMAP_DRAWSTEP_3D);
/* We may want to split this into a separate pass.
* or maintain a stage in the draw manager where all pixel-space drawing happens. */
{
float original_proj[4][4];
gpuGetProjectionMatrix(original_proj);
wmOrtho2_region_pixelspace(ar);
gpuPushMatrix();
gpuLoadIdentity();
glDepthMask(GL_FALSE);
WM_manipulatormap_draw(
ar->manipulator_map, draw_ctx->evil_C,
WM_MANIPULATORMAP_DRAWSTEP_2D);
glDepthMask(GL_TRUE);
gpuPopMatrix();
gpuLoadProjectionMatrix(original_proj);
}
}

3
source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
View File

@@ -702,9 +702,8 @@ static void MANIPULATOR_WT_cage_2d(wmManipulatorType *wt)
RNA_def_float_vector(wt->srna, "dimensions", 2, unit_v2, 0, FLT_MAX, "Dimensions", "", 0.0f, FLT_MAX);
RNA_def_enum_flag(wt->srna, "transform", rna_enum_transform, 0, "Transform Options", "");
WM_manipulatortype_target_property_def(wt, "offset", PROP_FLOAT, 1);
WM_manipulatortype_target_property_def(wt, "offset", PROP_FLOAT, 2);
WM_manipulatortype_target_property_def(wt, "scale", PROP_FLOAT, 2);
WM_manipulatortype_target_property_def(wt, "scale_uniform", PROP_FLOAT, 1);
}
void ED_manipulatortypes_cage_2d(void)

2
source/blender/windowmanager/manipulators/WM_manipulator_types.h
View File

@@ -206,7 +206,6 @@ typedef struct wmManipulatorProperty {
wmManipulatorPropertyFnSet value_set_fn;
wmManipulatorPropertyFnRangeGet range_get_fn;
wmManipulatorPropertyFnFree free_fn;
const struct bContext *context;
void *user_data;
} custom_func;
} wmManipulatorProperty;
@@ -376,5 +375,6 @@ typedef enum eWM_ManipulatorMapDrawStep {
* Note that these are expected to be 3D manipulators too. */
WM_MANIPULATORMAP_DRAWSTEP_IN_SCENE,
} eWM_ManipulatorMapDrawStep;
#define WM_MANIPULATORMAP_DRAWSTEP_MAX 3
#endif /* __WM_MANIPULATOR_TYPES_H__ */

2
source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
View File

@@ -97,7 +97,7 @@ struct wmManipulatorMap {
ListBase groups; /* wmManipulatorGroup */
/* private, update tagging (enum defined in C source). */
char update_flag;
char update_flag[WM_MANIPULATORMAP_DRAWSTEP_MAX];
/**
* \brief Manipulator map runtime context

51
source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
View File

@@ -167,7 +167,7 @@ wmManipulatorMap *WM_manipulatormap_new_from_type(
mmap = MEM_callocN(sizeof(wmManipulatorMap), "ManipulatorMap");
mmap->type = mmap_type;
mmap->update_flag = MANIPULATORMAP_IS_PREPARE_DRAW | MANIPULATORMAP_IS_REFRESH_CALLBACK;
WM_manipulatormap_tag_refresh(mmap);
/* create all manipulator-groups for this manipulator-map. We may create an empty one
* too in anticipation of manipulators from operators etc */
@@ -259,15 +259,19 @@ static GHash *WM_manipulatormap_manipulator_hash_new(
void WM_manipulatormap_tag_refresh(wmManipulatorMap *mmap)
{
if (mmap) {
mmap->update_flag |= (
MANIPULATORMAP_IS_PREPARE_DRAW |
MANIPULATORMAP_IS_REFRESH_CALLBACK);
/* We might want only to refresh some, for tag all steps. */
for (int i = 0; i < WM_MANIPULATORMAP_DRAWSTEP_MAX; i++) {
mmap->update_flag[i] |= (
MANIPULATORMAP_IS_PREPARE_DRAW |
MANIPULATORMAP_IS_REFRESH_CALLBACK);
}
}
}
static bool manipulator_prepare_drawing(
wmManipulatorMap *mmap, wmManipulator *mpr,
const bContext *C, ListBase *draw_manipulators)
const bContext *C, ListBase *draw_manipulators,
const eWM_ManipulatorMapDrawStep drawstep)
{
int do_draw = wm_manipulator_is_visible(mpr);
if (do_draw == 0) {
@@ -276,7 +280,7 @@ static bool manipulator_prepare_drawing(
else {
if (do_draw & WM_MANIPULATOR_IS_VISIBLE_UPDATE) {
/* hover manipulators need updating, even if we don't draw them */
wm_manipulator_update(mpr, C, (mmap->update_flag & MANIPULATORMAP_IS_PREPARE_DRAW) != 0);
wm_manipulator_update(mpr, C, (mmap->update_flag[drawstep] & MANIPULATORMAP_IS_PREPARE_DRAW) != 0);
}
if (do_draw & WM_MANIPULATOR_IS_VISIBLE_DRAW) {
BLI_addhead(draw_manipulators, BLI_genericNodeN(mpr));
@@ -302,8 +306,8 @@ static void manipulatormap_prepare_drawing(
/* only active manipulator needs updating */
if (mpr_modal) {
if ((mpr_modal->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_DRAW_MODAL_ALL) == 0) {
if (manipulator_prepare_drawing(mmap, mpr_modal, C, draw_manipulators)) {
mmap->update_flag &= ~MANIPULATORMAP_IS_PREPARE_DRAW;
if (manipulator_prepare_drawing(mmap, mpr_modal, C, draw_manipulators, drawstep)) {
mmap->update_flag[drawstep] &= ~MANIPULATORMAP_IS_PREPARE_DRAW;
}
/* don't draw any other manipulators */
return;
@@ -322,7 +326,7 @@ static void manipulatormap_prepare_drawing(
wm_manipulatorgroup_ensure_initialized(mgroup, C);
/* update data if needed */
/* XXX weak: Manipulator-group may skip refreshing if it's invisible (map gets untagged nevertheless) */
if ((mmap->update_flag & MANIPULATORMAP_IS_REFRESH_CALLBACK) && mgroup->type->refresh) {
if ((mmap->update_flag[drawstep] & MANIPULATORMAP_IS_REFRESH_CALLBACK) && mgroup->type->refresh) {
mgroup->type->refresh(C, mgroup);
/* cleared below */
}
@@ -332,11 +336,11 @@ static void manipulatormap_prepare_drawing(
}
for (wmManipulator *mpr = mgroup->manipulators.first; mpr; mpr = mpr->next) {
manipulator_prepare_drawing(mmap, mpr, C, draw_manipulators);
manipulator_prepare_drawing(mmap, mpr, C, draw_manipulators, drawstep);
}
}
mmap->update_flag &=
mmap->update_flag[drawstep] &=
~(MANIPULATORMAP_IS_REFRESH_CALLBACK |
MANIPULATORMAP_IS_PREPARE_DRAW);
}
@@ -551,24 +555,39 @@ wmManipulator *wm_manipulatormap_highlight_find(
for (wmManipulatorGroup *mgroup = mmap->groups.first; mgroup; mgroup = mgroup->next) {
if (wm_manipulatorgroup_is_visible(mgroup, C)) {
if (mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D) {
if ((mmap->update_flag & MANIPULATORMAP_IS_REFRESH_CALLBACK) && mgroup->type->refresh) {
if ((mmap->update_flag[WM_MANIPULATORMAP_DRAWSTEP_3D] & MANIPULATORMAP_IS_REFRESH_CALLBACK) &&
mgroup->type->refresh)
{
mgroup->type->refresh(C, mgroup);
/* cleared below */
}
wm_manipulatorgroup_intersectable_manipulators_to_list(mgroup, &visible_3d_manipulators);
}
else if ((mpr = wm_manipulatorgroup_find_intersected_mainpulator(mgroup, C, event, r_part))) {
break;
else {
if ((mmap->update_flag[WM_MANIPULATORMAP_DRAWSTEP_2D] & MANIPULATORMAP_IS_REFRESH_CALLBACK) &&
mgroup->type->refresh)
{
mgroup->type->refresh(C, mgroup);
/* cleared below */
}
if ((mpr = wm_manipulatorgroup_find_intersected_mainpulator(mgroup, C, event, r_part))) {
break;
}
}
}
}
if (!BLI_listbase_is_empty(&visible_3d_manipulators)) {
mpr = manipulator_find_intersected_3d(C, event->mval, &visible_3d_manipulators, r_part);
/* 2D manipulators get priority. */
if (mpr == NULL) {
mpr = manipulator_find_intersected_3d(C, event->mval, &visible_3d_manipulators, r_part);
}
BLI_freelistN(&visible_3d_manipulators);
}
mmap->update_flag &= ~MANIPULATORMAP_IS_REFRESH_CALLBACK;
mmap->update_flag[WM_MANIPULATORMAP_DRAWSTEP_3D] &= ~MANIPULATORMAP_IS_REFRESH_CALLBACK;
mmap->update_flag[WM_MANIPULATORMAP_DRAWSTEP_2D] &= ~MANIPULATORMAP_IS_REFRESH_CALLBACK;
return mpr;
}