Differential D585 Diff 1942 source/blender/editors/space_view3d/drawobject.c

Changeset View

Standalone View

source/blender/editors/space_view3d/drawobject.c

Show First 20 Lines • Show All 146 Lines • ▼ Show 20 Lines

typedef struct drawDMEdgesSelInterp_userData {		typedef struct drawDMEdgesSelInterp_userData {
BMesh *bm;		BMesh *bm;

unsigned char baseCol, selCol;		unsigned char baseCol, selCol;
unsigned char *lastCol;		unsigned char *lastCol;
} drawDMEdgesSelInterp_userData;		} drawDMEdgesSelInterp_userData;

		typedef struct drawDMEdgesWeightedInterp_userData {
		campbellbartonUnsubmitted Not Done Inline Actions result of `DM_get_weight_user()` can go here too. campbellbarton: result of `DM_get_weight_user()` can go here too.
		BMesh *bm;

		int cd_dvert_offset;
		int defgroup_tot;
		int vgroup_index;

		} drawDMEdgesWeightedInterp_userData;

typedef struct drawDMFacesSel_userData {		typedef struct drawDMFacesSel_userData {
#ifdef WITH_FREESTYLE		#ifdef WITH_FREESTYLE
unsigned char *cols[4];		unsigned char *cols[4];
#else		#else
unsigned char *cols[3];		unsigned char *cols[3];
#endif		#endif

DerivedMesh *dm;		DerivedMesh *dm;
▲ Show 20 Lines • Show All 2,207 Lines • ▼ Show 20 Lines
/* Draw edges with color interpolated based on selection */		/* Draw edges with color interpolated based on selection */
static DMDrawOption draw_dm_edges_sel_interp__setDrawOptions(void *userData, int index)		static DMDrawOption draw_dm_edges_sel_interp__setDrawOptions(void *userData, int index)
{		{
if (BM_elem_flag_test(BM_edge_at_index(((void **)userData)[0], index), BM_ELEM_HIDDEN))		if (BM_elem_flag_test(BM_edge_at_index(((void **)userData)[0], index), BM_ELEM_HIDDEN))
return DM_DRAW_OPTION_SKIP;		return DM_DRAW_OPTION_SKIP;
else		else
return DM_DRAW_OPTION_NORMAL;		return DM_DRAW_OPTION_NORMAL;
}		}

static void draw_dm_edges_sel_interp__setDrawInterpOptions(void *userData, int index, float t)		static void draw_dm_edges_sel_interp__setDrawInterpOptions(void *userData, int index, float t)
{		{
drawDMEdgesSelInterp_userData *data = userData;		drawDMEdgesSelInterp_userData *data = userData;
BMEdge eed = BM_edge_at_index(((void *)userData)[0], index);		BMEdge eed = BM_edge_at_index(((void *)userData)[0], index);
unsigned char **cols = userData;		unsigned char **cols = userData;
unsigned int col0_id = (BM_elem_flag_test(eed->v1, BM_ELEM_SELECT)) ? 2 : 1;		unsigned int col0_id = (BM_elem_flag_test(eed->v1, BM_ELEM_SELECT)) ? 2 : 1;
unsigned int col1_id = (BM_elem_flag_test(eed->v2, BM_ELEM_SELECT)) ? 2 : 1;		unsigned int col1_id = (BM_elem_flag_test(eed->v2, BM_ELEM_SELECT)) ? 2 : 1;
unsigned char *col0 = cols[col0_id];		unsigned char *col0 = cols[col0_id];
Show All 18 Lines	static void draw_dm_edges_sel_interp__setDrawInterpOptions(void *userData, int index, float t)
}		}

if (data->lastCol != col_pt) {		if (data->lastCol != col_pt) {
data->lastCol = col_pt;		data->lastCol = col_pt;
glColor4ubv(col_pt);		glColor4ubv(col_pt);
}		}
}		}

		static void bm_vert_weight_gl_color(BMVert *eve, int vgroup_index, int cd_dvert_offset, int defgroup_tot)
		{
		MDeformVert *dvert;
		float weight;
		float col[3];

		if (cd_dvert_offset != -1) {
		campbellbartonUnsubmitted Not Done Inline Actions The mesh either has deform weights or not. This check should be moved into `draw_dm_edges_sel_interp` or even earlier. campbellbarton: The mesh either has deform weights or not. This check should be moved into…
		dvert = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset);
		weight = defvert_find_weight(dvert, vgroup_index);
		if (weight == 0.0f)
		{
		if (DM_get_weight_user() == OB_DRAW_GROUPUSER_ACTIVE \|\|
		DM_get_weight_user() == OB_DRAW_GROUPUSER_ALL && defvert_is_weight_zero(dvert, defgroup_tot)) {
		DM_get_weight_alert_color(col);
		glColor3fv(col);
		return;
		}
		}
		weight_to_rgb(col, weight);
		}
		else {
		DM_get_weight_alert_color(col);
		}

		glColor3fv(col);
		}


		static void draw_dm_edges_weighted_interp__setDrawInterpOptions(void *userData, int index, float t)
		{
		drawDMEdgesWeightedInterp_userData *data = userData;
		BMEdge eed = BM_edge_at_index(((void *)userData)[0], index);
		BMVert *bmv = (t < 0.5) ? eed->v1 : eed->v2;
		campbellbartonUnsubmitted Not Done Inline Actions This is incorrect, It should interpolate between the 2 colors if its not 0.0 or 1.0. As selection does. You should be able to check this is working with subsurf+cage. campbellbarton: This is incorrect, It should interpolate between the 2 colors if its not 0.0 or 1.0. As…
		bm_vert_weight_gl_color(bmv, data->vgroup_index, data->cd_dvert_offset, data->defgroup_tot);
		}

