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

draw options for mask spline matching the UV view

Browse Source
This commit is contained in:
Campbell Barton
2012-05-30 16:22:33 +00:00
parent 001ea9fc9f
commit 125e7550ff
7 changed files with 136 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/startup/bl_ui/space_clip.py
View File

@@ -711,6 +711,12 @@ class CLIP_PT_display(CLIP_PT_clip_view_panel, Panel):
col.label(text="Display Aspect Ratio:")
row = col.row()
row.prop(clip, "display_aspect", text="")
if sc.mode == 'MASKEDITING':
col = layout.column()
col.prop(sc, "mask_draw_type", text="")
col.prop(sc, "show_mask_smooth")
class CLIP_PT_marker_display(CLIP_PT_clip_view_panel, Panel):

2
source/blender/editors/include/ED_mask.h
View File

@@ -39,7 +39,7 @@ void ED_keymap_mask(struct wmKeyConfig *keyconf);
void ED_operatormacros_mask(void);
/* mask_draw.c */
void ED_mask_draw(const bContext *C);
void ED_mask_draw(const bContext *C, const char draw_flag, const char draw_type);
/* mask_shapekey.c */
int ED_mask_object_shape_auto_key_all(struct Mask *mask, const int frame);

117
source/blender/editors/mask/mask_draw.c
View File

