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/blenlib | |
parent | 203e6ed82b444786d7999e88cebef84d6d429765 (diff) |
moved source and text to american spelling
* colour -> color
* centre -> center
* normalise -> normalize
* modelling -> modeling
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_arithb.h | 4 | ||||
-rw-r--r-- | source/blender/blenlib/MTC_matrixops.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/MTC_vectorops.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/arithb.c | 70 | ||||
-rw-r--r-- | source/blender/blenlib/intern/matrixops.c | 6 | ||||
-rw-r--r-- | source/blender/blenlib/intern/vectorops.c | 4 |
6 files changed, 44 insertions, 44 deletions
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h index d11c04291b9..2ef8d6744df 100644 --- a/source/blender/blenlib/BLI_arithb.h +++ b/source/blender/blenlib/BLI_arithb.h @@ -478,7 +478,7 @@ FloatLerpf( float fac ); float -Normalise( +Normalize( float *n ); float @@ -944,7 +944,7 @@ Inp2f( float *v2 ); float -Normalise2( +Normalize2( float *n ); diff --git a/source/blender/blenlib/MTC_matrixops.h b/source/blender/blenlib/MTC_matrixops.h index a1b9959dab2..27b5bb1ca95 100644 --- a/source/blender/blenlib/MTC_matrixops.h +++ b/source/blender/blenlib/MTC_matrixops.h @@ -81,7 +81,7 @@ int MTC_Mat4Invert(float inverse[][4], float mat[][4]); /** * Make the set of mat orthonormal (mat should already be orthogonal)? - * (doesn't appear to normalise properly?) + * (doesn't appear to normalize properly?) */ void MTC_Mat4Ortho(float mat[][4]); diff --git a/source/blender/blenlib/MTC_vectorops.h b/source/blender/blenlib/MTC_vectorops.h index e6fb8559abc..64b2c312eb4 100644 --- a/source/blender/blenlib/MTC_vectorops.h +++ b/source/blender/blenlib/MTC_vectorops.h @@ -54,7 +54,7 @@ void MTC_swapInt(int *i1, int *i2); void MTC_diff3DFF(double v1[3], float v2[3], float v3[3]); void MTC_cross3Double(double v1[3], double v2[3], double v3[3]); -float MTC_normalise3DF(float n[3]); +float MTC_normalize3DF(float n[3]); /* ------------------------------------------------------------------------- */ #endif /* VECTOROPS_H */ diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c index e19ffa29b28..67d3b61e93e 100644 --- a/source/blender/blenlib/intern/arithb.c +++ b/source/blender/blenlib/intern/arithb.c @@ -95,12 +95,12 @@ float sasqrt(float fac) return (float)sqrt(fac); } -float Normalise(float *n) +float Normalize(float *n) { float d; d= n[0]*n[0]+n[1]*n[1]+n[2]*n[2]; - /* A larger value causes normalise errors in a scaled down models with camera xtreme close */ + /* A larger value causes normalize errors in a scaled down models with camera xtreme close */ if(d>1.0e-35F) { d= (float)sqrt(d); @@ -1220,7 +1220,7 @@ void Mat3ToQuat_is_ok( float wmat[][3], float *q) nor[0] = mat[2][1]; /* cross product with (0,0,1) */ nor[1] = -mat[2][0]; nor[2] = 0.0; - Normalise(nor); + Normalize(nor); co= mat[2][2]; angle= 0.5f*saacos(co); @@ -1341,7 +1341,7 @@ float *vectoquat( float *vec, short axis, short upflag) } co/= len1; - Normalise(nor); + Normalize(nor); angle= 0.5f*saacos(co); si= (float)sin(angle); @@ -1414,14 +1414,14 @@ void VecUpMat3old( float *vec, float mat[][3], short axis) mat[coz][0]= vec[0]; mat[coz][1]= vec[1]; mat[coz][2]= vec[2]; - Normalise((float *)mat[coz]); + Normalize((float *)mat[coz]); inp= mat[coz][0]*up[0] + mat[coz][1]*up[1] + mat[coz][2]*up[2]; mat[coy][0]= up[0] - inp*mat[coz][0]; mat[coy][1]= up[1] - inp*mat[coz][1]; mat[coy][2]= up[2] - inp*mat[coz][2]; - Normalise((float *)mat[coy]); + Normalize((float *)mat[coy]); Crossf(mat[cox], mat[coy], mat[coz]); @@ -1460,14 +1460,14 @@ void VecUpMat3(float *vec, float mat[][3], short axis) mat[coz][0]= vec[0]; mat[coz][1]= vec[1]; mat[coz][2]= vec[2]; - Normalise((float *)mat[coz]); + Normalize((float *)mat[coz]); inp= mat[coz][2]; mat[coy][0]= - inp*mat[coz][0]; mat[coy][1]= - inp*mat[coz][1]; mat[coy][2]= 1.0f - inp*mat[coz][2]; - Normalise((float *)mat[coy]); + Normalize((float *)mat[coy]); Crossf(mat[cox], mat[coy], mat[coz]); @@ -1751,20 +1751,20 @@ void i_lookat(float vx, float vy, float vz, float px, float py, float pz, float void Mat3Ortho(float mat[][3]) { - Normalise(mat[0]); - Normalise(mat[1]); - Normalise(mat[2]); + Normalize(mat[0]); + Normalize(mat[1]); + Normalize(mat[2]); } void Mat4Ortho(float mat[][4]) { float len; - len= Normalise(mat[0]); + len= Normalize(mat[0]); if(len!=0.0) mat[0][3]/= len; - len= Normalise(mat[1]); + len= Normalize(mat[1]); if(len!=0.0) mat[1][3]/= len; - len= Normalise(mat[2]); + len= Normalize(mat[2]); if(len!=0.0) mat[2][3]/= len; } @@ -1876,7 +1876,7 @@ void CalcNormShort( short *v1, short *v2, short *v3, float *n) /* is also cross n[0]= n1[1]*n2[2]-n1[2]*n2[1]; n[1]= n1[2]*n2[0]-n1[0]*n2[2]; n[2]= n1[0]*n2[1]-n1[1]*n2[0]; - Normalise(n); + Normalize(n); } void CalcNormLong( int* v1, int*v2, int*v3, float *n) @@ -1892,7 +1892,7 @@ void CalcNormLong( int* v1, int*v2, int*v3, float *n) n[0]= n1[1]*n2[2]-n1[2]*n2[1]; n[1]= n1[2]*n2[0]-n1[0]*n2[2]; n[2]= n1[0]*n2[1]-n1[1]*n2[0]; - Normalise(n); + Normalize(n); } float CalcNormFloat( float *v1, float *v2, float *v3, float *n) @@ -1908,7 +1908,7 @@ float CalcNormFloat( float *v1, float *v2, float *v3, float *n) n[0]= n1[1]*n2[2]-n1[2]*n2[1]; n[1]= n1[2]*n2[0]-n1[0]*n2[2]; n[2]= n1[0]*n2[1]-n1[1]*n2[0]; - return Normalise(n); + return Normalize(n); } float CalcNormFloat4( float *v1, float *v2, float *v3, float *v4, float *n) @@ -1928,7 +1928,7 @@ float CalcNormFloat4( float *v1, float *v2, float *v3, float *v4, float *n) n[1]= n1[2]*n2[0]-n1[0]*n2[2]; n[2]= n1[0]*n2[1]-n1[1]*n2[0]; - return Normalise(n); + return Normalize(n); } @@ -2022,12 +2022,12 @@ float AreaQ3Dfl( float *v1, float *v2, float *v3, float *v4) /* only convex Qu VecSubf(vec1, v2, v1); VecSubf(vec2, v4, v1); Crossf(n, vec1, vec2); - len= Normalise(n); + len= Normalize(n); VecSubf(vec1, v4, v3); VecSubf(vec2, v2, v3); Crossf(n, vec1, vec2); - len+= Normalise(n); + len+= Normalize(n); return (len/2.0f); } @@ -2039,7 +2039,7 @@ float AreaT3Dfl( float *v1, float *v2, float *v3) /* Triangles */ VecSubf(vec1, v3, v2); VecSubf(vec2, v1, v2); Crossf(n, vec1, vec2); - len= Normalise(n); + len= Normalize(n); return (len/2.0f); } @@ -2403,7 +2403,7 @@ void VecRotToQuat( float *vec, float phi, float *quat) quat[2]= vec[1]; quat[3]= vec[2]; - if( Normalise(quat+1) == 0.0) { + if( Normalize(quat+1) == 0.0) { QuatOne(quat); } else { @@ -2424,8 +2424,8 @@ float VecAngle3(float *v1, float *v2, float *v3) VecSubf(vec1, v2, v1); VecSubf(vec2, v2, v3); - Normalise(vec1); - Normalise(vec2); + Normalize(vec1); + Normalize(vec2); return NormalizedVecAngle2(vec1, vec2) * 180.0/M_PI; } @@ -2437,8 +2437,8 @@ float VecAngle2(float *v1, float *v2) VecCopyf(vec1, v1); VecCopyf(vec2, v2); - Normalise(vec1); - Normalise(vec2); + Normalize(vec1); + Normalize(vec2); return NormalizedVecAngle2(vec1, vec2)* 180.0/M_PI; } @@ -2585,11 +2585,11 @@ void Mat3ToSize( float mat[][3], float *size) float vec[3]; VecCopyf(vec, mat[0]); - size[0]= Normalise(vec); + size[0]= Normalize(vec); VecCopyf(vec, mat[1]); - size[1]= Normalise(vec); + size[1]= Normalize(vec); VecCopyf(vec, mat[2]); - size[2]= Normalise(vec); + size[2]= Normalize(vec); } @@ -2599,11 +2599,11 @@ void Mat4ToSize( float mat[][4], float *size) VecCopyf(vec, mat[0]); - size[0]= Normalise(vec); + size[0]= Normalize(vec); VecCopyf(vec, mat[1]); - size[1]= Normalise(vec); + size[1]= Normalize(vec); VecCopyf(vec, mat[2]); - size[2]= Normalise(vec); + size[2]= Normalize(vec); } /* ************* SPECIALS ******************* */ @@ -2619,7 +2619,7 @@ void triatoquat( float *v1, float *v2, float *v3, float *quat) n[0]= vec[1]; n[1]= -vec[0]; n[2]= 0.0; - Normalise(n); + Normalize(n); if(n[0]==0.0 && n[1]==0.0) n[0]= 1.0; @@ -2639,7 +2639,7 @@ void triatoquat( float *v1, float *v2, float *v3, float *quat) /* what angle has this line with x-axis? */ vec[2]= 0.0; - Normalise(vec); + Normalize(vec); angle= (float)(0.5*atan2(vec[1], vec[0])); co= (float)cos(angle); @@ -2700,7 +2700,7 @@ float Inp2f(float *v1, float *v2) return v1[0]*v2[0]+v1[1]*v2[1]; } -float Normalise2(float *n) +float Normalize2(float *n) { float d; diff --git a/source/blender/blenlib/intern/matrixops.c b/source/blender/blenlib/intern/matrixops.c index 3c486202cee..62098d5fa90 100644 --- a/source/blender/blenlib/intern/matrixops.c +++ b/source/blender/blenlib/intern/matrixops.c @@ -267,11 +267,11 @@ void MTC_Mat4Ortho(float mat[][4]) { float len; - len= MTC_normalise3DF(mat[0]); + len= MTC_normalize3DF(mat[0]); if(len!=0.0) mat[0][3]/= len; - len= MTC_normalise3DF(mat[1]); + len= MTC_normalize3DF(mat[1]); if(len!=0.0) mat[1][3]/= len; - len= MTC_normalise3DF(mat[2]); + len= MTC_normalize3DF(mat[2]); if(len!=0.0) mat[2][3]/= len; } diff --git a/source/blender/blenlib/intern/vectorops.c b/source/blender/blenlib/intern/vectorops.c index ee4cabac1d3..8c4ad5414db 100644 --- a/source/blender/blenlib/intern/vectorops.c +++ b/source/blender/blenlib/intern/vectorops.c @@ -141,12 +141,12 @@ void MTC_diff3DFF(double v1[3], float v2[3], float v3[3]) } /* ------------------------------------------------------------------------- */ -float MTC_normalise3DF(float n[3]) +float MTC_normalize3DF(float n[3]) { float d; d= n[0]*n[0]+n[1]*n[1]+n[2]*n[2]; - /* FLT_EPSILON is too large! A larger value causes normalise errors in */ + /* FLT_EPSILON is too large! A larger value causes normalize errors in */ /* a scaled down utah teapot */ if(d>0.0000000000001) { |