[Bf-blender-cvs] [fd5573c] multiview: Cleanup: minor edits

Campbell Barton noreply at git.blender.org
Tue Mar 17 08:04:09 CET 2015


Commit: fd5573c70094340769a01f3efcc6dd5360ed0549
Author: Campbell Barton
Date:   Tue Mar 17 18:02:14 2015 +1100
Branches: multiview
https://developer.blender.org/rBfd5573c70094340769a01f3efcc6dd5360ed0549

Cleanup: minor edits

drawcamera_stereo3d had shadowed 'scale' var, rename to make unique

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

M	source/blender/blenkernel/intern/sequencer.c
M	source/blender/editors/render/render_opengl.c
M	source/blender/editors/space_image/image_buttons.c
M	source/blender/editors/space_view3d/drawobject.c
M	source/blender/render/intern/source/render_result.c
M	source/blender/render/intern/source/rendercore.c
M	source/blender/render/intern/source/zbuf.c
M	source/blender/windowmanager/intern/wm_draw.c

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

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 1269d66..b0cb172 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1760,8 +1760,8 @@ static size_t seq_proxy_context_count(Sequence *seq, Scene *scene)
 					num_views = 2;
 					break;
 				case R_IMF_VIEWS_MULTIVIEW:
-				/* not supported at the moment */
-				/* fall through */
+					/* not supported at the moment */
+					/* pass through */
 				default:
 					num_views = 1;
 			}
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 74e7137..0f71d25 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -704,7 +704,8 @@ static int screen_opengl_render_anim_initialize(bContext *C, wmOperator *op)
 
 			oglrender->movie_ctx_arr[i] = oglrender->mh->context_create();
 			if (!oglrender->mh->start_movie(oglrender->movie_ctx_arr[i], scene, &scene->r, oglrender->sizex,
-			                                oglrender->sizey, suffix, oglrender->reports)) {
+			                                oglrender->sizey, suffix, oglrender->reports))
+			{
 				screen_opengl_render_end(C, oglrender);
 				return 0;
 			}
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index a842406..a02f64d 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -1157,7 +1157,7 @@ void uiTemplateImageFormatViews(uiLayout *layout, PointerRNA *imfptr, PointerRNA
 	ImageFormatData *imf = imfptr->data;
 	uiLayout *col;
 
-	if (ptr){
+	if (ptr) {
 		uiItemR(layout, ptr, "use_multiview", 0, NULL, ICON_NONE);
 		col = uiLayoutColumn(layout, false);
 		uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_multiview"));
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index b28492d..0bdd18d 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1808,16 +1808,17 @@ static bool drawcamera_is_stereo3d(Scene *scene, View3D *v3d, Object *ob)
 	        (v3d->stereo3d_flag);
 }
 
-static void drawcamera_stereo3d(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, Camera *cam,
-                                float vec[4][3], float drawsize, float scale[3])
+static void drawcamera_stereo3d(
+        Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, const Camera *cam,
+        float vec[4][3], float drawsize, const float scale[3])
 {
 	int i, j;
 	float obmat[4][4];
 	float vec_lr[2][4][3];
-	float fac = 1.0f;
+	const float fac = (cam->stereo.pivot == CAM_S3D_PIVOT_CENTER) ? 2.0f : 1.0f;
 	float origin[2][3] = {{0}};
 	float tvec[3];
-	Camera *cams[2] = {cam};
+	const Camera *cam_lr[2];
 	const char *names[2] = {STEREO_LEFT_NAME, STEREO_RIGHT_NAME};
 
 	const bool is_stereo3d_cameras = (v3d->stereo3d_flag & V3D_S3D_DISPCAMERAS) && (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D);
@@ -1826,14 +1827,11 @@ static void drawcamera_stereo3d(Scene *scene, View3D *v3d, RegionView3D *rv3d, O
 
 	zero_v3(tvec);
 
-	if (cam->stereo.pivot == CAM_S3D_PIVOT_CENTER)
-		fac = 2.0f;
-
 	glPushMatrix();
 
 	for (i = 0; i < 2; i++) {
 		ob = BKE_camera_multiview_render(scene, ob, names[i]);
-		cams[i] = ob->data;
+		cam_lr[i] = ob->data;
 
 		glLoadMatrixf(rv3d->viewmat);
 		BKE_camera_multiview_model_matrix(&scene->r, ob, names[i], obmat);
@@ -1843,10 +1841,13 @@ static void drawcamera_stereo3d(Scene *scene, View3D *v3d, RegionView3D *rv3d, O
 		copy_v3_v3(vec_lr[i][3], vec[3]);
 
 		if (cam->stereo.convergence_mode == CAM_S3D_OFFAXIS) {
-				float shift_x = BKE_camera_multiview_shift_x(&scene->r, ob, names[i]) - cam->shiftx;
-				shift_x *= drawsize * scale[0] * fac;
-				for (j = 0; j < 4; j++)
-					vec_lr[i][j][0] += shift_x;
+			const float shift_x =
+			        ((BKE_camera_multiview_shift_x(&scene->r, ob, names[i]) - cam->shiftx) *
+			         (drawsize * scale[0] * fac));
+
+			for (j = 0; j < 4; j++) {
+				vec_lr[i][j][0] += shift_x;
+			}
 		}
 
 		if (is_stereo3d_cameras) {
@@ -1861,9 +1862,11 @@ static void drawcamera_stereo3d(Scene *scene, View3D *v3d, RegionView3D *rv3d, O
 		mul_m4_v3(obmat, origin[i]);
 
 		/* convergence plane */
-		if (is_stereo3d_plane || is_stereo3d_volume)
-			for (j = 0; j < 4; j++)
+		if (is_stereo3d_plane || is_stereo3d_volume) {
+			for (j = 0; j < 4; j++) {
 				mul_m4_v3(obmat, vec_lr[i][j]);
+			}
+		}
 	}
 
 
@@ -1889,7 +1892,7 @@ static void drawcamera_stereo3d(Scene *scene, View3D *v3d, RegionView3D *rv3d, O
 		float axis_center[3], screen_center[3];
 		float world_plane[4][3];
 		float local_plane[4][3];
-		float scale;
+		float offset;
 
 		mid_v3_v3v3(axis_center, origin[0], origin[1]);
 
@@ -1899,10 +1902,10 @@ static void drawcamera_stereo3d(Scene *scene, View3D *v3d, RegionView3D *rv3d, O
 		}
 
 		mid_v3_v3v3(screen_center, world_plane[0], world_plane[2]);
-		scale = cam->stereo.convergence_distance / len_v3v3(screen_center, axis_center);
+		offset = cam->stereo.convergence_distance / len_v3v3(screen_center, axis_center);
 
 		for (i = 0; i < 4; i++) {
-			mul_v3_fl(local_plane[i], scale);
+			mul_v3_fl(local_plane[i], offset);
 			add_v3_v3(local_plane[i], axis_center);
 		}
 
@@ -1928,21 +1931,21 @@ static void drawcamera_stereo3d(Scene *scene, View3D *v3d, RegionView3D *rv3d, O
 	if (is_stereo3d_volume) {
 		float screen_center[3];
 		float near_plane[4][3], far_plane[4][3];
-		float scale;
+		float offset;
 		int j;
 
 		for (i = 0; i < 2; i++) {
 			mid_v3_v3v3(screen_center, vec_lr[i][0], vec_lr[i][2]);
 
-			scale = len_v3v3(screen_center, origin[i]);
+			offset = len_v3v3(screen_center, origin[i]);
 
 			for (j = 0; j < 4; j++) {
 				sub_v3_v3v3(near_plane[j], vec_lr[i][j], origin[i]);
-				mul_v3_fl(near_plane[j], cams[i]->clipsta / scale);
+				mul_v3_fl(near_plane[j], cam_lr[i]->clipsta / offset);
 				add_v3_v3(near_plane[j], origin[i]);
 
 				sub_v3_v3v3(far_plane[j], vec_lr[i][j], origin[i]);
-				mul_v3_fl(far_plane[j], cams[i]->clipend / scale);
+				mul_v3_fl(far_plane[j], cam_lr[i]->clipend / offset);
 				add_v3_v3(far_plane[j], origin[i]);
 			}
 
@@ -2097,8 +2100,9 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
 	}
 
 	/* stereo cameras drawing */
-	if (is_stereo3d)
+	if (is_stereo3d) {
 		drawcamera_stereo3d(scene, v3d, rv3d, ob, cam, vec, drawsize, scale);
+	}
 }
 
 /* flag similar to draw_object() */
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index 9b8a9a0..90f6eab 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -1055,10 +1055,10 @@ bool RE_WriteRenderResult(ReportList *reports, RenderResult *rr, const char *fil
 	else {
 		for (nr = 0, rview = rr->views.first; rview; rview = rview->next, nr++) {
 			if (is_mono) {
-				if (strcmp (view, rview->name) != 0)
+				if (!STREQ(view, rview->name)) {
 					continue;
-				else
-					chan_view = "";
+				}
+				chan_view = "";
 			}
 			else {
 				/* if rendered only one view, we treat as a a non-view render */
@@ -1079,13 +1079,13 @@ bool RE_WriteRenderResult(ReportList *reports, RenderResult *rr, const char *fil
 
 			/* passes are allocated in sync */
 			for (rpass = rl->passes.first; rpass; rpass = rpass->next) {
-				int xstride = rpass->channels;
+				const int xstride = rpass->channels;
 
 				if (is_mono) {
-					if (strcmp (view, rpass->view) != 0)
+					if (!STREQ(view, rpass->view)) {
 						continue;
-					else
-						chan_view = "";
+					}
+					chan_view = "";
 				}
 				else {
 					/* if rendered only one view, we treat as a a non-view render */
@@ -1205,7 +1205,8 @@ static void save_render_result_tile(RenderResult *rr, RenderResult *rrpart, cons
 
 		/* passes are allocated in sync */
 		for (rpassp = rlp->passes.first; rpassp; rpassp = rpassp->next) {
-			int a, xstride = rpassp->channels;
+			const int xstride = rpassp->channels;
+			int a;
 			char passname[EXR_PASS_MAXNAME];
 
 			for (a = 0; a < xstride; a++) {
@@ -1374,7 +1375,8 @@ int render_result_exr_file_read_path(RenderResult *rr, RenderLayer *rl_single, c
 		
 		/* passes are allocated in sync */
 		for (rpass = rl->passes.first; rpass; rpass = rpass->next) {
-			int a, xstride = rpass->channels;
+			const int xstride = rpass->channels;
+			int a;
 			char passname[EXR_PASS_MAXNAME];
 
 			for (a = 0; a < xstride; a++) {
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 4016e53..2461f55 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -217,7 +217,7 @@ static void halo_pixelstruct(HaloRen *har, RenderLayer **rlpp, int totsample, in
 	if (fullsample) {
 		for (sample=0; sample<totsample; sample++)
 			if (!(mask & (1 << sample))) {
-				float *pass= RE_RenderLayerGetPass(rlpp[sample], SCE_PASS_COMBINED, R.viewname);
+				float *pass = RE_RenderLayerGetPass(rlpp[sample], SCE_PASS_COMBINED, R.viewname);
 				addalphaAddfacFloat(pass + od*4, col, har->add);
 			}
 	}
@@ -228,7 +228,7 @@ static void halo_pixelstruct(HaloRen *har, RenderLayer **rlpp, int totsample, in
 		col[3]= accol[3];
 		
 		for (sample=0; sample<totsample; sample++) {
-			float *pass= RE_RenderLayerGetPass(rlpp[sample], SCE_PASS_COMBINED, R.viewname);
+			float *pass = RE_RenderLayerGetPass(rlpp[sample], SCE_PASS_COMBINED, R.viewname);
 			addalphaAddfacFloat(pass + od*4, col, har->add);
 		}
 	}
@@ -368,7 +368,7 @@ static void lamphalo_tile(RenderPart *pa, RenderLayer *rl)
 						for (sample=0; sample<totsample; sample++) {
 							if (ps->mask & (1 << sample)) {
 								pass = RE_RenderLayerGetPass(rlpp[sample], SCE_PASS_COMBINED, R.viewname);
-								pass+= od*4;
+								pass += od * 4;
 								pass[0]+= col[0];
 								pass[1]+= col[1];
 								pass[2]+= col[2];
@@ -380,7 +380,7 @@ static void lamphalo_tile(RenderPart *pa, RenderLayer *rl)
 					e

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list