@@ -236,41 +236,99 @@ static void draw_spline_points(MaskObject *maskobj, MaskSpline *spline)
/* #define USE_XOR */
static void draw_curve_dashed(MaskSpline *spline, float *points, int tot_point, const unsigned char rgb_sel[4])
static void mask_draw_curve_type(MaskSpline *spline, float *points, int tot_point,
const short is_feather, const short is_smooth,
const unsigned char rgb_spline[4], const char draw_type)
{
const int draw_method = (spline->flag & MASK_SPLINE_CYCLIC) ? GL_LINE_LOOP : GL_LINE_STRIP;
unsigned char rgb_tmp[4];
glEnable(GL_LINE_STIPPLE);
#ifdef USE_XOR
glEnable(GL_COLOR_LOGIC_OP);
glLogicOp(GL_OR);
#endif
glColor4ubv(rgb_sel);
glLineStipple(3, 0xaaaa);
glEnableClientState(GL_VERTEX_ARRAY);
glVertexPointer(2, GL_FLOAT, 0, points);
glDrawArrays(draw_method, 0, tot_point);
switch (draw_type) {
case MASK_DT_OUTLINE:
glLineWidth(3);
cpack(0x0);
glDrawArrays(draw_method, 0, tot_point);
glLineWidth(1);
glColor4ubv(rgb_spline);
glDrawArrays(draw_method, 0, tot_point);
break;
case MASK_DT_DASH:
default:
glEnable(GL_LINE_STIPPLE);
#ifdef USE_XOR
glDisable(GL_COLOR_LOGIC_OP);
glEnable(GL_COLOR_LOGIC_OP);
glLogicOp(GL_OR);
#endif
glColor4ubv(rgb_spline);
glLineStipple(3, 0xaaaa);
glEnableClientState(GL_VERTEX_ARRAY);
glVertexPointer(2, GL_FLOAT, 0, points);
glDrawArrays(draw_method, 0, tot_point);
#ifdef USE_XOR
glDisable(GL_COLOR_LOGIC_OP);
#endif
glColor4ub(0, 0, 0, 255);
glLineStipple(3, 0x5555);
glDrawArrays(draw_method, 0, tot_point);
glDisable(GL_LINE_STIPPLE);
break;
case MASK_DT_BLACK:
case MASK_DT_WHITE:
if (draw_type == MASK_DT_BLACK) { rgb_tmp[0] = rgb_tmp[1] = rgb_tmp[2] = 0; }
else { rgb_tmp[0] = rgb_tmp[1] = rgb_tmp[2] = 255; }
/* alpha values seem too low but gl draws many points that compensate for it */
if (is_feather) { rgb_tmp[3] = 64; }
else { rgb_tmp[3] = 128; }
if (is_feather) {
rgb_tmp[0] = (unsigned char)(((short)rgb_tmp[0] + (short)rgb_spline[0]) / 2);
rgb_tmp[1] = (unsigned char)(((short)rgb_tmp[1] + (short)rgb_spline[1]) / 2);
rgb_tmp[2] = (unsigned char)(((short)rgb_tmp[2] + (short)rgb_spline[2]) / 2);
}
if (is_smooth == FALSE && is_feather) {
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
glColor4ubv(rgb_tmp);
glEnableClientState(GL_VERTEX_ARRAY);
glVertexPointer(2, GL_FLOAT, 0, points);
glDrawArrays(draw_method, 0, tot_point);
glDrawArrays(draw_method, 0, tot_point);
if (is_smooth == FALSE && is_feather) {
glDisable(GL_BLEND);
}
break;
}
glColor4ub(0, 0, 0, 255);
glLineStipple(3, 0x5555);
glDrawArrays(draw_method, 0, tot_point);
glDisableClientState(GL_VERTEX_ARRAY);
glDisable(GL_LINE_STIPPLE);
}
static void draw_spline_curve(MaskObject *maskobj, MaskSpline *spline,
const char use_smooth, const char draw_type)
const char draw_flag, const char draw_type)
{
unsigned char rgb_tmp[4];
const int is_spline_sel = (spline->flag & SELECT) && (maskobj->restrictflag & MASK_RESTRICT_SELECT) == 0;
const short is_spline_sel = (spline->flag & SELECT) && (maskobj->restrictflag & MASK_RESTRICT_SELECT) == 0;
const short is_smooth = (draw_flag & MASK_DRAWFLAG_SMOOTH);
float *diff_points, *feather_points;
int tot_diff_point, tot_feather_point;
@@ -279,7 +337,7 @@ static void draw_spline_curve(MaskObject *maskobj, MaskSpline *spline,
if (!diff_points)
return;
if (use_smooth) {
if (is_smooth) {
glEnable(GL_LINE_SMOOTH);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -289,15 +347,19 @@ static void draw_spline_curve(MaskObject *maskobj, MaskSpline *spline,
/* draw feather */
mask_spline_feather_color_get(maskobj, spline, is_spline_sel, rgb_tmp);
draw_curve_dashed(spline, feather_points, tot_feather_point, rgb_tmp);
mask_draw_curve_type(spline, feather_points, tot_feather_point,
TRUE, is_smooth,
rgb_tmp, draw_type);
MEM_freeN(feather_points);
/* draw main curve */
mask_spline_color_get(maskobj, spline, is_spline_sel, rgb_tmp);
draw_curve_dashed(spline, diff_points, tot_diff_point, rgb_tmp);
mask_draw_curve_type(spline, diff_points, tot_diff_point,
FALSE, is_smooth,
rgb_tmp, draw_type);
MEM_freeN(diff_points);
if (use_smooth) {
if (draw_flag & MASK_DRAWFLAG_SMOOTH) {
glDisable(GL_LINE_SMOOTH);
glDisable(GL_BLEND);
}
@@ -306,7 +368,7 @@ static void draw_spline_curve(MaskObject *maskobj, MaskSpline *spline,
}
static void draw_maskobjs(Mask *mask,
const char use_smooth, const char draw_type)
const char draw_flag, const char draw_type)
{
MaskObject *maskobj;
@@ -320,7 +382,7 @@ static void draw_maskobjs(Mask *mask,
for (spline = maskobj->splines.first; spline; spline = spline->next) {
/* draw curve itself first... */
draw_spline_curve(maskobj, spline, use_smooth, draw_type);
draw_spline_curve(maskobj, spline, draw_flag, draw_type);
// draw_spline_parents(maskobj, spline);
@@ -334,7 +396,7 @@ static void draw_maskobjs(Mask *mask,
void *back = spline->points_deform;
spline->points_deform = NULL;
draw_spline_curve(maskobj, spline, use_smooth, draw_type);
draw_spline_curve(maskobj, spline, draw_flag, draw_type);
// draw_spline_parents(maskobj, spline);
draw_spline_points(maskobj, spline);
spline->points_deform = back;
@@ -343,12 +405,13 @@ static void draw_maskobjs(Mask *mask,
}
}
void ED_mask_draw(const bContext *C)
void ED_mask_draw(const bContext *C,
const char draw_flag, const char draw_type)
{
Mask *mask = CTX_data_edit_mask(C);
if (!mask)
return;
draw_maskobjs(mask, FALSE, 0);
draw_maskobjs(mask, draw_flag, draw_type);
}

2
source/blender/editors/space_clip/space_clip.c
View File

@@ -1136,7 +1136,7 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
glScalef(maxdim * zoomx, maxdim * zoomy, 0);
glMultMatrixf(sc->stabmat);
ED_mask_draw((bContext *)C);
ED_mask_draw((bContext *)C, sc->mask_draw_flag, sc->mask_draw_type);
ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW);

12
source/blender/makesdna/DNA_mask_types.h
View File

@@ -132,4 +132,16 @@ typedef struct MaskObject {
#define MASK_RESTRICT_SELECT 2
#define MASK_RESTRICT_RENDER 4
/* SpaceClip->mask_draw_flag */
#define MASK_DRAWFLAG_SMOOTH 1
/* copy of eSpaceImage_UVDT */
/* SpaceClip->mask_draw_type */
enum {
MASK_DT_OUTLINE = 0,
MASK_DT_DASH,
MASK_DT_BLACK,
MASK_DT_WHITE
};
#endif // __DNA_MASK_TYPES_H__

4
source/blender/makesdna/DNA_space_types.h
View File

@@ -1014,6 +1014,10 @@ typedef struct SpaceClip {
/* **** mask editing **** */
struct Mask *mask;
/* draw options */
char mask_draw_flag;
char mask_draw_type;
char pad3[6];
} SpaceClip;
/* SpaceClip->flag */

30
source/blender/makesrna/intern/rna_space.c
View File

@@ -45,6 +45,7 @@
#include "DNA_object_types.h"
#include "DNA_space_types.h"
#include "DNA_sequence_types.h"
#include "DNA_mask_types.h"
#include "DNA_view3d_types.h"
#include "WM_api.h"
@@ -1068,6 +1069,14 @@ static void rna_SpaceClipEditor_view_type_update(Main *UNUSED(bmain), Scene *UNU
#else
static EnumPropertyItem dt_uv_items[] = {
{SI_UVDT_OUTLINE, "OUTLINE", 0, "Outline", "Draw white edges with black outline"},
{SI_UVDT_DASH, "DASH", 0, "Dash", "Draw dashed black-white edges"},
{SI_UVDT_BLACK, "BLACK", 0, "Black", "Draw black edges"},
{SI_UVDT_WHITE, "WHITE", 0, "White", "Draw white edges"},
{0, NULL, 0, NULL, NULL}
};
static void rna_def_space(BlenderRNA *brna)
{
StructRNA *srna;
@@ -1099,14 +1108,6 @@ static void rna_def_space_image_uv(BlenderRNA *brna)
{0, NULL, 0, NULL, NULL}
};
static EnumPropertyItem dt_uv_items[] = {
{SI_UVDT_OUTLINE, "OUTLINE", 0, "Outline", "Draw white edges with black outline"},
{SI_UVDT_DASH, "DASH", 0, "Dash", "Draw dashed black-white edges"},
{SI_UVDT_BLACK, "BLACK", 0, "Black", "Draw black edges"},
{SI_UVDT_WHITE, "WHITE", 0, "White", "Draw white edges"},
{0, NULL, 0, NULL, NULL}
};
static EnumPropertyItem dt_uvstretch_items[] = {
{SI_UVDT_STRETCH_ANGLE, "ANGLE", 0, "Angle", "Angular distortion between UV and 3D angles"},
{SI_UVDT_STRETCH_AREA, "AREA", 0, "Area", "Area distortion between UV and 3D faces"},
@@ -3043,6 +3044,19 @@ static void rna_def_space_clip(BlenderRNA *brna)
RNA_def_property_pointer_funcs(prop, NULL, "rna_SpaceClipEditor_mask_set", NULL, NULL);
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CLIP, NULL);
/* mask drawing */
prop = RNA_def_property(srna, "mask_draw_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "mask_draw_type");
RNA_def_property_enum_items(prop, dt_uv_items);
RNA_def_property_ui_text(prop, "Edge Draw Type", "Draw type for mask splines");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CLIP, NULL);
prop = RNA_def_property(srna, "show_mask_smooth", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "mask_draw_flag", MASK_DRAWFLAG_SMOOTH);
RNA_def_property_ui_text(prop, "Draw Smooth Splines", "");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CLIP, NULL);
/* mode */
prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "mode");