[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27720] trunk/blender/source/blender: xaspect and yaspect were not working with uv project modifier & panorama, also removed some includes.

[Campbell Barton]

Revision: 27720
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27720
Author:   campbellbarton
Date:     2010-03-24 17:20:13 +0100 (Wed, 24 Mar 2010)

Log Message:
-----------
xaspect and yaspect were not working with uv project modifier & panorama, also 
removed some includes.

Modified Paths:
--------------
    trunk/blender/source/blender/blenfont/intern/blf_lang.c
    trunk/blender/source/blender/blenkernel/intern/modifier.c
    trunk/blender/source/blender/blenlib/intern/uvproject.c
    trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c

Modified: trunk/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_lang.c     2010-03-24 
15:59:44 UTC (rev 27719)
+++ trunk/blender/source/blender/blenfont/intern/blf_lang.c     2010-03-24 
16:20:13 UTC (rev 27720)
@@ -45,7 +45,6 @@
 #include "BLI_linklist.h"      /* linknode */
 #include "BLI_string.h"
 
-#include "BIF_gl.h"
 
 #ifdef __APPLE__
 #include "BKE_utildefines.h"

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c   2010-03-24 
15:59:44 UTC (rev 27719)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c   2010-03-24 
16:20:13 UTC (rev 27720)
@@ -3690,8 +3690,8 @@
        int num_projectors = 0;
        float aspect;
        char uvname[32];
-       float aspx= umd->aspectx ? 1.0f : umd->aspectx;
-       float aspy= umd->aspecty ? 1.0f : umd->aspecty;
+       float aspx= umd->aspectx ? umd->aspectx : 1.0f;
+       float aspy= umd->aspecty ? umd->aspecty : 1.0f;
        int free_uci= 0;
        
        aspect = aspx / aspy;

Modified: trunk/blender/source/blender/blenlib/intern/uvproject.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/uvproject.c     2010-03-24 
15:59:44 UTC (rev 27719)
+++ trunk/blender/source/blender/blenlib/intern/uvproject.c     2010-03-24 
16:20:13 UTC (rev 27720)
@@ -56,28 +56,31 @@
        if(uci->do_pano) {
                float angle= atan2f(pv4[0], -pv4[2]) / (M_PI * 2.0); /* angle 
around the camera */
                if (uci->do_persp==0) {
-                       target[0] = angle; /* no correct method here, just map 
to  0-1 */
-                       target[1] = pv4[1] / uci->camsize;
+                       target[0]= angle; /* no correct method here, just map 
to  0-1 */
+                       target[1]= pv4[1] / uci->camsize;
                }
                else {
                        float vec2d[2]= {pv4[0], pv4[2]}; /* 2D position from 
the camera */
-                       target[0] = angle * (M_PI / uci->camangle);
-                       target[1] = pv4[1] / (len_v2(vec2d) * uci->camsize);
+                       target[0]= angle * (M_PI / uci->camangle);
+                       target[1]= pv4[1] / (len_v2(vec2d) * uci->camsize);
                }
        }
        else {
                if (pv4[2]==0.0f) pv4[2]= 0.00001f; /* don't allow div by 0 */
 
                if (uci->do_persp==0) {
-                       target[0]=(pv4[0]/uci->camsize) * uci->xasp;
-                       target[1]=(pv4[1]/uci->camsize) * uci->yasp;
+                       target[0]= (pv4[0]/uci->camsize);
+                       target[1]= (pv4[1]/uci->camsize);
                }
                else {
-                       
target[0]=(-pv4[0]*((1.0f/uci->camsize)/pv4[2])*uci->xasp) / 2.0f;
-                       
target[1]=(-pv4[1]*((1.0f/uci->camsize)/pv4[2])*uci->yasp) / 2.0f;
+                       target[0]= (-pv4[0]*((1.0f/uci->camsize)/pv4[2])) / 
2.0f;
+                       target[1]= (-pv4[1]*((1.0f/uci->camsize)/pv4[2])) / 
2.0f;
                }
        }
 
+       target[0] *= uci->xasp;
+       target[1] *= uci->yasp;
+       
        /* adds camera shift + 0.5 */
        target[0] += uci->shiftx;
        target[1] += uci->shifty;

Modified: trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c    
2010-03-24 15:59:44 UTC (rev 27719)
+++ trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c    
2010-03-24 16:20:13 UTC (rev 27720)
@@ -44,7 +44,6 @@
 #include "BKE_global.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "WM_api.h"
 #include "wm_subwindow.h"


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs