[Bf-blender-cvs] [7f02b9e] multiview: From review: use stereo3d *everywhere* =)

Dalai Felinto noreply at git.blender.org
Thu Apr 2 22:56:57 CEST 2015


Commit: 7f02b9e8690c7316d3ad08bbc48571ebd22fa37d
Author: Dalai Felinto
Date:   Thu Apr 2 17:56:22 2015 -0300
Branches: multiview
https://developer.blender.org/rB7f02b9e8690c7316d3ad08bbc48571ebd22fa37d

>From review: use stereo3d *everywhere* =)

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

M	source/blender/blenkernel/intern/image.c
M	source/blender/blenkernel/intern/scene.c
M	source/blender/blenkernel/intern/sequencer.c
M	source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
M	source/blender/editors/space_image/image_ops.c
M	source/blender/editors/space_view3d/view3d_draw.c
M	source/blender/imbuf/IMB_imbuf.h
M	source/blender/imbuf/intern/stereoimbuf.c
M	source/blender/render/intern/source/pipeline.c
M	source/blender/windowmanager/WM_api.h
M	source/blender/windowmanager/intern/wm_draw.c
M	source/blender/windowmanager/intern/wm_operators.c
M	source/blender/windowmanager/intern/wm_stereo.c
M	source/blender/windowmanager/wm.h

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

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index c2f6222..f852d88 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3105,7 +3105,7 @@ static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame)
 			ibuf_arr[i] = load_sequence_single(ima, iuser, frame, i, &assign);
 
 		if ((ima->flag & IMA_IS_STEREO) && ima->views_format == R_IMF_VIEWS_STEREO_3D)
-			IMB_ImBufFromStereo(ima->stereo3d_format, ibuf_arr[0], &ibuf_arr[0], &ibuf_arr[1]);
+			IMB_ImBufFromStereo3d(ima->stereo3d_format, ibuf_arr[0], &ibuf_arr[0], &ibuf_arr[1]);
 
 		/* return the original requested ImBuf */
 		ibuf = ibuf_arr[(iuser ? iuser->multi_index : 0)];
@@ -3270,7 +3270,7 @@ static ImBuf *image_load_movie_file(Image *ima, ImageUser *iuser, int frame)
 		}
 
 		if ((ima->flag & IMA_IS_STEREO) && ima->views_format == R_IMF_VIEWS_STEREO_3D)
