blender
/
blender
136
412
Fork 596
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

Cleanup: remove unused render camera code

This commit is contained in:
Brecht Van Lommel 2021-01-21 14:29:20 +01:00
parent e91b59b589
commit 90bcd5e724
5 changed files with 18 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
View File

@ -56,11 +56,6 @@ NodeGroup *BlenderFileLoader::Load()
// creation of the scene root node
_Scene = new NodeGroup;
_viewplane_left = _re->viewplane.xmin;
_viewplane_right = _re->viewplane.xmax;
_viewplane_bottom = _re->viewplane.ymin;
_viewplane_top = _re->viewplane.ymax;
if (_re->clip_start < 0.0f) {
// Adjust clipping start/end and set up a Z offset when the viewport preview
// is used with the orthographic view. In this case, _re->clip_start is negative,
@ -76,14 +71,6 @@ NodeGroup *BlenderFileLoader::Load()
_z_offset = 0.0f;
}
#if 0
if (G.debug & G_DEBUG_FREESTYLE) {
cout << "Frustum: l " << _viewplane_left << " r " << _viewplane_right << " b "
<< _viewplane_bottom << " t " << _viewplane_top << " n " << _z_near << " f " << _z_far
<< endl;
}
#endif
int id = 0;
const eEvaluationMode eval_mode = DEG_get_mode(_depsgraph);

4
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
View File

@ -152,10 +152,6 @@ class BlenderFileLoader {
real _minEdgeSize;
#endif
bool _smooth; /* if true, face smoothness is taken into account */
float _viewplane_left;
float _viewplane_right;
float _viewplane_bottom;
float _viewplane_top;
float _z_near, _z_far;
float _z_offset;

2
source/blender/render/RE_pipeline.h
View File

@ -252,8 +252,6 @@ void RE_ChangeModeFlag(struct Render *re, int flag, bool clear);
struct Object *RE_GetCamera(struct Render *re); /* return camera override if set */
void RE_SetOverrideCamera(struct Render *re, struct Object *cam_ob);
void RE_SetCamera(struct Render *re, struct Object *cam_ob);
void RE_SetWindow(struct Render *re, const rctf *viewplane, float clip_start, float clip_end);
void RE_SetOrtho(struct Render *re, const rctf *viewplane, float clip_start, float clip_end);
/* get current view and window transform */
void RE_GetViewPlane(struct Render *re, rctf *r_viewplane, rcti *r_disprect);

35
source/blender/render/intern/initrender.c
View File

@ -172,26 +172,11 @@ struct Object *RE_GetCamera(Render *re)
return BKE_camera_multiview_render(re->scene, camera, re->viewname);
}
static void re_camera_params_get(Render *re, CameraParams *params)
{
copy_m4_m4(re->winmat, params->winmat);
re->clip_start = params->clip_start;
re->clip_end = params->clip_end;
re->viewplane = params->viewplane;
}
void RE_SetOverrideCamera(Render *re, Object *cam_ob)
{
re->camera_override = cam_ob;
}
static void re_camera_params_stereo3d(Render *re, CameraParams *params, Object *cam_ob)
{
BKE_camera_multiview_params(&re->r, params, cam_ob, re->viewname);
}
/* call this after InitState() */
/* per render, there's one persistent viewplane. Parts will set their own viewplanes */
void RE_SetCamera(Render *re, Object *cam_ob)
@ -201,14 +186,17 @@ void RE_SetCamera(Render *re, Object *cam_ob)
/* setup parameters */
BKE_camera_params_init(&params);
BKE_camera_params_from_object(&params, cam_ob);
re_camera_params_stereo3d(re, &params, cam_ob);
BKE_camera_multiview_params(&re->r, &params, cam_ob, re->viewname);
/* compute matrix, viewplane, .. */
BKE_camera_params_compute_viewplane(&params, re->winx, re->winy, re->r.xasp, re->r.yasp);
BKE_camera_params_compute_matrix(&params);
/* extract results */
re_camera_params_get(re, &params);
copy_m4_m4(re->winmat, params.winmat);
re->clip_start = params.clip_start;
re->clip_end = params.clip_end;
re->viewplane = params.viewplane;
}
void RE_GetCameraWindow(struct Render *re, struct Object *camera, float r_winmat[4][4])
@ -241,6 +229,19 @@ void RE_GetCameraModelMatrix(Render *re, struct Object *camera, float r_modelmat
BKE_camera_multiview_model_matrix(&re->r, camera, re->viewname, r_modelmat);
}
void RE_GetViewPlane(Render *re, rctf *r_viewplane, rcti *r_disprect)
{
*r_viewplane = re->viewplane;
/* make disprect zero when no border render, is needed to detect changes in 3d view render */
if (re->r.mode & R_BORDER) {
*r_disprect = re->disprect;
}
else {
BLI_rcti_init(r_disprect, 0, 0, 0, 0);
}
}
/* ~~~~~~~~~~~~~~~~ part (tile) calculus ~~~~~~~~~~~~~~~~~~~~~~ */
void RE_parts_free(Render *re)

47
source/blender/render/intern/pipeline.c
View File

@ -983,53 +983,6 @@ void render_update_anim_renderdata(Render *re, RenderData *rd, ListBase *render_
BLI_duplicatelist(&re->r.views, &rd->views);
}
void RE_SetWindow(Render *re, const rctf *viewplane, float clip_start, float clip_end)
{
/* re->ok flag? */
re->viewplane = *viewplane;
re->clip_start = clip_start;
re->clip_end = clip_end;
perspective_m4(re->winmat,
re->viewplane.xmin,
re->viewplane.xmax,
re->viewplane.ymin,
re->viewplane.ymax,
re->clip_start,
re->clip_end);
}
void RE_SetOrtho(Render *re, const rctf *viewplane, float clip_start, float clip_end)
{
/* re->ok flag? */
re->viewplane = *viewplane;
re->clip_start = clip_start;
re->clip_end = clip_end;
orthographic_m4(re->winmat,
re->viewplane.xmin,
re->viewplane.xmax,
re->viewplane.ymin,
re->viewplane.ymax,
re->clip_start,
re->clip_end);
}
void RE_GetViewPlane(Render *re, rctf *r_viewplane, rcti *r_disprect)
{
*r_viewplane = re->viewplane;
/* make disprect zero when no border render, is needed to detect changes in 3d view render */
if (re->r.mode & R_BORDER) {
*r_disprect = re->disprect;
}
else {
BLI_rcti_init(r_disprect, 0, 0, 0, 0);
}
}
/* image and movie output has to move to either imbuf or kernel */
void RE_display_init_cb(Render *re, void *handle, void (*f)(void *handle, RenderResult *rr))
{