diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-04-04 17:18:41 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-04-04 17:18:41 +0400 |
commit | afdd54fa3720c267f30e48ed45c449d80449bac0 (patch) | |
tree | 3192044fa53f6e1fd3d1b0256963c2d4c090d700 /source/blender/radiosity | |
parent | 203e6ed82b444786d7999e88cebef84d6d429765 (diff) |
moved source and text to american spelling
* colour -> color
* centre -> center
* normalise -> normalize
* modelling -> modeling
Diffstat (limited to 'source/blender/radiosity')
4 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/radiosity/intern/source/raddisplay.c b/source/blender/radiosity/intern/source/raddisplay.c index 429e9de28a2..dcd53b61f46 100644 --- a/source/blender/radiosity/intern/source/raddisplay.c +++ b/source/blender/radiosity/intern/source/raddisplay.c @@ -317,7 +317,7 @@ void drawsquare(float *cent, float size, short cox, short coy) void drawlimits() { - /* centre around cent */ + /* center around cent */ short cox=0, coy=1; if((RG.flag & 3)==2) coy= 2; diff --git a/source/blender/radiosity/intern/source/radfactors.c b/source/blender/radiosity/intern/source/radfactors.c index 64beea24d23..46fb6b2c910 100644 --- a/source/blender/radiosity/intern/source/radfactors.c +++ b/source/blender/radiosity/intern/source/radfactors.c @@ -82,20 +82,20 @@ float calcStokefactor(RPatch *shoot, RPatch *rp, RNode *rn, float *area) VecSubf(vec[2], shoot->cent, rn->v3); VecSubf(vec[3], shoot->cent, rn->v4); - Normalise(vec[0]); - Normalise(vec[1]); - Normalise(vec[2]); - Normalise(vec[3]); + Normalize(vec[0]); + Normalize(vec[1]); + Normalize(vec[2]); + Normalize(vec[3]); /* cross product */ Crossf(cross[0], vec[0], vec[1]); Crossf(cross[1], vec[1], vec[2]); Crossf(cross[2], vec[2], vec[3]); Crossf(cross[3], vec[3], vec[0]); - Normalise(cross[0]); - Normalise(cross[1]); - Normalise(cross[2]); - Normalise(cross[3]); + Normalize(cross[0]); + Normalize(cross[1]); + Normalize(cross[2]); + Normalize(cross[3]); /* angles */ rad[0]= vec[0][0]*vec[1][0]+ vec[0][1]*vec[1][1]+ vec[0][2]*vec[1][2]; @@ -126,17 +126,17 @@ float calcStokefactor(RPatch *shoot, RPatch *rp, RNode *rn, float *area) VecSubf(vec[1], shoot->cent, rn->v2); VecSubf(vec[2], shoot->cent, rn->v3); - Normalise(vec[0]); - Normalise(vec[1]); - Normalise(vec[2]); + Normalize(vec[0]); + Normalize(vec[1]); + Normalize(vec[2]); /* cross product */ Crossf(cross[0], vec[0], vec[1]); Crossf(cross[1], vec[1], vec[2]); Crossf(cross[2], vec[2], vec[0]); - Normalise(cross[0]); - Normalise(cross[1]); - Normalise(cross[2]); + Normalize(cross[0]); + Normalize(cross[1]); + Normalize(cross[2]); /* angles */ rad[0]= vec[0][0]*vec[1][0]+ vec[0][1]*vec[1][1]+ vec[0][2]*vec[1][2]; @@ -322,7 +322,7 @@ int makeformfactors(RPatch *shoot) vec[1]= (float)BLI_drand(); vec[2]= (float)BLI_drand(); Crossf(up, shoot->norm, vec); - len= Normalise(up); + len= Normalize(up); /* this safety for input normals that are zero or illegal sized */ if(a>3) return 0; } while(len==0.0 || len>1.0); diff --git a/source/blender/radiosity/intern/source/radpostprocess.c b/source/blender/radiosity/intern/source/radpostprocess.c index 28fd43367d2..ec2de5f8712 100644 --- a/source/blender/radiosity/intern/source/radpostprocess.c +++ b/source/blender/radiosity/intern/source/radpostprocess.c @@ -124,9 +124,9 @@ void triaweight(Face *face, int *w1, int *w2, int *w3) n3[0]= face->v1[0]-face->v3[0]; n3[1]= face->v1[1]-face->v3[1]; n3[2]= face->v1[2]-face->v3[2]; - Normalise(n1); - Normalise(n2); - Normalise(n3); + Normalize(n1); + Normalize(n2); + Normalize(n3); temp= 32.0/(PI); *w1= 0.5+temp*acos(-n1[0]*n3[0]-n1[1]*n3[1]-n1[2]*n3[2]); *w2= 0.5+temp*acos(-n1[0]*n2[0]-n1[1]*n2[1]-n1[2]*n2[2]); @@ -785,7 +785,7 @@ void rad_addmesh(void) BLI_ghash_free(verthash, NULL, NULL); - /* boundbox and centre new */ + /* boundbox and center new */ INIT_MINMAX(min, max); mvert= me->mvert; diff --git a/source/blender/radiosity/intern/source/radrender.c b/source/blender/radiosity/intern/source/radrender.c index d0472a834af..42c7fa58da5 100644 --- a/source/blender/radiosity/intern/source/radrender.c +++ b/source/blender/radiosity/intern/source/radrender.c @@ -177,7 +177,7 @@ static void makeformfactors_rr(Render *re, VlakRen *shoot) VecSubf(vec, shoot->v1->co, shoot->radface->cent); Crossf(up, shoot->radface->norm, vec); - len= Normalise(up); + len= Normalize(up); VECCOPY(hemitop.up, up); VECCOPY(hemiside.up, shoot->radface->norm); |