-			IMB_ImBufFromStereo(ima->stereo3d_format, ibuf_arr[0], &ibuf_arr[0], &ibuf_arr[1]);
+			IMB_ImBufFromStereo3d(ima->stereo3d_format, ibuf_arr[0], &ibuf_arr[0], &ibuf_arr[1]);
 
 		for (i = 0; i < totviews; i++) {
 			if (ibuf_arr[i]) {
@@ -3430,7 +3430,7 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra)
 			ibuf_arr[i] = load_image_single(ima, iuser, cfra, i, has_packed, &assign);
 
 		if ((ima->flag & IMA_IS_STEREO) && ima->views_format == R_IMF_VIEWS_STEREO_3D)
-			IMB_ImBufFromStereo(ima->stereo3d_format, ibuf_arr[0], &ibuf_arr[0], &ibuf_arr[1]);
+			IMB_ImBufFromStereo3d(ima->stereo3d_format, ibuf_arr[0], &ibuf_arr[0], &ibuf_arr[1]);
 
 		/* return the original requested ImBuf */
 		i = iuser && iuser->multi_index < totviews ? iuser->multi_index : 0;
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index cabe148..7ff7b12 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2376,7 +2376,7 @@ void BKE_scene_multiview_videos_dimensions_get(
 	if ((rd->scemode & R_MULTIVIEW) &&
 	    rd->im_format.views_format == R_IMF_VIEWS_STEREO_3D)
 	{
-		IMB_stereo_write_dimensions(
+		IMB_stereo3d_write_dimensions(
 		        rd->im_format.stereo3d_format.display_mode,
 		        (rd->im_format.stereo3d_format.flag & S3D_SQUEEZED_FRAME) != 0,
 		        width, height,
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index d713b59..942426f 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2755,7 +2755,7 @@ static ImBuf *seq_render_image_strip(const SeqRenderData *context, Sequence *seq
 		}
 
 		if (seq->views_format == R_IMF_VIEWS_STEREO_3D && ibufs_arr[0])
-			IMB_ImBufFromStereo(seq->stereo3d_format, ibufs_arr[0], &ibufs_arr[0], &ibufs_arr[1]);
+			IMB_ImBufFromStereo3d(seq->stereo3d_format, ibufs_arr[0], &ibufs_arr[0], &ibufs_arr[1]);
 
 		for (i = 0; i < totviews; i++) {
 			if (ibufs_arr[i]) {
@@ -2853,7 +2853,7 @@ static ImBuf *seq_render_movie_strip(const SeqRenderData *context, Sequence *seq
 
 		if (seq->views_format == R_IMF_VIEWS_STEREO_3D) {
 			if (ibuf_arr[0]) {
-				IMB_ImBufFromStereo(seq->stereo3d_format, ibuf_arr[0], &ibuf_arr[0], &ibuf_arr[1]);
+				IMB_ImBufFromStereo3d(seq->stereo3d_format, ibuf_arr[0], &ibuf_arr[0], &ibuf_arr[1]);
 			}
 			else {
 				/* probably proxy hasn't been created yet */
diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
index 73aa18f..c927dfa 100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
@@ -299,7 +299,7 @@ void OutputStereoOperation::deinitExecution()
 			}
 
 			/* create stereo buffer */
-			ibuf[2] = IMB_stereoImBuf(this->m_format, ibuf[0], ibuf[1]);
+			ibuf[2] = IMB_stereo3d_ImBuf(this->m_format, ibuf[0], ibuf[1]);
 
 			BKE_image_path_from_imformat(
 			        filename, this->m_path, bmain->name, this->m_rd->cfra, this->m_format,
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 2afe4e4..ddbe501 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1843,7 +1843,7 @@ static bool save_image_doit(bContext *C, SpaceImage *sima, wmOperator *op, SaveI
 					BKE_image_release_ibuf(sima->image, ibuf, lock);
 				}
 
-				ibuf = IMB_stereoImBuf(imf, ibuf_stereo[0], ibuf_stereo[1]);
+				ibuf = IMB_stereo3d_ImBuf(imf, ibuf_stereo[0], ibuf_stereo[1]);
 
 				/* save via traditional path */
 				ok = BKE_imbuf_write_as(ibuf, simopts->filepath, imf, save_copy);
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 8abd53d..6e413f7 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3556,7 +3556,7 @@ static bool view3d_stereo3d_active(const bContext *C, Scene *scene, View3D *v3d,
 	if ((scene->r.scemode & R_MULTIVIEW) == 0)
 		return false;
 
-	if (WM_stereo_enabled(win, true) == false)
+	if (WM_stereo3d_enabled(win, true) == false)
 		return false;
 
 	if ((v3d->camera == NULL) || rv3d->persp != RV3D_CAMOB)
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index c93d2e7..a39832d 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -575,22 +575,22 @@ const char *IMB_ffmpeg_last_error(void);
  *
  * \attention defined in stereoimbuf.c
  */
-void IMB_stereo_write_dimensions(
+void IMB_stereo3d_write_dimensions(
         const char mode, const bool is_squeezed, const size_t width, const size_t height,
         size_t *r_width, size_t *r_height);
-void IMB_stereo_read_dimensions(
+void IMB_stereo3d_read_dimensions(
         const char mode, const bool is_squeezed, const size_t width, const size_t height,
         size_t *r_width, size_t *r_height);
-int *IMB_stereo_from_rect(
+int *IMB_stereo3d_from_rect(
         struct ImageFormatData *im_format, const size_t x, const size_t y, const size_t channels,
         int *rect_left, int *rect_right);
-float *IMB_stereo_from_rectf(
+float *IMB_stereo3d_from_rectf(
         struct ImageFormatData *im_format, const size_t x, const size_t y, const size_t channels,
         float *rectf_left, float *rectf_right);
-struct ImBuf *IMB_stereoImBuf(
+struct ImBuf *IMB_stereo3d_ImBuf(
         struct ImageFormatData *im_format,
         struct ImBuf *ibuf_left, struct ImBuf *ibuf_right);
-void IMB_ImBufFromStereo(
+void IMB_ImBufFromStereo3d(
         struct Stereo3dFormat *s3d, struct ImBuf *ibuf_stereo,
         struct ImBuf **r_ibuf_left, struct ImBuf **r_ibuf_right);
 
diff --git a/source/blender/imbuf/intern/stereoimbuf.c b/source/blender/imbuf/intern/stereoimbuf.c
index a866b8e..cf9c6b3 100644
--- a/source/blender/imbuf/intern/stereoimbuf.c
+++ b/source/blender/imbuf/intern/stereoimbuf.c
@@ -53,8 +53,8 @@
 
 /* prototypes */
 struct Stereo3DData;
-static void imb_stereo_write_doit(struct Stereo3DData *s3d_data, struct Stereo3dFormat *s3d);
-static void imb_stereo_read_doit(struct Stereo3DData *s3d_data, struct Stereo3dFormat *s3d);
+static void imb_stereo3d_write_doit(struct Stereo3DData *s3d_data, struct Stereo3dFormat *s3d);
+static void imb_stereo3d_read_doit(struct Stereo3DData *s3d_data, struct Stereo3dFormat *s3d);
 
 typedef struct Stereo3DData {
 	struct { float *left, *right, *stereo; } rectf;
@@ -63,7 +63,7 @@ typedef struct Stereo3DData {
 	bool is_float;
 } Stereo3DData;
 
-static void imb_stereo_write_anaglyph(Stereo3DData *s3d, enum eStereo3dAnaglyphType mode)
+static void imb_stereo3d_write_anaglyph(Stereo3DData *s3d, enum eStereo3dAnaglyphType mode)
 {
 	int x, y;
 	size_t width = s3d->x;
@@ -161,7 +161,7 @@ static void imb_stereo_write_anaglyph(Stereo3DData *s3d, enum eStereo3dAnaglyphT
 	}
 }
 
-static void imb_stereo_write_interlace(Stereo3DData *s3d, enum eStereo3dInterlaceType mode, const bool swap)
+static void imb_stereo3d_write_interlace(Stereo3DData *s3d, enum eStereo3dInterlaceType mode, const bool swap)
 {
 	int x, y;
 	size_t width = s3d->x;
@@ -424,8 +424,8 @@ static void imb_stereo_write_interlace(Stereo3DData *s3d, enum eStereo3dInterlac
 	}
 }
 
-/* stereo output (s3d->rectf.stereo) is always unsqueezed */
-static void imb_stereo_write_sidebyside(Stereo3DData *s3d, const bool crosseyed)
+/* stereo3d output (s3d->rectf.stereo) is always unsqueezed */
+static void imb_stereo3d_write_sidebyside(Stereo3DData *s3d, const bool crosseyed)
 {
 	int y;
 	size_t width = s3d->x;
@@ -472,8 +472,8 @@ static void imb_stereo_write_sidebyside(Stereo3DData *s3d, const bool crosseyed)
 	}
 }
 
-/* stereo output (s3d->rectf.stereo) is always unsqueezed */
-static void imb_stereo_write_topbottom(Stereo3DData *s3d)
+/* stereo3d output (s3d->rectf.stereo) is always unsqueezed */
+static void imb_stereo3d_write_topbottom(Stereo3DData *s3d)
 {
 	int y;
 	size_t width = s3d->x;
@@ -519,7 +519,7 @@ static void imb_stereo_write_topbottom(Stereo3DData *s3d)
 
 /**************************** dimension utils ****************************************/
 
-void IMB_stereo_write_dimensions(
+void IMB_stereo3d_write_dimensions(
         const char mode, const bool is_squeezed, const size_t width, const size_t height,
         size_t *r_width, size_t *r_height)
 {
@@ -547,7 +547,7 @@ void IMB_stereo_write_dimensions(
 	}
 }
 
-void IMB_stereo_read_dimensions(
+void IMB_stereo3d_read_dimensions(
         const char mode, const bool is_squeezed, const size_t width, const size_t height,
         size_t *r_width, size_t *r_height)
 {
@@ -577,7 +577,7 @@ void IMB_stereo_read_dimensions(
 
 /**************************** un/squeeze frame ****************************************/
 
-static void imb_stereo_squeeze_ImBuf(ImBuf *ibuf, Stereo3dFormat *s3d, const size_t x, const size_t y)
+static void imb_stereo3d_squeeze_ImBuf(ImBuf *ibuf, Stereo3dFormat *s3d, const size_t x, const size_t y)
 {
 	if (ELEM(s3d->display_mode, S3D_DISPLAY_SIDEBYSIDE, S3D_DISPLAY_TOPBOTTOM

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list