← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/radiosity/intern/source/radfactors.c

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2007-05-17 11:47:59 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070517114759-yp4ybrnhp2u7pk66
Tags: 2.44-1
* New upstream release.
* Drop debian/patches/01_64bits_stupidity, not needed anymore: as of this
  version blender is 64 bits safe again. Adjust README.Debian accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/radiosity/intern/source/radfactors.c
32
32
 
33
33
    formfactors.c       nov/dec 1992
34
34
 
35
 
    $Id: radfactors.c,v 1.9 2006/01/28 18:33:15 hos Exp $
 
35
    $Id: radfactors.c,v 1.10 2007/04/04 13:18:30 campbellbarton Exp $
36
36
 
37
37
 *************************************** */
38
38
 
82
82
                VecSubf(vec[2], shoot->cent, rn->v3);
83
83
                VecSubf(vec[3], shoot->cent, rn->v4);
84
84
 
85
 
                Normalise(vec[0]);
86
 
                Normalise(vec[1]);
87
 
                Normalise(vec[2]);
88
 
                Normalise(vec[3]);
 
85
                Normalize(vec[0]);
 
86
                Normalize(vec[1]);
 
87
                Normalize(vec[2]);
 
88
                Normalize(vec[3]);
89
89
 
90
90
                /* cross product */
91
91
                Crossf(cross[0], vec[0], vec[1]);
92
92
                Crossf(cross[1], vec[1], vec[2]);
93
93
                Crossf(cross[2], vec[2], vec[3]);
94
94
                Crossf(cross[3], vec[3], vec[0]);
95
 
                Normalise(cross[0]);
96
 
                Normalise(cross[1]);
97
 
                Normalise(cross[2]);
98
 
                Normalise(cross[3]);
 
95
                Normalize(cross[0]);
 
96
                Normalize(cross[1]);
 
97
                Normalize(cross[2]);
 
98
                Normalize(cross[3]);
99
99
 
100
100
                /* angles */
101
101
                rad[0]= vec[0][0]*vec[1][0]+ vec[0][1]*vec[1][1]+ vec[0][2]*vec[1][2];
126
126
                VecSubf(vec[1], shoot->cent, rn->v2);
127
127
                VecSubf(vec[2], shoot->cent, rn->v3);
128
128
 
129
 
                Normalise(vec[0]);
130
 
                Normalise(vec[1]);
131
 
                Normalise(vec[2]);
 
129
                Normalize(vec[0]);
 
130
                Normalize(vec[1]);
 
131
                Normalize(vec[2]);
132
132
 
133
133
                /* cross product */
134
134
                Crossf(cross[0], vec[0], vec[1]);
135
135
                Crossf(cross[1], vec[1], vec[2]);
136
136
                Crossf(cross[2], vec[2], vec[0]);
137
 
                Normalise(cross[0]);
138
 
                Normalise(cross[1]);
139
 
                Normalise(cross[2]);
 
137
                Normalize(cross[0]);
 
138
                Normalize(cross[1]);
 
139
                Normalize(cross[2]);
140
140
 
141
141
                /* angles */
142
142
                rad[0]= vec[0][0]*vec[1][0]+ vec[0][1]*vec[1][1]+ vec[0][2]*vec[1][2];
322
322
                vec[1]= (float)BLI_drand();
323
323
                vec[2]= (float)BLI_drand();
324
324
                Crossf(up, shoot->norm, vec);
325
 
                len= Normalise(up);
 
325
                len= Normalize(up);
326
326
                /* this safety for input normals that are zero or illegal sized */
327
327
                if(a>3) return 0;
328
328
        } while(len==0.0 || len>1.0);