[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27276] trunk/blender/source/blender/ render/intern: remove viewfac from Render struct, its only used locally

Campbell Barton ideasman42 at gmail.com
Fri Mar 5 14:00:48 CET 2010


Revision: 27276
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27276
Author:   campbellbarton
Date:     2010-03-05 14:00:48 +0100 (Fri, 05 Mar 2010)

Log Message:
-----------
remove viewfac from Render struct, its only used locally

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/include/render_types.h
    trunk/blender/source/blender/render/intern/source/initrender.c

Modified: trunk/blender/source/blender/render/intern/include/render_types.h
===================================================================
--- trunk/blender/source/blender/render/intern/include/render_types.h	2010-03-05 11:35:15 UTC (rev 27275)
+++ trunk/blender/source/blender/render/intern/include/render_types.h	2010-03-05 13:00:48 UTC (rev 27276)
@@ -146,7 +146,9 @@
 	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 */

Modified: trunk/blender/source/blender/render/intern/source/initrender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/initrender.c	2010-03-05 11:35:15 UTC (rev 27275)
+++ trunk/blender/source/blender/render/intern/source/initrender.c	2010-03-05 13:00:48 UTC (rev 27276)
@@ -450,7 +450,7 @@
 	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 @@
 	/* 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 */





More information about the Bf-blender-cvs mailing list