mask editing

- clear feather weights (alt+s)
- fix for glitch where placing the feather would jitter.

2 files changed, 44 insertions, 24 deletions

diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h
index 3f837f995ce..f426d96cd5e 100644
--- a/source/blender/blenkernel/BKE_mask.h
+++ b/source/blender/blenkernel/BKE_mask.h
@@ -69,7 +69,14 @@ float (*BKE_mask_spline_feather_points(struct MaskSpline *spline, int *tot_feath
 
 void BKE_mask_point_direction_switch(struct MaskSplinePoint *point);
 void BKE_mask_spline_direction_switch(struct MaskLayer *masklay, struct MaskSpline *spline);
-float BKE_mask_spline_project_co(struct MaskSpline *spline, struct MaskSplinePoint *point, float start_u, const float co[2]);
+
+typedef enum {
+	MASK_PROJ_NEG = -1,
+	MASK_PROJ_ANY = 0,
+	MASK_PROJ_POS = 1
+} eMaskSign;
+float BKE_mask_spline_project_co(struct MaskSpline *spline, struct MaskSplinePoint *point,
+                                 float start_u, const float co[2], const eMaskSign sign);
 
 /* point */
 int BKE_mask_point_has_handle(struct MaskSplinePoint *point);
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index b904b78ffdd..99333411d8a 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -410,8 +410,6 @@ void BKE_mask_point_direction_switch(MaskSplinePoint *point)
 	}
 }
 
-//typedef (float)[MASK_OBJECT_SHAPE_ELEM_SIZE] MaskLayerShapeElem;
-
 typedef struct MaskLayerShapeElem {
 	float value[MASK_OBJECT_SHAPE_ELEM_SIZE];
 } MaskLayerShapeElem;
@@ -467,7 +465,8 @@ void BKE_mask_spline_direction_switch(MaskLayer *masklay, MaskSpline *spline)
 }
 
 
-float BKE_mask_spline_project_co(MaskSpline *spline, MaskSplinePoint *point, float start_u, const float co[2])
+float BKE_mask_spline_project_co(MaskSpline *spline, MaskSplinePoint *point,
+                                 float start_u, const float co[2], const eMaskSign sign)
 {
 	const float proj_eps         = 1e-3;
 	const float proj_eps_squared = proj_eps * proj_eps;
@@ -475,6 +474,8 @@ float BKE_mask_spline_project_co(MaskSpline *spline, MaskSplinePoint *point, flo
 	float u = -1.0f, du = 1.0f / N, u1 = start_u, u2 = start_u;
 	float ang = -1.0f;
 
+	BLI_assert(ABS(sign) <= 1); /* (-1, 0, 1) */
+
 	while (u1 > 0.0f || u2 < 1.0f) {
 		float n1[2], n2[2], co1[2], co2[2];
 		float v1[2], v2[2];
@@ -485,20 +486,26 @@ float BKE_mask_spline_project_co(MaskSpline *spline, MaskSplinePoint *point, flo
 			BKE_mask_point_normal(spline, point, u1, n1);
 			sub_v2_v2v2(v1, co, co1);
 
-			if (len_squared_v2(v1) > proj_eps_squared) {
-				ang1 = angle_v2v2(v1, n1);
-				if (ang1 > M_PI / 2.0f)
-					ang1 = M_PI  - ang1;
+			if ((sign == MASK_PROJ_ANY) ||
+			    ((sign == MASK_PROJ_NEG) && (dot_v2v2(v1, n1) <= 0.0f)) ||
+			    ((sign == MASK_PROJ_POS) && (dot_v2v2(v1, n1) >= 0.0f)))
+			{
 
-				if (ang < 0.0f || ang1 < ang) {
-					ang = ang1;
+				if (len_squared_v2(v1) > proj_eps_squared) {
+					ang1 = angle_v2v2(v1, n1);
+					if (ang1 > M_PI / 2.0f)
+						ang1 = M_PI  - ang1;
+
+					if (ang < 0.0f || ang1 < ang) {
+						ang = ang1;
+						u = u1;
+					}
+				}
+				else {
 					u = u1;
+					break;
 				}
 			}
-			else {
-				u = u1;
-				break;
-			}
 		}
 
 		if (u2 <= 1.0f) {
@@ -506,20 +513,26 @@ float BKE_mask_spline_project_co(MaskSpline *spline, MaskSplinePoint *point, flo
 			BKE_mask_point_normal(spline, point, u2, n2);
 			sub_v2_v2v2(v2, co, co2);
 
-			if (len_squared_v2(v2) > proj_eps_squared) {
-				ang2 = angle_v2v2(v2, n2);
-				if (ang2 > M_PI / 2.0f)
-					ang2 = M_PI  - ang2;
+			if ((sign == MASK_PROJ_ANY) ||
+			    ((sign == MASK_PROJ_NEG) && (dot_v2v2(v2, n2) <= 0.0f)) ||
+			    ((sign == MASK_PROJ_POS) && (dot_v2v2(v2, n2) >= 0.0f)))
+			{
+
+				if (len_squared_v2(v2) > proj_eps_squared) {
+					ang2 = angle_v2v2(v2, n2);
+					if (ang2 > M_PI / 2.0f)
+						ang2 = M_PI  - ang2;
 
-				if (ang2 < ang) {
-					ang = ang2;
+					if (ang2 < ang) {
+						ang = ang2;
+						u = u2;
+					}
+				}
+				else {
 					u = u2;
+					break;
 				}
 			}
-			else {
-				u = u2;
-				break;
-			}
 		}
 
 		u1 -= du;