diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-03-05 16:00:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-03-05 16:00:48 +0300 |
| commit | 19154014b8a87f1f63f5d75d6983adc5fa6dbc7f (patch) | |
| tree | e44f97ef1c48c18ccedf6d91caef647c94b7bbdb /source/blender/render/intern | |
| parent | b055e596cc0f29b96b8b9ccd997a3b12306f8ada (diff) | |
remove viewfac from Render struct, its only used locally
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 4 | ||||
| -rw-r--r-- | source/blender/render/intern/source/initrender.c | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index ef85f965453..e093c1a6c99 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -146,7 +146,9 @@ struct Render int partx, party; /* values for viewing */ - float lens, ycor, viewfac; + float lens; + float ycor; /* (scene->xasp / scene->yasp), multiplied with 'winy' */ + float panophi, panosi, panoco, panodxp, panodxv; /* Matrices */ diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index 46dcb018a00..0976cd70c19 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -450,7 +450,7 @@ void RE_SetCamera(Render *re, Object *camera) Camera *cam=NULL; rctf viewplane; float pixsize, clipsta, clipend; - float lens, shiftx=0.0, shifty=0.0, winside; + float lens, shiftx=0.0, shifty=0.0, winside, viewfac; /* question mark */ re->ycor= ( (float)re->r.yasp)/( (float)re->r.xasp); @@ -507,23 +507,23 @@ void RE_SetCamera(Render *re, Object *camera) /* ortho only with camera available */ if(cam && (re->r.mode & R_ORTHO)) { if( (re->r.xasp*re->winx) >= (re->r.yasp*re->winy) ) { - re->viewfac= re->winx; + viewfac= re->winx; } else { - re->viewfac= re->ycor*re->winy; + viewfac= re->ycor*re->winy; } /* ortho_scale == 1.0 means exact 1 to 1 mapping */ - pixsize= cam->ortho_scale/re->viewfac; + pixsize= cam->ortho_scale/viewfac; } else { if( (re->r.xasp*re->winx) >= (re->r.yasp*re->winy) ) { - re->viewfac= (re->winx*lens)/32.0; + viewfac= (re->winx*lens)/32.0; } else { - re->viewfac= re->ycor*(re->winy*lens)/32.0; + viewfac= re->ycor*(re->winy*lens)/32.0; } - pixsize= clipsta/re->viewfac; + pixsize= clipsta/viewfac; } /* viewplane fully centered, zbuffer fills in jittered between -.5 and +.5 */ |