Curve Edit Mode: Use curve handle theme colors

3 files changed, 70 insertions, 25 deletions

diff --git a/source/blender/draw/intern/draw_cache_impl_curve.c b/source/blender/draw/intern/draw_cache_impl_curve.c
index a6dc52f66c9..8edea5fd963 100644
--- a/source/blender/draw/intern/draw_cache_impl_curve.c
+++ b/source/blender/draw/intern/draw_cache_impl_curve.c
@@ -40,9 +40,22 @@
 
 #include "GPU_batch.h"
 
+#include "UI_resources.h"
+
 #include "draw_cache_impl.h"  /* own include */
 
-#define SELECT   1
+#define SELECT            1
+#define ACTIVE_NURB       1 << 7 /* last char bite */
+#define HANDLE_SEL_OFFSET (TH_HANDLE_SEL_FREE - TH_HANDLE_FREE)
+
+/* Used as values of `color_id` in `edit_curve_overlay_handle_geom.glsl` */
+enum {
+	COLOR_NURB_ULINE_ID = TH_HANDLE_SEL_AUTOCLAMP - TH_HANDLE_FREE + 1,
+	COLOR_NURB_SEL_ULINE_ID,
+	COLOR_ACTIVE_SPLINE,
+
+	TOT_HANDLE_COL,
+};
 
 /**
  * TODO
@@ -742,47 +755,50 @@ static void curve_batch_cache_create_overlay_batches(Curve *cu)
 		int vbo_len_used = 0;
 		GWN_vertbuf_data_alloc(vbo, vbo_len_capacity);
 		int i = 0;
-		for (Nurb *nu = rdata->nurbs->first; nu; nu = nu->next) {
+		for (Nurb *nu = rdata->nurbs->first; nu; nu = nu->next, i++) {
+			const bool is_active_nurb = (i == cu->actnu);
+
 			if (nu->bezt) {
 				int a = 0;
 				for (const BezTriple *bezt = nu->bezt; a < nu->pntsu; a++, bezt++) {
 					if (bezt->hide == false) {
-						const bool is_active = (i == rdata->actvert);
-						char vflag;
-
-						vflag = (bezt->f1 & SELECT) ? (is_active ? VFLAG_VERTEX_ACTIVE : VFLAG_VERTEX_SELECTED) : 0;
-						GWN_vertbuf_attr_set(vbo, attr_id.pos, vbo_len_used, bezt->vec[0]);
-						GWN_vertbuf_attr_set(vbo, attr_id.data, vbo_len_used, &vflag);
-						vbo_len_used += 1;
+						char col_id;
 
-						/* same vertex twice, only check different selection */
-						for (int j = 0; j < 2; j++) {
-							vflag = ((j ? bezt->f3 : bezt->f1) & SELECT) ?
-							        (is_active ? VFLAG_VERTEX_ACTIVE : VFLAG_VERTEX_SELECTED) : 0;
+						for (int j = 0; j < 2; j += 1) {
+							/* same vertex twice, only check different selection */
 							GWN_vertbuf_attr_set(vbo, attr_id.pos, vbo_len_used, bezt->vec[1]);
-							GWN_vertbuf_attr_set(vbo, attr_id.data, vbo_len_used, &vflag);
 							vbo_len_used += 1;
-						}
 
-						vflag = (bezt->f3 & SELECT) ? (is_active ? VFLAG_VERTEX_ACTIVE : VFLAG_VERTEX_SELECTED) : 0;
-						GWN_vertbuf_attr_set(vbo, attr_id.pos, vbo_len_used, bezt->vec[2]);
-						GWN_vertbuf_attr_set(vbo, attr_id.data, vbo_len_used, &vflag);
-						vbo_len_used += 1;
+							col_id = (&bezt->h1)[j];
+							if ((&bezt->f1)[j * 2] & SELECT) {
+								col_id += HANDLE_SEL_OFFSET;
+							}
+							if (is_active_nurb) {
+								col_id |= ACTIVE_NURB;
+							}
+
+							GWN_vertbuf_attr_set(vbo, attr_id.pos, vbo_len_used, bezt->vec[j * 2]);
+							GWN_vertbuf_attr_set(vbo, attr_id.data, vbo_len_used, &col_id);
+							vbo_len_used += 1;
+						}
 					}
