Commit: f66f765c7977ffba02eebd30da3a8acdae621a8f
Author: Campbell Barton
Date: Tue Mar 17 13:39:00 2015 +1100
Branches: multiview
https://developer.blender.org/rBf66f765c7977ffba02eebd30da3a8acdae621a8f
Cleanup: API naming - use BKE_camera_multiview_*** prefix
===================================================================
M source/blender/blenkernel/BKE_camera.h
M source/blender/blenkernel/intern/camera.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/render/intern/source/external_engine.c
M source/blender/render/intern/source/initrender.c
M source/blender/render/intern/source/pipeline.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_camera.h
b/source/blender/blenkernel/BKE_camera.h
index 78dbe7d..ecc13ee 100644
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@@ -125,11 +125,13 @@ bool BKE_camera_view_frame_fit_to_coords(struct Scene
*scene, float (*cos)[3], i
void BKE_camera_to_gpu_dof(struct Object *camera, struct GPUFXSettings
*r_fx_settings);
-void BKE_camera_view_matrix(struct RenderData *rd, struct Object *camera,
const bool is_left, float r_viewmat[4][4]);
-void BKE_camera_model_matrix(struct RenderData *rd, struct Object *camera,
const char *viewname, float r_modelmat[4][4]);
-struct Object *BKE_camera_render(struct Scene *scene, struct Object *camera,
const char *viewname);
-float BKE_camera_shift_x(struct RenderData *rd, struct Object *camera, const
char *viewname);
-void BKE_camera_params_stereo3d(struct RenderData *rd, struct CameraParams
*params, struct Object *camera, const char *viewname);
+/* Camera multi-view API */
+
+struct Object *BKE_camera_multiview_render(struct Scene *scene, struct Object
*camera, const char *viewname);
+void BKE_camera_multiview_view_matrix(struct RenderData *rd, struct
Object *camera, const bool is_left, float r_viewmat[4][4]);
+void BKE_camera_multiview_model_matrix(struct RenderData *rd, struct
Object *camera, const char *viewname, float r_modelmat[4][4]);
+float BKE_camera_multiview_shift_x(struct RenderData *rd, struct
Object *camera, const char *viewname);
+void BKE_camera_multiview_params(struct RenderData *rd, struct
CameraParams *params, struct Object *camera, const char *viewname);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/intern/camera.c
b/source/blender/blenkernel/intern/camera.c
index 64da269..f9c849f 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -802,9 +802,9 @@ static void camera_stereo3d_model_matrix(Object *camera,
const bool is_left, flo
}
/* the view matrix is used by the viewport drawing, it is basically the
inverted model matrix */
-void BKE_camera_view_matrix(RenderData *rd, Object *camera, const bool
is_left, float r_viewmat[4][4])
+void BKE_camera_multiview_view_matrix(RenderData *rd, Object *camera, const
bool is_left, float r_viewmat[4][4])
{
- BKE_camera_model_matrix(rd, camera, is_left ? STEREO_LEFT_NAME :
STEREO_RIGHT_NAME, r_viewmat);
+ BKE_camera_multiview_model_matrix(rd, camera, is_left ?
STEREO_LEFT_NAME : STEREO_RIGHT_NAME, r_viewmat);
normalize_m4(r_viewmat);
invert_m4(r_viewmat);
}
@@ -818,7 +818,7 @@ static bool camera_is_left(const char *viewname)
return true;
}
-void BKE_camera_model_matrix(RenderData *rd, Object *camera, const char
*viewname, float r_modelmat[4][4])
+void BKE_camera_multiview_model_matrix(RenderData *rd, Object *camera, const
char *viewname, float r_modelmat[4][4])
{
const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW) != 0;
@@ -866,7 +866,7 @@ static Object *camera_multiview_advanced(Scene *scene,
Object *camera, const cha
}
/* returns the camera to be used for render */
-Object *BKE_camera_render(Scene *scene, Object *camera, const char *viewname)
+Object *BKE_camera_multiview_render(Scene *scene, Object *camera, const char
*viewname)
{
const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0;
@@ -921,7 +921,7 @@ static float camera_stereo3d_shift_x(Object *camera, const
char *viewname)
return shift;
}
-float BKE_camera_shift_x(RenderData *rd, Object *camera, const char *viewname)
+float BKE_camera_multiview_shift_x(RenderData *rd, Object *camera, const char
*viewname)
{
const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW) != 0;
Camera *data = camera->data;
@@ -937,9 +937,9 @@ float BKE_camera_shift_x(RenderData *rd, Object *camera,
const char *viewname)
}
}
-void BKE_camera_params_stereo3d(RenderData *rd, CameraParams *params, Object
*camera, const char *viewname)
+void BKE_camera_multiview_params(RenderData *rd, CameraParams *params, Object
*camera, const char *viewname)
{
- params->shiftx = BKE_camera_shift_x(rd, camera, viewname);
+ params->shiftx = BKE_camera_multiview_shift_x(rd, camera, viewname);
}
void BKE_camera_to_gpu_dof(struct Object *camera, struct GPUFXSettings
*r_fx_settings)
diff --git a/source/blender/editors/render/render_opengl.c
b/source/blender/editors/render/render_opengl.c
index 5ee5583..e532fd1 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -339,7 +339,7 @@ static void screen_opengl_render_doit(OGLRender *oglrender,
RenderResult *rr)
/* render 3d view */
if (rv3d->persp == RV3D_CAMOB && v3d->camera) {
/*int is_ortho = scene->r.mode & R_ORTHO;*/
- camera = BKE_camera_render(oglrender->scene,
v3d->camera, viewname);
+ camera = BKE_camera_multiview_render(oglrender->scene,
v3d->camera, viewname);
RE_GetCameraWindow(oglrender->re, camera,
scene->r.cfra, winmat);
is_persp = true;
BKE_camera_to_gpu_dof(camera, &fx_settings);
diff --git a/source/blender/editors/space_view3d/drawobject.c
b/source/blender/editors/space_view3d/drawobject.c
index 5695ab2..b28492d 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1832,18 +1832,18 @@ static void drawcamera_stereo3d(Scene *scene, View3D
*v3d, RegionView3D *rv3d, O
glPushMatrix();
for (i = 0; i < 2; i++) {
- ob = BKE_camera_render(scene, ob, names[i]);
+ ob = BKE_camera_multiview_render(scene, ob, names[i]);
cams[i] = ob->data;
glLoadMatrixf(rv3d->viewmat);
- BKE_camera_model_matrix(&scene->r, ob, names[i], obmat);
+ BKE_camera_multiview_model_matrix(&scene->r, ob, names[i],
obmat);
glMultMatrixf(obmat);
copy_m3_m3(vec_lr[i], vec);
copy_v3_v3(vec_lr[i][3], vec[3]);
if (cam->stereo.convergence_mode == CAM_S3D_OFFAXIS) {
- float shift_x = BKE_camera_shift_x(&scene->r,
ob, names[i]) - cam->shiftx;
+ 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;
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index 7c599e7..3479e33 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3222,14 +3222,14 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(Scene *scene,
View3D *v3d, ARegion *ar, in
if (rv3d->persp == RV3D_CAMOB && v3d->camera) {
CameraParams params;
GPUFXSettings fx_settings = {NULL};
- Object *camera = BKE_camera_render(scene, v3d->camera,
viewname);
+ Object *camera = BKE_camera_multiview_render(scene,
v3d->camera, viewname);
BKE_camera_params_init(¶ms);
/* fallback for non camera objects */
params.clipsta = v3d->near;
params.clipend = v3d->far;
BKE_camera_params_from_object(¶ms, camera);
- BKE_camera_params_stereo3d(&scene->r, ¶ms, camera,
viewname);
+ BKE_camera_multiview_params(&scene->r, ¶ms, camera,
viewname);
BKE_camera_params_compute_viewplane(¶ms, sizex, sizey,
scene->r.xasp, scene->r.yasp);
BKE_camera_params_compute_matrix(¶ms);
@@ -3300,11 +3300,11 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple(Scene
*scene, Object *camera, int w
{
CameraParams params;
- Object *camera = BKE_camera_render(scene, v3d.camera, viewname);
+ Object *camera = BKE_camera_multiview_render(scene, v3d.camera,
viewname);
BKE_camera_params_init(¶ms);
BKE_camera_params_from_object(¶ms, camera);
- BKE_camera_params_stereo3d(&scene->r, ¶ms, camera,
viewname);
+ BKE_camera_multiview_params(&scene->r, ¶ms, camera,
viewname);
BKE_camera_params_compute_viewplane(¶ms, width, height,
scene->r.xasp, scene->r.yasp);
BKE_camera_params_compute_matrix(¶ms);
@@ -3577,9 +3577,9 @@ static void view3d_stereo3d_setup(Scene *scene, View3D
*v3d, ARegion *ar)
shiftx = data->shiftx;
BLI_lock_thread(LOCK_VIEW3D);
- data->shiftx = BKE_camera_shift_x(&scene->r, v3d->camera,
viewname);
+ data->shiftx = BKE_camera_multiview_shift_x(&scene->r,
v3d->camera, viewname);
- BKE_camera_view_matrix(&scene->r, v3d->camera, is_left,
viewmat);
+ BKE_camera_multiview_view_matrix(&scene->r, v3d->camera,
is_left, viewmat);
view3d_main_area_setup_view(scene, v3d, ar, viewmat, NULL);
data->shiftx = shiftx;
@@ -3588,12 +3588,12 @@ static void view3d_stereo3d_setup(Scene *scene, View3D
*v3d, ARegion *ar)
else { /* SCE_VIEWS_FORMAT_MULTIVIEW */
float viewmat[4][4];
Object *view_ob = v3d->camera;
- Object *camera = BKE_camera_render(scene, v3d->camera,
viewname);
+ Object *camera = BKE_camera_multiview_render(scene,
v3d->camera, viewname);
BLI_lock_thread(LOCK_VIEW3D);
v3d->camera = camera;
- BKE_camera_view_matrix(&scene->r, camera, false, viewmat);
+ BKE_camera_multiview_view_matrix(&scene->r, camera, false,
viewmat);
view3d_main_area_setup_view(scene, v3d, ar, viewmat, NULL);
v3d->camera = view_ob;
@@ -3609,14 +3609,14 @@ static void view3d_stereo3d_setup_offscreen(Scene
*scene, View3D *v3d, ARegion *
float viewmat[4][4];
const bool is_left = STREQ(viewname, STEREO_LEFT_NAME);
- BKE_camera_view_matrix(&scene->r, v3d->camera, is_left,
viewmat);
+ BKE_camera_multiview_view_matrix(&scene->r, v3d->camera,
is_left, viewmat);
view3d_main_area_setup_view(scene, v3d, ar, viewmat, winmat);
}
else { /* SCE_VIEWS_FORMAT_MULTIVIEW */
float viewmat[4][4];
- Object *camera = BKE_camera_render(scene, v3d->camera,
viewname);
+ Object *camera = BKE_camera_multiview_render(scene,
v3d->camera, viewname);
- BKE_camera_view_matrix(&scene->r, camera, false, viewmat);
+ BKE_camera_multiview_view_matrix(&scene->r, camera, false,
viewmat);
view3d_main_area_setup_view(scene, v3d, ar, viewmat, winmat);
}
}
diff --git a/source/blender/render/intern/source/external_engine.c
b/source/blender/render/intern/source/external_engine.c
index ab22f00..d633478 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
