[Bf-blender-cvs] [052a021] master: cleanup: indentation & redundant casts

Campbell Barton noreply at git.blender.org
Mon Feb 2 23:34:04 CET 2015


Commit: 052a02171164087159411cf4200c496b1a414d43
Author: Campbell Barton
Date:   Tue Feb 3 09:18:46 2015 +1100
Branches: master
https://developer.blender.org/rB052a02171164087159411cf4200c496b1a414d43

cleanup: indentation & redundant casts

also use 'const' bucket rect args

===================================================================

M	source/blender/editors/sculpt_paint/paint_image_proj.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index c601129..14e3f6b 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -423,17 +423,19 @@ static int project_bucket_offset_safe(const ProjPaintState *ps, const float proj
 	}
 }
 
-static float VecZDepthOrtho(const float pt[2],
-                            const float v1[3], const float v2[3], const float v3[3],
-                            float w[3])
+static float VecZDepthOrtho(
+        const float pt[2],
+        const float v1[3], const float v2[3], const float v3[3],
+        float w[3])
 {
 	barycentric_weights_v2(v1, v2, v3, pt, w);
 	return (v1[2] * w[0]) + (v2[2] * w[1]) + (v3[2] * w[2]);
 }
 
-static float VecZDepthPersp(const float pt[2],
-                            const float v1[4], const float v2[4], const float v3[4],
-                            float w[3])
+static float VecZDepthPersp(
+        const float pt[2],
+        const float v1[4], const float v2[4], const float v3[4],
+        float w[3])
 {
 	float wtot_inv, wtot;
 	float w_tmp[3];
@@ -543,8 +545,9 @@ static void uvco_to_wrapped_pxco(const float uv[2], int ibuf_x, int ibuf_y, floa
 }
 
 /* Set the top-most face color that the screen space coord 'pt' touches (or return 0 if none touch) */
-static bool project_paint_PickColor(const ProjPaintState *ps, const float pt[2],
-                                    float *rgba_fp, unsigned char *rgba, const bool interp)
+static bool project_paint_PickColor(
+        const ProjPaintState *ps, const float pt[2],
+        float *rgba_fp, unsigned char *rgba, const bool interp)
 {
 	float w[3], uv[2];
 	int side;
@@ -638,9 +641,10 @@ static bool project_paint_PickColor(const ProjPaintState *ps, const float pt[2],
  *  1	: occluded
  *  2	: occluded with w[3] weights set (need to know in some cases) */
 
-static int project_paint_occlude_ptv(const float pt[3],
-                                     const float v1[4], const float v2[4], const float v3[4],
-                                     float w[3], const bool is_ortho)
+static int project_paint_occlude_ptv(
+        const float pt[3],
+        const float v1[4], const float v2[4], const float v3[4],
+        float w[3], const bool is_ortho)
 {
 	/* if all are behind us, return false */
 	if (v1[2] > pt[2] && v2[2] > pt[2] && v3[2] > pt[2])
@@ -670,9 +674,10 @@ static int project_paint_occlude_ptv(const float pt[3],
 }
 
 
-static int project_paint_occlude_ptv_clip(const ProjPaintState *ps, const MFace *mf,
-                                          const float pt[3], const float v1[4], const float v2[4], const float v3[4],
-                                          const int side)
+static int project_paint_occlude_ptv_clip(
+        const ProjPaintState *ps, const MFace *mf,
+        const float pt[3], const float v1[4], const float v2[4], const float v3[4],
+        const int side)
 {
 	float w[3], wco[3];
 	int ret = project_paint_occlude_ptv(pt, v1, v2, v3, w, ps->is_ortho);
@@ -700,8 +705,9 @@ static int project_paint_occlude_ptv_clip(const ProjPaintState *ps, const MFace
 /* Check if a screenspace location is occluded by any other faces
  * check, pixelScreenCo must be in screenspace, its Z-Depth only needs to be used for comparison
  * and doesn't need to be correct in relation to X and Y coords (this is the case in perspective view) */
-static bool project_bucket_point_occluded(const ProjPaintState *ps, LinkNode *bucketFace,
-                                          const int orig_face, const float pixelScreenCo[4])
+static bool project_bucket_point_occluded(
+        const ProjPaintState *ps, LinkNode *bucketFace,
+        const int orig_face, const float pixelScreenCo[4])
 {
 	MFace *mf;
 	int face_index;
@@ -913,9 +919,10 @@ static void project_face_winding_init(const ProjPaintState *ps, const int face_i
 
 /* This function returns 1 if this face has a seam along the 2 face-vert indices
  * 'orig_i1_fidx' and 'orig_i2_fidx' */
-static bool check_seam(const ProjPaintState *ps,
-                       const int orig_face, const int orig_i1_fidx, const int orig_i2_fidx,
-                       int *other_face, int *orig_fidx)
+static bool check_seam(
+        const ProjPaintState *ps,
+        const int orig_face, const int orig_i1_fidx, const int orig_i2_fidx,
+        int *other_face, int *orig_fidx)
 {
 	LinkNode *node;
 	int face_index;
@@ -1004,8 +1011,9 @@ BLI_INLINE float shell_v2v2_normal_dir_to_dist(float n[2], float d[2])
 /* Calculate outset UV's, this is not the same as simply scaling the UVs,
  * since the outset coords are a margin that keep an even distance from the original UV's,
  * note that the image aspect is taken into account */
-static void uv_image_outset(float (*orig_uv)[2], float (*outset_uv)[2], const float scaler,
-                            const int ibuf_x, const int ibuf_y, const bool is_quad, const bool cw)
+static void uv_image_outset(
+        float (*orig_uv)[2], float (*outset_uv)[2], const float scaler,
+        const int ibuf_x, const int ibuf_y, const bool is_quad, const bool cw)
 {
 	float a1, a2, a3, a4 = 0.0f;
 	float puv[4][2]; /* pixelspace uv's */
@@ -1213,8 +1221,9 @@ static void screen_px_from_persp(
 }
 
 
-static void project_face_pixel(const MTFace *tf_other, ImBuf *ibuf_other, const float w[3],
-                               int side, unsigned char rgba_ub[4], float rgba_f[4])
+static void project_face_pixel(
+        const MTFace *tf_other, ImBuf *ibuf_other, const float w[3],
+        int side, unsigned char rgba_ub[4], float rgba_f[4])
 {
 	const float *uvCo1, *uvCo2, *uvCo3;
 	float uv_other[2], x, y;
@@ -1455,7 +1464,7 @@ static ProjPixel *project_paint_uvpixel_init(
 	y_px = mod_i(y_px, ibuf->y);
 
 	BLI_assert(ps->pixel_sizeof == project_paint_pixel_sizeof(ps->tool));
-	projPixel = (ProjPixel *)BLI_memarena_alloc(arena, ps->pixel_sizeof);
+	projPixel = BLI_memarena_alloc(arena, ps->pixel_sizeof);
 
 	/* calculate the undo tile offset of the pixel, used to store the original
 	 * pixel color and accumulated mask if any */
@@ -1586,7 +1595,7 @@ static ProjPixel *project_paint_uvpixel_init(
 }
 
 static bool line_clip_rect2f(
-        rctf *rect,
+        const rctf *rect,
         const float l1[2], const float l2[2],
         float l1_clip[2], float l2_clip[2])
 {
@@ -1801,7 +1810,7 @@ static float len_squared_v2v2_alt(const float v1[2], const float v2_1, const flo
 /* note, use a squared value so we can use len_squared_v2v2
  * be sure that you have done a bounds check first or this may fail */
 /* only give bucket_bounds as an arg because we need it elsewhere */
-static bool project_bucket_isect_circle(const float cent[2], const float radius_squared, rctf *bucket_bounds)
+static bool project_bucket_isect_circle(const float cent[2], const float radius_squared, const rctf *bucket_bounds)
 {
 
 	/* Would normally to a simple intersection test, however we know the bounds of these 2 already intersect
@@ -1856,7 +1865,7 @@ static bool project_bucket_isect_circle(const float cent[2], const float radius_
  * however switching back to this for ortho is always an option */
 
 static void rect_to_uvspace_ortho(
-        rctf *bucket_bounds,
+        const rctf *bucket_bounds,
         const float *v1coSS, const float *v2coSS, const float *v3coSS,
         const float *uv1co, const float *uv2co, const float *uv3co,
         float bucket_bounds_uv[4][2],
@@ -1889,7 +1898,7 @@ static void rect_to_uvspace_ortho(
 
 /* same as above but use barycentric_weights_v2_persp */
 static void rect_to_uvspace_persp(
-        rctf *bucket_bounds,
+        const rctf *bucket_bounds,
         const float *v1coSS, const float *v2coSS, const float *v3coSS,
         const float *uv1co, const float *uv2co, const float *uv3co,
         float bucket_bounds_uv[4][2],
@@ -1965,7 +1974,7 @@ static int float_z_sort(const void *p1, const void *p2)
 
 /* assumes one point is within the rectangle */
 static void line_rect_clip(
-        rctf *rect,
+        const rctf *rect,
         const float l1[4], const float l2[4],
         const float uv1[2], const float uv2[2],
         float uv[2], bool is_ortho)
@@ -1997,7 +2006,7 @@ static void line_rect_clip(
 
 static void project_bucket_clip_face(
         const bool is_ortho,
-        rctf *bucket_bounds,
+        const rctf *bucket_bounds,
         float *v1coSS, float *v2coSS, float *v3coSS,
         const float *uv1co, const float *uv2co, const float *uv3co,
         float bucket_bounds_uv[8][2],
@@ -2005,7 +2014,8 @@ static void project_bucket_clip_face(
 {
 	int inside_bucket_flag = 0;
 	int inside_face_flag = 0;
-	const int flip = ((line_point_side_v2(v1coSS, v2coSS, v3coSS) > 0.0f) != (line_point_side_v2(uv1co, uv2co, uv3co) > 0.0f));
+	const int flip = ((line_point_side_v2(v1coSS, v2coSS, v3coSS) > 0.0f) !=
+	                  (line_point_side_v2(uv1co, uv2co, uv3co) > 0.0f));
 	bool colinear = false;
 	
 	float bucket_bounds_ss[4][2];
@@ -2021,7 +2031,8 @@ static void project_bucket_clip_face(
 	inside_bucket_flag |= BLI_rctf_isect_pt_v(bucket_bounds, v3coSS) << 2;
 	
 	if (inside_bucket_flag == ISECT_ALL3) {
-		/* all screenspace points are inside the bucket bounding box, this means we don't need to clip and can simply return the UVs */
+		/* all screenspace points are inside the bucket bounding box,
+		 * this means we don't need to clip and can simply return the UVs */
 		if (flip) { /* facing the back? */
 			copy_v2_v2(bucket_bounds_uv[0], uv3co);
 			copy_v2_v2(bucket_bounds_uv[1], uv2co);
@@ -2206,7 +2217,8 @@ static void project_bucket_clip_face(
 		for (i = 0; i < (*tot); i++) {
 			v2_clipSS[0] = isectVCosSS[i][0] - cent[0];
 			v2_clipSS[1] = isectVCosSS[i][1] - cent[1];
-			isectVCosSS[i][2] = atan2f(v1_clipSS[0] * v2_clipSS[1] - v1_clipSS[1] * v2_clipSS[0], v1_clipSS[0] * v2_clipSS[0] + v1_clipSS[1] * v2_clipSS[1]);
+			isectVCosSS[i][2] = atan2f(v1_clipSS[0] * v2_clipSS[1] - v1_clipSS[1] * v2_clipSS[0],
+			                           v1_clipSS[0] * v2_clipSS[0] + v1_clipSS[1] * v2_clipSS[1]);
 		}
 
 		if (flip) qsort(isectVCosSS, *tot, sizeof(float) * 3, float_z_sort_flip

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list