From afdd54fa3720c267f30e48ed45c449d80449bac0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 4 Apr 2007 13:18:41 +0000 Subject: moved source and text to american spelling * colour -> color * centre -> center * normalise -> normalize * modelling -> modeling --- source/blender/blenkernel/BKE_bad_level_calls.h | 2 +- .../blenkernel/bad_level_call_stubs/stubs.c | 2 +- source/blender/blenkernel/intern/DerivedMesh.c | 6 +- source/blender/blenkernel/intern/armature.c | 10 +-- source/blender/blenkernel/intern/brush.c | 4 +- source/blender/blenkernel/intern/cdderivedmesh.c | 4 +- source/blender/blenkernel/intern/constraint.c | 80 +++++++++++----------- source/blender/blenkernel/intern/curve.c | 8 +-- source/blender/blenkernel/intern/displist.c | 12 ++-- source/blender/blenkernel/intern/effect.c | 12 ++-- source/blender/blenkernel/intern/exotic.c | 4 +- source/blender/blenkernel/intern/font.c | 4 +- source/blender/blenkernel/intern/image.c | 2 +- source/blender/blenkernel/intern/lattice.c | 2 +- source/blender/blenkernel/intern/mesh.c | 4 +- source/blender/blenkernel/intern/object.c | 2 +- source/blender/blenkernel/intern/softbody.c | 34 ++++----- .../blenkernel/intern/verse_geometry_node.c | 4 +- 18 files changed, 98 insertions(+), 98 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_bad_level_calls.h b/source/blender/blenkernel/BKE_bad_level_calls.h index 997df6430dc..ddc18851a9f 100644 --- a/source/blender/blenkernel/BKE_bad_level_calls.h +++ b/source/blender/blenkernel/BKE_bad_level_calls.h @@ -96,7 +96,7 @@ void make_editMesh(void); struct EditMesh; void free_editMesh(struct EditMesh *); void free_editArmature(void); -void docentre_new(void); +void docenter_new(void); int saveover(char *str); /* image.c */ diff --git a/source/blender/blenkernel/bad_level_call_stubs/stubs.c b/source/blender/blenkernel/bad_level_call_stubs/stubs.c index f567f65b9dd..344f763608c 100644 --- a/source/blender/blenkernel/bad_level_call_stubs/stubs.c +++ b/source/blender/blenkernel/bad_level_call_stubs/stubs.c @@ -142,7 +142,7 @@ Material defmaterial; void load_editMesh(void){} void make_editMesh(void){} void free_editMesh(struct EditMesh *em){} -void docentre_new(void){} +void docenter_new(void){} int saveover(char *str){ return 0;} /* image.c */ diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 097890c4e47..ff704d59463 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1001,9 +1001,9 @@ static DerivedMesh *getEditMeshDerivedMesh(EditMesh *em, Object *ob, float *no = emdm->vertexNos[i]; /* following Mesh convention; we use vertex coordinate itself * for normal in this case */ - if (Normalise(no)==0.0) { + if (Normalize(no)==0.0) { VECCOPY(no, vertexCos[i]); - Normalise(no); + Normalize(no); } } } @@ -2498,7 +2498,7 @@ void writeBobjgz(char *filename, struct Object *ob, int useGlobalCoords, int app EulToMat3(ob->rot, rotmat); for(i=0; ibone->segments>1) h1[1]-= length; - Normalise(h1); + Normalize(h1); VecMulf(h1, -hlength1); } else { @@ -466,7 +466,7 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan) roll= atan2(mat3[2][0], mat3[2][2]); /* and only now negate handle */ - Normalise(h2); + Normalize(h2); VecMulf(h2, -hlength2); } @@ -548,7 +548,7 @@ float distfactor_to_bone (float vec[3], float b1[3], float b2[3], float rad1, fl float hsqr, a, l, rad; VecSubf (bdelta, b2, b1); - l = Normalise (bdelta); + l = Normalize (bdelta); VecSubf (pdelta, vec, b1); @@ -964,14 +964,14 @@ void vec_roll_to_mat3(float *vec, float roll, float mat[][3]) float rMatrix[3][3], bMatrix[3][3]; VECCOPY (nor, vec); - Normalise (nor); + Normalize (nor); /* Find Axis & Amount for bone matrix*/ Crossf (axis,target,nor); if (Inpf(axis,axis) > 0.0000000000001) { /* if nor is *not* a multiple of target ... */ - Normalise (axis); + Normalize (axis); theta= NormalizedVecAngle2(target, nor); diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 6236f3e3156..ca2f7b114d5 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -780,7 +780,7 @@ int brush_painter_paint(BrushPainter *painter, BrushFunc func, float *pos, doubl /* setup starting time, direction vector and accumulated time */ starttime= painter->accumtime; Vec2Subf(dmousepos, pos, painter->lastmousepos); - len= Normalise2(dmousepos); + len= Normalize2(dmousepos); painter->accumtime += curtime - painter->lasttime; /* do paint op over unpainted time distance */ @@ -815,7 +815,7 @@ int brush_painter_paint(BrushPainter *painter, BrushFunc func, float *pos, doubl /* setup starting distance, direction vector and accumulated distance */ startdistance= painter->accumdistance; Vec2Subf(dmousepos, pos, painter->lastmousepos); - len= Normalise2(dmousepos); + len= Normalize2(dmousepos); painter->accumdistance += len; /* do paint op over unpainted distance */ diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index e17b6da11ef..404e433d6cd 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1002,9 +1002,9 @@ void CDDM_calc_normals(DerivedMesh *dm) for(i = 0; i < numVerts; i++, mv++) { float *no = temp_nors[i]; - if (Normalise(no) == 0.0) { + if (Normalize(no) == 0.0) { VECCOPY(no, mv->co); - Normalise(no); + Normalize(no); } mv->no[0] = (short)(no[0] * 32767.0); diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 890a292b99a..af104a88fed 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -891,7 +891,7 @@ static void vectomat(float *vec, float *target_up, short axis, short upflag, sho int right_index; VecCopyf(n, vec); - if(Normalise(n) == 0.0) { + if(Normalize(n) == 0.0) { n[0] = 0.0; n[1] = 0.0; n[2] = 1.0; @@ -919,15 +919,15 @@ static void vectomat(float *vec, float *target_up, short axis, short upflag, sho VecSubf(proj, u, proj); /* then onto the plane */ /* proj specifies the transformation of the up axis */ - if(Normalise(proj) == 0.0) { /* degenerate projection */ + if(Normalize(proj) == 0.0) { /* degenerate projection */ proj[0] = 0.0; proj[1] = 1.0; proj[2] = 0.0; } - /* normalised cross product of n and proj specifies transformation of the right axis */ + /* Normalized cross product of n and proj specifies transformation of the right axis */ Crossf(right, proj, n); - Normalise(right); + Normalize(right); if(axis != upflag) { right_index = 3 - axis - upflag; @@ -1220,7 +1220,7 @@ short get_constraint_target_matrix (bConstraint *con, short ownertype, void* own if(data->followflag){ quat= vectoquat(dir, (short) data->trackflag, (short) data->upflag); - Normalise(dir); + Normalize(dir); q[0]= (float)cos(0.5*vec[3]); x1= (float)sin(0.5*vec[3]); q[1]= -x1*dir[0]; @@ -1528,13 +1528,13 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* Projection of Vector on the plane */ Projf(vec2, vec, ob->obmat[0]); VecSubf(totmat[1], vec, vec2); - Normalise(totmat[1]); + Normalize(totmat[1]); /* the x axis is fixed*/ totmat[0][0] = ob->obmat[0][0]; totmat[0][1] = ob->obmat[0][1]; totmat[0][2] = ob->obmat[0][2]; - Normalise(totmat[0]); + Normalize(totmat[0]); /* the z axis gets mapped onto a third orthogonal vector */ @@ -1546,13 +1546,13 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* Projection of Vector on the plane */ Projf(vec2, vec, ob->obmat[0]); VecSubf(totmat[2], vec, vec2); - Normalise(totmat[2]); + Normalize(totmat[2]); /* the x axis is fixed*/ totmat[0][0] = ob->obmat[0][0]; totmat[0][1] = ob->obmat[0][1]; totmat[0][2] = ob->obmat[0][2]; - Normalise(totmat[0]); + Normalize(totmat[0]); /* the z axis gets mapped onto a third orthogonal vector */ @@ -1564,14 +1564,14 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* Projection of Vector on the plane */ Projf(vec2, vec, ob->obmat[0]); VecSubf(totmat[1], vec, vec2); - Normalise(totmat[1]); + Normalize(totmat[1]); VecMulf(totmat[1],-1); /* the x axis is fixed*/ totmat[0][0] = ob->obmat[0][0]; totmat[0][1] = ob->obmat[0][1]; totmat[0][2] = ob->obmat[0][2]; - Normalise(totmat[0]); + Normalize(totmat[0]); /* the z axis gets mapped onto a third orthogonal vector */ @@ -1583,14 +1583,14 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* Projection of Vector on the plane */ Projf(vec2, vec, ob->obmat[0]); VecSubf(totmat[2], vec, vec2); - Normalise(totmat[2]); + Normalize(totmat[2]); VecMulf(totmat[2],-1); /* the x axis is fixed*/ totmat[0][0] = ob->obmat[0][0]; totmat[0][1] = ob->obmat[0][1]; totmat[0][2] = ob->obmat[0][2]; - Normalise(totmat[0]); + Normalize(totmat[0]); /* the z axis gets mapped onto a third orthogonal vector */ @@ -1615,13 +1615,13 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* Projection of Vector on the plane */ Projf(vec2, vec, ob->obmat[1]); VecSubf(totmat[0], vec, vec2); - Normalise(totmat[0]); + Normalize(totmat[0]); /* the y axis is fixed*/ totmat[1][0] = ob->obmat[1][0]; totmat[1][1] = ob->obmat[1][1]; totmat[1][2] = ob->obmat[1][2]; - Normalise(totmat[1]); + Normalize(totmat[1]); /* the z axis gets mapped onto a third orthogonal vector */ @@ -1633,13 +1633,13 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* Projection of Vector on the plane */ Projf(vec2, vec, ob->obmat[1]); VecSubf(totmat[2], vec, vec2); - Normalise(totmat[2]); + Normalize(totmat[2]); /* the y axis is fixed*/ totmat[1][0] = ob->obmat[1][0]; totmat[1][1] = ob->obmat[1][1]; totmat[1][2] = ob->obmat[1][2]; - Normalise(totmat[1]); + Normalize(totmat[1]); /* the z axis gets mapped onto a third orthogonal vector */ @@ -1651,14 +1651,14 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* Projection of Vector on the plane */ Projf(vec2, vec, ob->obmat[1]); VecSubf(totmat[0], vec, vec2); - Normalise(totmat[0]); + Normalize(totmat[0]); VecMulf(totmat[0],-1); /* the y axis is fixed*/ totmat[1][0] = ob->obmat[1][0]; totmat[1][1] = ob->obmat[1][1]; totmat[1][2] = ob->obmat[1][2]; - Normalise(totmat[1]); + Normalize(totmat[1]); /* the z axis gets mapped onto a third orthogonal vector */ @@ -1670,14 +1670,14 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* Projection of Vector on the plane */ Projf(vec2, vec, ob->obmat[1]); VecSubf(totmat[2], vec, vec2); - Normalise(totmat[2]); + Normalize(totmat[2]); VecMulf(totmat[2],-1); /* the y axis is fixed*/ totmat[1][0] = ob->obmat[1][0]; totmat[1][1] = ob->obmat[1][1]; totmat[1][2] = ob->obmat[1][2]; - Normalise(totmat[1]); + Normalize(totmat[1]); /* the z axis gets mapped onto a third orthogonal vector */ @@ -1702,13 +1702,13 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* Projection of Vector on the plane */ Projf(vec2, vec, ob->obmat[2]); VecSubf(totmat[0], vec, vec2); - Normalise(totmat[0]); + Normalize(totmat[0]); /* the z axis is fixed*/ totmat[2][0] = ob->obmat[2][0]; totmat[2][1] = ob->obmat[2][1]; totmat[2][2] = ob->obmat[2][2]; - Normalise(totmat[2]); + Normalize(totmat[2]); /* the x axis gets mapped onto a third orthogonal vector */ @@ -1720,13 +1720,13 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* Projection of Vector on the plane */ Projf(vec2, vec, ob->obmat[2]); VecSubf(totmat[1], vec, vec2); - Normalise(totmat[1]); + Normalize(totmat[1]); /* the z axis is fixed*/ totmat[2][0] = ob->obmat[2][0]; totmat[2][1] = ob->obmat[2][1]; totmat[2][2] = ob->obmat[2][2]; - Normalise(totmat[2]); + Normalize(totmat[2]); /* the x axis gets mapped onto a third orthogonal vector */ @@ -1738,14 +1738,14 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* Projection of Vector on the plane */ Projf(vec2, vec, ob->obmat[2]); VecSubf(totmat[0], vec, vec2); - Normalise(totmat[0]); + Normalize(totmat[0]); VecMulf(totmat[0],-1); /* the z axis is fixed*/ totmat[2][0] = ob->obmat[2][0]; totmat[2][1] = ob->obmat[2][1]; totmat[2][2] = ob->obmat[2][2]; - Normalise(totmat[2]); + Normalize(totmat[2]); /* the x axis gets mapped onto a third orthogonal vector */ @@ -1757,14 +1757,14 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* Projection of Vector on the plane */ Projf(vec2, vec, ob->obmat[2]); VecSubf(totmat[1], vec, vec2); - Normalise(totmat[1]); + Normalize(totmat[1]); VecMulf(totmat[1],-1); /* the z axis is fixed*/ totmat[2][0] = ob->obmat[2][0]; totmat[2][1] = ob->obmat[2][1]; totmat[2][2] = ob->obmat[2][2]; - Normalise(totmat[2]); + Normalize(totmat[2]); /* the x axis gets mapped onto a third orthogonal vector */ @@ -1793,9 +1793,9 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, tmpmat[0][0] = ob->obmat[0][0];tmpmat[0][1] = ob->obmat[0][1];tmpmat[0][2] = ob->obmat[0][2]; tmpmat[1][0] = ob->obmat[1][0];tmpmat[1][1] = ob->obmat[1][1];tmpmat[1][2] = ob->obmat[1][2]; tmpmat[2][0] = ob->obmat[2][0];tmpmat[2][1] = ob->obmat[2][1];tmpmat[2][2] = ob->obmat[2][2]; - Normalise(tmpmat[0]); - Normalise(tmpmat[1]); - Normalise(tmpmat[2]); + Normalize(tmpmat[0]); + Normalize(tmpmat[1]); + Normalize(tmpmat[2]); Mat3Inv(invmat,tmpmat); Mat3MulMat3(tmpmat,totmat,invmat); totmat[0][0] = tmpmat[0][0];totmat[0][1] = tmpmat[0][1];totmat[0][2] = tmpmat[0][2]; @@ -1865,20 +1865,20 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, xx[0] = ob->obmat[0][0]; xx[1] = ob->obmat[0][1]; xx[2] = ob->obmat[0][2]; - Normalise(xx); + Normalize(xx); /* store Z orientation before destroying obmat */ zz[0] = ob->obmat[2][0]; zz[1] = ob->obmat[2][1]; zz[2] = ob->obmat[2][2]; - Normalise(zz); + Normalize(zz); VecSubf(vec, ob->obmat[3], targetmat[3]); vec[0] /= size[0]; vec[1] /= size[1]; vec[2] /= size[2]; - dist = Normalise(vec); + dist = Normalize(vec); //dist = VecLenf( ob->obmat[3], targetmat[3]); if (data->orglength == 0) data->orglength = dist; @@ -1920,7 +1920,7 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, ob->obmat[2][2]=size[2]*scale[2]; VecSubf(vec, ob->obmat[3], targetmat[3]); - Normalise(vec); + Normalize(vec); /* new Y aligns object target connection*/ totmat[1][0] = -vec[0]; totmat[1][1] = -vec[1]; @@ -1930,7 +1930,7 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* build new Z vector */ /* othogonal to "new Y" "old X! plane */ Crossf(orth, vec, xx); - Normalise(orth); + Normalize(orth); /* new Z*/ totmat[2][0] = orth[0]; @@ -1939,7 +1939,7 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* we decided to keep X plane*/ Crossf(xx,orth, vec); - Normalise(xx); + Normalize(xx); totmat[0][0] = xx[0]; totmat[0][1] = xx[1]; totmat[0][2] = xx[2]; @@ -1948,7 +1948,7 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* build new X vector */ /* othogonal to "new Y" "old Z! plane */ Crossf(orth, vec, zz); - Normalise(orth); + Normalize(orth); /* new X*/ totmat[0][0] = -orth[0]; @@ -1957,7 +1957,7 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, /* we decided to keep Z */ Crossf(zz,orth, vec); - Normalise(zz); + Normalize(zz); totmat[2][0] = zz[0]; totmat[2][1] = zz[1]; totmat[2][2] = zz[2]; diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index e2a8e2ec00e..142bedadc93 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1778,7 +1778,7 @@ void makeBevelList(Object *ob) quat= vectoquat(vec, 5, 1); - Normalise(vec); + Normalize(vec); q[0]= (float)cos(0.5*bevp1->alfa); x1= (float)sin(0.5*bevp1->alfa); q[1]= x1*vec[0]; @@ -1808,7 +1808,7 @@ void makeBevelList(Object *ob) vec[1]= bevp2->y - bevp0->y; vec[2]= bevp2->z - bevp0->z; - Normalise(vec); + Normalize(vec); quat= vectoquat(vec, 5, 1); @@ -2107,8 +2107,8 @@ void calchandleNurb(BezTriple *bezt, BezTriple *prev, BezTriple *next, int mode) VecSubf(h1, p2-3, p2); VecSubf(h2, p2, p2+3); - len1= Normalise(h1); - len2= Normalise(h2); + len1= Normalize(h1); + len2= Normalize(h2); vz= INPR(h1, h2); diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 99c48f338c1..479a2e657ed 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -240,7 +240,7 @@ void addnormalsDispList(Object *ob, ListBase *lb) a= dl->parts*dl->nr; v1= ndata; while(a--) { - Normalise(v1); + Normalize(v1); v1+= 3; } } @@ -525,7 +525,7 @@ static void mesh_create_shadedColors(Render *re, Object *ob, int onlyForMesh, un vn[0]= imat[0][0]*xn+imat[0][1]*yn+imat[0][2]*zn; vn[1]= imat[1][0]*xn+imat[1][1]*yn+imat[1][2]*zn; vn[2]= imat[2][0]*xn+imat[2][1]*yn+imat[2][2]*zn; - Normalise(vn); + Normalize(vn); } for (i=0; inors[0]+imat[0][1]*dl->nors[1]+imat[0][2]*dl->nors[2]; n1[1]= imat[1][0]*dl->nors[0]+imat[1][1]*dl->nors[1]+imat[1][2]*dl->nors[2]; n1[2]= imat[2][0]*dl->nors[0]+imat[2][1]*dl->nors[1]+imat[2][2]*dl->nors[2]; - Normalise(n1); + Normalize(n1); fp= dl->verts; @@ -694,7 +694,7 @@ void shadeDispList(Base *base) n1[0]= imat[0][0]*nor[0]+imat[0][1]*nor[1]+imat[0][2]*nor[2]; n1[1]= imat[1][0]*nor[0]+imat[1][1]*nor[1]+imat[1][2]*nor[2]; n1[2]= imat[2][0]*nor[0]+imat[2][1]*nor[1]+imat[2][2]*nor[2]; - Normalise(n1); + Normalize(n1); fastshade(vec, n1, fp, ma, (char *)col1, NULL); @@ -732,7 +732,7 @@ void shadeDispList(Base *base) n1[0]= imat[0][0]*nor[0]+imat[0][1]*nor[1]+imat[0][2]*nor[2]; n1[1]= imat[1][0]*nor[0]+imat[1][1]*nor[1]+imat[1][2]*nor[2]; n1[2]= imat[2][0]*nor[0]+imat[2][1]*nor[1]+imat[2][2]*nor[2]; - Normalise(n1); + Normalize(n1); fastshade(vec, n1, fp, ma, (char *)col1, NULL); diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 0f5b1df0e16..00b2eb9fbd9 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -571,7 +571,7 @@ void pdDoEffectors(ListBase *lb, float *opco, float *force, float *speed, float distance = VecLength(vect_to_vert); Crossf(force_vec, ob->obmat[2], vect_to_vert); - Normalise(force_vec); + Normalize(force_vec); /* Limit minimum distance to vertex so that */ /* the force is not too big */ @@ -867,7 +867,7 @@ static int pdDoDeflection(RNG *rng, float opco[3], float npco[3], float opno[3], VECSUB(edge1, dv1, dv2); VECSUB(edge2, dv3, dv2); Crossf(d_nvect, edge2, edge1); - n_mag = Normalise(d_nvect); + n_mag = Normalize(d_nvect); dk_plane = INPR(d_nvect, nv1); dk_point1 = INPR(d_nvect,opco); @@ -880,11 +880,11 @@ static int pdDoDeflection(RNG *rng, float opco[3], float npco[3], float opno[3], d_i_co_above[0] = (d_intersect_co[0] + (0.001f * d_nvect[0])); d_i_co_above[1] = (d_intersect_co[1] + (0.001f * d_nvect[1])); d_i_co_above[2] = (d_intersect_co[2] + (0.001f * d_nvect[2])); - mag_iv = Normalise(d_intersect_vect); + mag_iv = Normalize(d_intersect_vect); VECCOPY(npco, d_intersect_co); VECSUB(vect_to_int, opco, d_intersect_co); - first_dist = Normalise(vect_to_int); + first_dist = Normalize(vect_to_int); /* Work out the lengths of time before and after collision*/ time_before = (life*(first_dist / (mag_iv))); @@ -2045,7 +2045,7 @@ void build_particle_system(Object *ob) VECCOPY(vec, no); Mat3MulVecfl(mcnow->imat, vec); - Normalise(vec); + Normalize(vec); VecMulf(vec, paf->normfac); VECADD(pa->no, pa->no, vec); } @@ -2053,7 +2053,7 @@ void build_particle_system(Object *ob) else { if(paf->normfac!=0.0) { VECCOPY(pa->no, no); - Normalise(pa->no); + Normalize(pa->no); VecMulf(pa->no, paf->normfac); } } diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c index e8f79b94e95..9d5e76e9ce7 100644 --- a/source/blender/blenkernel/intern/exotic.c +++ b/source/blender/blenkernel/intern/exotic.c @@ -2250,7 +2250,7 @@ static void displist_to_objects(ListBase *lbase) /* irst this: is still active */ if(ivsurf) { where_is_object(ivsurf); - docentre_new(); + docenter_new(); } dl= lbase->first; @@ -3944,7 +3944,7 @@ static void dxf_read_ellipse(int noob) x = a * sin(phi); y = b * cos(phi); -#ifndef DEBUG_CENTRE +#ifndef DEBUG_CENTER epoint[0] = center[0] + x*cos(theta) - y*sin(theta); epoint[1] = center[1] + x*sin(theta) + y*cos(theta); epoint[2] = center[2]; diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 696cf6a4587..fc11b3d234d 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -943,7 +943,7 @@ struct chartrans *text_to_curve(Object *ob, int mode) Mat3CpyMat4(cmat, cu->textoncurve->obmat); Mat3MulMat3(cmat, cmat, imat3); - sizefac= Normalise(cmat[0])/cu->fsize; + sizefac= Normalize(cmat[0])/cu->fsize; minx=miny= 1.0e20f; maxx=maxy= -1.0e20f; @@ -983,7 +983,7 @@ struct chartrans *text_to_curve(Object *ob, int mode) ct= chartransdata; for (i=0; i<=slen; i++, ct++) { - /* rotate around centre character */ + /* rotate around center character */ ascii = mem[i]; // Find the character diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 822f99c0d9b..8666e77078c 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -405,7 +405,7 @@ static ImBuf *add_ibuf_size(int width, int height, char *name, short uvtestgrid) } } - /* 2nd pass, coloured + */ + /* 2nd pass, colored + */ rect= (unsigned char*)ibuf->rect; for(y=0; yy; y++) { diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 23a025aaf2b..64c081c27a6 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -585,7 +585,7 @@ static float *calc_curve_deform(Object *par, float *co, short axis, CurveDeform /* the tilt */ if(loc[3]!=0.0) { - Normalise(dir); + Normalize(dir); q[0]= (float)cos(0.5*loc[3]); fac= (float)sin(0.5*loc[3]); q[1]= -fac*dir[0]; diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index aca86e60d8d..89ef5126768 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1072,9 +1072,9 @@ void mesh_calc_normals(MVert *mverts, int numVerts, MFace *mfaces, int numFaces, MVert *mv= &mverts[i]; float *no= tnorms[i]; - if (Normalise(no)==0.0) { + if (Normalize(no)==0.0) { VECCOPY(no, mv->co); - Normalise(no); + Normalize(no); } mv->no[0]= (short)(no[0]*32767.0); diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 4d747e3c942..b360dbac189 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1268,7 +1268,7 @@ static void ob_parcurve(Object *ob, Object *par, float mat[][4]) quat= vectoquat(dir, ob->trackflag, ob->upflag); /* the tilt */ - Normalise(dir); + Normalize(dir); q[0]= (float)cos(0.5*vec[3]); x1= (float)sin(0.5*vec[3]); q[1]= -x1*dir[0]; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index b9900f33acd..16a29fb8e80 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -1201,7 +1201,7 @@ int sb_detect_face_collisionCached(float face_v1[3],float face_v2[3],float face_ VECSUB(edge1, nv1, nv2); VECSUB(edge2, nv3, nv2); Crossf(d_nvect, edge2, edge1); - Normalise(d_nvect); + Normalize(d_nvect); if ( LineIntersectsTriangle(nv1, nv2, face_v1, face_v2, face_v3, &t) || LineIntersectsTriangle(nv2, nv3, face_v1, face_v2, face_v3, &t) || @@ -1215,7 +1215,7 @@ int sb_detect_face_collisionCached(float face_v1[3],float face_v2[3],float face_ VECSUB(edge1, nv3, nv4); VECSUB(edge2, nv1, nv4); Crossf(d_nvect, edge2, edge1); - Normalise(d_nvect); + Normalize(d_nvect); if ( LineIntersectsTriangle(nv1, nv3, face_v1, face_v2, face_v3, &t) || LineIntersectsTriangle(nv3, nv4, face_v1, face_v2, face_v3, &t) || @@ -1401,7 +1401,7 @@ int sb_detect_edge_collisionCached(float edge_v1[3],float edge_v2[3],float *damp VECSUB(edge2, nv3, nv2); Crossf(d_nvect, edge2, edge1); - Normalise(d_nvect); + Normalize(d_nvect); if ( LineIntersectsTriangle(edge_v1, edge_v2, nv1, nv2, nv3, &t)){ float v1[3],v2[3]; float intrusiondepth,i1,i2; @@ -1420,7 +1420,7 @@ int sb_detect_edge_collisionCached(float edge_v1[3],float edge_v2[3],float *damp VECSUB(edge2, nv1, nv4); Crossf(d_nvect, edge2, edge1); - Normalise(d_nvect); + Normalize(d_nvect); if (LineIntersectsTriangle( edge_v1, edge_v2,nv1, nv3, nv4, &t)){ float v1[3],v2[3]; float intrusiondepth,i1,i2; @@ -1496,7 +1496,7 @@ void scan_for_ext_spring_forces(Object *ob,float timenow) else{ VECADD(vel, sb->bpoint[bs->v1].vec , sb->bpoint[bs->v2].vec); } - f = Normalise(vel); + f = Normalize(vel); f = -0.0001f*f*f*sb->aeroedge; /* todo add a nice angle dependant function */ /* look up one at bergman scheafer */ @@ -1504,7 +1504,7 @@ void scan_for_ext_spring_forces(Object *ob,float timenow) VECSUB(sp, sb->bpoint[bs->v1].pos , sb->bpoint[bs->v2].pos); Projf(pr,vel,sp); VECSUB(vel,vel,pr); - Normalise(vel); + Normalize(vel); Vec3PlusStVec(bs->ext_force,f,vel); } /* --- springs seeing wind */ @@ -1673,7 +1673,7 @@ int sb_detect_vertex_collisionCached(float opco[3], float facenormal[3], float * VECSUB(dv1,opco,nv2); /* abuse dv1 to have vertex in question at *origin* of triangle */ Crossf(d_nvect, edge2, edge1); - n_mag = Normalise(d_nvect); + n_mag = Normalize(d_nvect); facedist = Inpf(dv1,d_nvect); if ((facedist > innerfacethickness) && (facedist < outerfacethickness)){ @@ -1703,7 +1703,7 @@ int sb_detect_vertex_collisionCached(float opco[3], float facenormal[3], float * VECSUB(dv1,opco,nv4); /* abuse dv1 to have vertex in question at *origin* of triangle */ Crossf(d_nvect, edge2, edge1); - n_mag = Normalise(d_nvect); + n_mag = Normalize(d_nvect); facedist = Inpf(dv1,d_nvect); if ((facedist > innerfacethickness) && (facedist < outerfacethickness)){ @@ -1741,7 +1741,7 @@ int sb_detect_vertex_collisionCached(float opco[3], float facenormal[3], float * if (ci) *intrusion /= ci; if (deflected){ VECCOPY(facenormal,force); - Normalise(facenormal); + Normalize(facenormal); } return deflected; } @@ -1882,7 +1882,7 @@ int sb_detect_vertex_collisionCachedEx(float opco[3], float facenormal[3], float VECSUB(dv1,opco,nv2); /* abuse dv1 to have vertex in question at *origin* of triangle */ Crossf(d_nvect, edge2, edge1); - n_mag = Normalise(d_nvect); + n_mag = Normalize(d_nvect); facedist = Inpf(dv1,d_nvect); if ((facedist > closestinside) && (facedist < outerfacethickness)){ @@ -1926,7 +1926,7 @@ int sb_detect_vertex_collisionCachedEx(float opco[3], float facenormal[3], float VECSUB(dv1,opco,nv4); /* abuse dv1 to have vertex in question at *origin* of triangle */ Crossf(d_nvect, edge2, edge1); - n_mag = Normalise(d_nvect); + n_mag = Normalize(d_nvect); facedist = Inpf(dv1,d_nvect); if ((facedist > innerfacethickness) && (facedist < outerfacethickness)){ @@ -1983,7 +1983,7 @@ int sb_detect_vertex_collisionCachedEx(float opco[3], float facenormal[3], float */ if (deflected ==1){ VECCOPY(facenormal,force); - Normalise(facenormal); + Normalize(facenormal); } else{ facenormal[0] = facenormal[1] = facenormal[2] = 0.0f; @@ -2075,7 +2075,7 @@ static void softbody_calc_forces(Object *ob, float forcetime, float timenow) /* mathematically it is completly nuts, but performace is pretty much (3) times faster */ if ((ABS(def[0]) > compare) || (ABS(def[1]) > compare) || (ABS(def[2]) > compare)) continue; - distance = Normalise(def); + distance = Normalize(def); if (distance < compare ){ /* exclude body points attached with a spring */ attached = 0; @@ -2219,12 +2219,12 @@ static void softbody_calc_forces(Object *ob, float forcetime, float timenow) if (( (sb->totpoint-a) == bs->v1) ){ actspringlen= VecLenf( (bproot+bs->v2)->pos, bp->pos); VecSubf(sd,(bproot+bs->v2)->pos, bp->pos); - Normalise(sd); + Normalize(sd); /* friction stuff V1 */ VecSubf(velgoal,bp->vec,(bproot+bs->v2)->vec); kd = sb->infrict * sb_fric_force_scale(ob); - absvel = Normalise(velgoal); + absvel = Normalize(velgoal); projvel = ABS(Inpf(sd,velgoal)); kd *= absvel * projvel; Vec3PlusStVec(bp->force,-kd,velgoal); @@ -2242,12 +2242,12 @@ static void softbody_calc_forces(Object *ob, float forcetime, float timenow) if (( (sb->totpoint-a) == bs->v2) ){ actspringlen= VecLenf( (bproot+bs->v1)->pos, bp->pos); VecSubf(sd,bp->pos,(bproot+bs->v1)->pos); - Normalise(sd); + Normalize(sd); /* friction stuff V2 */ VecSubf(velgoal,bp->vec,(bproot+bs->v1)->vec); kd = sb->infrict * sb_fric_force_scale(ob); - absvel = Normalise(velgoal); + absvel = Normalize(velgoal); projvel = ABS(Inpf(sd,velgoal)); kd *= absvel * projvel; Vec3PlusStVec(bp->force,-kd,velgoal); diff --git a/source/blender/blenkernel/intern/verse_geometry_node.c b/source/blender/blenkernel/intern/verse_geometry_node.c index 8fe34bb47a0..9af22bfd37d 100644 --- a/source/blender/blenkernel/intern/verse_geometry_node.c +++ b/source/blender/blenkernel/intern/verse_geometry_node.c @@ -118,10 +118,10 @@ static void recalculate_verseface_normals(VNode *vnode) vface = vface->next; } - /* we have to normalise all vertex normals */ + /* we have to normalize all vertex normals */ vvert = vert_layer->dl.lb.first; while(vvert) { - Normalise(vvert->no); + Normalize(vvert->no); vvert = vvert->next; } } -- cgit v1.2.3