-					i += 1;
 				}
 			}
 			else if (nu->bp) {
 				int a = 1;
 				for (const BPoint *bp_prev = nu->bp, *bp_curr = &nu->bp[1]; a < nu->pntsu; a++, bp_prev = bp_curr++) {
 					if ((bp_prev->hide == false) && (bp_curr->hide == false)) {
-						char vflag;
-						vflag = ((bp_prev->f1 & SELECT) && (bp_curr->f1 & SELECT)) ? VFLAG_VERTEX_SELECTED : 0;
+						char col_id = ((bp_prev->f1 & SELECT) && (bp_curr->f1 & SELECT)) ? COLOR_NURB_SEL_ULINE_ID : COLOR_NURB_ULINE_ID;
+
+						if (is_active_nurb) {
+							col_id |= ACTIVE_NURB;
+						}
+
 						GWN_vertbuf_attr_set(vbo, attr_id.pos, vbo_len_used, bp_prev->vec);
-						GWN_vertbuf_attr_set(vbo, attr_id.data, vbo_len_used, &vflag);
 						vbo_len_used += 1;
+
 						GWN_vertbuf_attr_set(vbo, attr_id.pos, vbo_len_used, bp_curr->vec);
-						GWN_vertbuf_attr_set(vbo, attr_id.data, vbo_len_used, &vflag);
+						GWN_vertbuf_attr_set(vbo, attr_id.data, vbo_len_used, &col_id);
 						vbo_len_used += 1;
 
 					}
@@ -1092,4 +1108,4 @@ Gwn_Batch *DRW_curve_batch_cache_get_overlay_cursor(Curve *cu)
 	return cache->text.cursor;
 }
 
-/** \} */
\ No newline at end of file
+/** \} */
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index 6ce01056bfc..e86a231c19d 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -81,6 +81,21 @@ void DRW_globals_update(void)
 	UI_GetThemeColor4fv(TH_FACE_DOT, ts.colorFaceDot);
 	UI_GetThemeColor4fv(TH_BACK, ts.colorBackground);
 
+	/* Curve */
+	UI_GetThemeColor4fv(TH_HANDLE_FREE, ts.colorHandleFree);
+	UI_GetThemeColor4fv(TH_HANDLE_AUTO, ts.colorHandleAuto);
+	UI_GetThemeColor4fv(TH_HANDLE_VECT, ts.colorHandleVect);
+	UI_GetThemeColor4fv(TH_HANDLE_ALIGN, ts.colorHandleAlign);
+	UI_GetThemeColor4fv(TH_HANDLE_AUTOCLAMP, ts.colorHandleAutoclamp);
+	UI_GetThemeColor4fv(TH_HANDLE_SEL_FREE, ts.colorHandleSelFree);
+	UI_GetThemeColor4fv(TH_HANDLE_SEL_AUTO, ts.colorHandleSelAuto);
+	UI_GetThemeColor4fv(TH_HANDLE_SEL_VECT, ts.colorHandleSelVect);
+	UI_GetThemeColor4fv(TH_HANDLE_SEL_ALIGN, ts.colorHandleSelAlign);
+	UI_GetThemeColor4fv(TH_HANDLE_SEL_AUTOCLAMP, ts.colorHandleSelAutoclamp);
+	UI_GetThemeColor4fv(TH_NURB_ULINE, ts.colorNurbUline);
+	UI_GetThemeColor4fv(TH_NURB_SEL_ULINE, ts.colorNurbSelUline);
+	UI_GetThemeColor4fv(TH_ACTIVE_SPLINE, ts.colorActiveSpline);
+
 	/* Grid */
 	UI_GetThemeColorShade4fv(TH_GRID, 10, ts.colorGrid);
 	/* emphasise division lines lighter instead of darker, if background is darker than grid */
diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h
index 0bdb79b3a40..0a7227287ea 100644
--- a/source/blender/draw/intern/draw_common.h
+++ b/source/blender/draw/intern/draw_common.h
@@ -72,6 +72,20 @@ typedef struct GlobalsUboStorage {
 
 	float colorBackground[4];
 
+	float colorHandleFree[4];
+	float colorHandleAuto[4];
+	float colorHandleVect[4];
+	float colorHandleAlign[4];
+	float colorHandleAutoclamp[4];
+	float colorHandleSelFree[4];
+	float colorHandleSelAuto[4];
+	float colorHandleSelVect[4];
+	float colorHandleSelAlign[4];
+	float colorHandleSelAutoclamp[4];
+	float colorNurbUline[4];
+	float colorNurbSelUline[4];
+	float colorActiveSpline[4];
+
 	float colorGrid[4];
 	float colorGridEmphasise[4];
 	float colorGridAxisX[4];