static void draw_dm_edges_sel_interp(BMEditMesh em, DerivedMesh dm, unsigned char baseCol, unsigned char selCol)		static void draw_dm_edges_sel_interp(BMEditMesh em, DerivedMesh dm, unsigned char baseCol, unsigned char selCol)
{		{
drawDMEdgesSelInterp_userData data;		drawDMEdgesSelInterp_userData data;
data.bm = em->bm;		data.bm = em->bm;
data.baseCol = baseCol;		data.baseCol = baseCol;
data.selCol = selCol;		data.selCol = selCol;
data.lastCol = NULL;		data.lastCol = NULL;

dm->drawMappedEdgesInterp(dm, draw_dm_edges_sel_interp__setDrawOptions, draw_dm_edges_sel_interp__setDrawInterpOptions, &data);		dm->drawMappedEdgesInterp(dm, draw_dm_edges_sel_interp__setDrawOptions, draw_dm_edges_sel_interp__setDrawInterpOptions, &data);
}		}

		static void draw_dm_edges_weighted_interp(BMEditMesh em, DerivedMesh dm)
		{
		drawDMEdgesWeightedInterp_userData data;
		data.bm = em->bm;
		Object *ob = em->ob;

		data.cd_dvert_offset = CustomData_get_offset(&data.bm->vdata, CD_MDEFORMVERT);
		data.defgroup_tot = BLI_countlist(&ob->defbase);
		data.vgroup_index = ob->actdef - 1;
		glEnable(GL_BLEND);
		dm->drawMappedEdgesInterp(dm, draw_dm_edges_sel_interp__setDrawOptions, draw_dm_edges_weighted_interp__setDrawInterpOptions, &data);
		glDisable(GL_BLEND);
		}

/* Draw only seam edges */		/* Draw only seam edges */
static DMDrawOption draw_dm_edges_seams__setDrawOptions(void *userData, int index)		static DMDrawOption draw_dm_edges_seams__setDrawOptions(void *userData, int index)
{		{
BMEdge *eed = BM_edge_at_index(userData, index);		BMEdge *eed = BM_edge_at_index(userData, index);

if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BM_elem_flag_test(eed, BM_ELEM_SEAM))		if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BM_elem_flag_test(eed, BM_ELEM_SEAM))
return DM_DRAW_OPTION_NORMAL;		return DM_DRAW_OPTION_NORMAL;
else		else
▲ Show 20 Lines • Show All 396 Lines • ▼ Show 20 Lines	else {
selCol[3] = 255;		selCol[3] = 255;
if (!sel_only) wireCol[3] = 255;		if (!sel_only) wireCol[3] = 255;
}		}

if (ts->selectmode == SCE_SELECT_FACE) {		if (ts->selectmode == SCE_SELECT_FACE) {
draw_dm_edges_sel(em, cageDM, wireCol, selCol, actCol, eed_act);		draw_dm_edges_sel(em, cageDM, wireCol, selCol, actCol, eed_act);
}		}
else if ((me->drawflag & ME_DRAWEDGES) \|\| (ts->selectmode & SCE_SELECT_EDGE)) {		else if ((me->drawflag & ME_DRAWEDGES) \|\| (ts->selectmode & SCE_SELECT_EDGE)) {
if (cageDM->drawMappedEdgesInterp && (ts->selectmode & SCE_SELECT_VERTEX)) {		if (cageDM->drawMappedEdgesInterp &&
		((ts->selectmode & SCE_SELECT_VERTEX) \|\| (me->drawflag & ME_DRAWEIGHT)))
		{
		DM_set_weight_user(scene->toolsettings->weightuser);
glShadeModel(GL_SMOOTH);		glShadeModel(GL_SMOOTH);
		bool draw_weights = (me->drawflag & ME_DRAWEIGHT) &&
		((v3d->drawtype == OB_WIRE) \|\|
		(v3d->flag2 & V3D_SOLID_MATCAP) \|\|
		((v3d->flag2 & V3D_OCCLUDE_WIRE) && (v3d->drawtype > OB_WIRE))
		);
		if (draw_weights)
		draw_dm_edges_weighted_interp(em, cageDM);
		else
draw_dm_edges_sel_interp(em, cageDM, wireCol, selCol);		draw_dm_edges_sel_interp(em, cageDM, wireCol, selCol);
glShadeModel(GL_FLAT);		glShadeModel(GL_FLAT);
}		}
else {		else {
draw_dm_edges_sel(em, cageDM, wireCol, selCol, actCol, eed_act);		draw_dm_edges_sel(em, cageDM, wireCol, selCol, actCol, eed_act);
}		}
}		}
else {		else {
if (!sel_only) {		if (!sel_only) {
▲ Show 20 Lines • Show All 5,239 Lines • Show Last 20 Lines