Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2007-04-04 17:18:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2007-04-04 17:18:41 +0400
commitafdd54fa3720c267f30e48ed45c449d80449bac0 (patch)
tree3192044fa53f6e1fd3d1b0256963c2d4c090d700 /source/gameengine
parent203e6ed82b444786d7999e88cebef84d6d429765 (diff)
moved source and text to american spelling
* colour -> color * centre -> center * normalise -> normalize * modelling -> modeling
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.cpp90
-rw-r--r--source/gameengine/Ketsji/KX_Camera.cpp54
-rw-r--r--source/gameengine/Ketsji/KX_Camera.h18
-rw-r--r--source/gameengine/Ketsji/KX_CameraActuator.cpp8
-rw-r--r--source/gameengine/Ketsji/KX_Light.cpp10
-rw-r--r--source/gameengine/Ketsji/KX_MouseFocusSensor.cpp6
-rw-r--r--source/gameengine/Ketsji/KX_Scene.cpp4
-rw-r--r--source/gameengine/Ketsji/KX_VertexProxy.cpp6
-rw-r--r--source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h2
-rw-r--r--source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp2
-rw-r--r--source/gameengine/Rasterizer/RAS_IRasterizer.h8
-rw-r--r--source/gameengine/SceneGraph/SG_BBox.cpp6
-rw-r--r--source/gameengine/SceneGraph/SG_Tree.cpp8
-rw-r--r--source/gameengine/SceneGraph/SG_Tree.h4
14 files changed, 113 insertions, 113 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index a271ae14539..1e223d203b9 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -190,15 +190,15 @@ static unsigned int KX_rgbaint2uint_new(unsigned int icol)
{
unsigned int integer;
unsigned char cp[4];
- } out_colour, in_colour;
+ } color, in_color;
- in_colour.integer = icol;
- out_colour.cp[0] = in_colour.cp[3]; // red
- out_colour.cp[1] = in_colour.cp[2]; // green
- out_colour.cp[2] = in_colour.cp[1]; // blue
- out_colour.cp[3] = in_colour.cp[0]; // alpha
+ in_color.integer = icol;
+ out_color.cp[0] = in_color.cp[3]; // red
+ out_color.cp[1] = in_color.cp[2]; // green
+ out_color.cp[2] = in_color.cp[1]; // blue
+ out_color.cp[3] = in_color.cp[0]; // alpha
- return out_colour.integer;
+ return out_color.integer;
}
/* Now the real converting starts... */
@@ -210,15 +210,15 @@ static unsigned int KX_Mcol2uint_new(MCol col)
MCol col;
unsigned int integer;
unsigned char cp[4];
- } out_colour, in_colour;
+ } out_color, in_color;
- in_colour.col = col;
- out_colour.cp[0] = in_colour.cp[3]; // red
- out_colour.cp[1] = in_colour.cp[2]; // green
- out_colour.cp[2] = in_colour.cp[1]; // blue
- out_colour.cp[3] = in_colour.cp[0]; // alpha
+ in_color.col = col;
+ out_color.cp[0] = in_color.cp[3]; // red
+ out_color.cp[1] = in_color.cp[2]; // green
+ out_color.cp[2] = in_color.cp[1]; // blue
+ out_color.cp[3] = in_color.cp[0]; // alpha
- return out_colour.integer;
+ return out_color.integer;
}
static void SetDefaultFaceType(Scene* scene)
@@ -247,7 +247,7 @@ static void GetRGB(short type,
unsigned int &c2,
unsigned int &c3)
{
- unsigned int colour = 0xFFFFFFFFL;
+ unsigned int color = 0xFFFFFFFFL;
switch(type)
{
case 0: // vertex colors
@@ -260,11 +260,11 @@ static void GetRGB(short type,
c3 = KX_Mcol2uint_new(mmcol[3]);
}else // backup white
{
- c0 = KX_rgbaint2uint_new(colour);
- c1 = KX_rgbaint2uint_new(colour);
- c2 = KX_rgbaint2uint_new(colour);
+ c0 = KX_rgbaint2uint_new(color);
+ c1 = KX_rgbaint2uint_new(color);
+ c2 = KX_rgbaint2uint_new(color);
if (mface->v4)
- c3 = KX_rgbaint2uint_new( colour );
+ c3 = KX_rgbaint2uint_new( color );
}
} break;
@@ -280,22 +280,22 @@ static void GetRGB(short type,
col_converter.cp[2] = (unsigned char) (mat->g*255.0);
col_converter.cp[1] = (unsigned char) (mat->b*255.0);
col_converter.cp[0] = (unsigned char) (mat->alpha*255.0);
- colour = col_converter.integer;
+ color = col_converter.integer;
}
- c0 = KX_rgbaint2uint_new(colour);
- c1 = KX_rgbaint2uint_new(colour);
- c2 = KX_rgbaint2uint_new(colour);
+ c0 = KX_rgbaint2uint_new(color);
+ c1 = KX_rgbaint2uint_new(color);
+ c2 = KX_rgbaint2uint_new(color);
if (mface->v4)
- c3 = KX_rgbaint2uint_new(colour);
+ c3 = KX_rgbaint2uint_new(color);
} break;
default: // white
{
- c0 = KX_rgbaint2uint_new(colour);
- c1 = KX_rgbaint2uint_new(colour);
- c2 = KX_rgbaint2uint_new(colour);
+ c0 = KX_rgbaint2uint_new(color);
+ c1 = KX_rgbaint2uint_new(color);
+ c2 = KX_rgbaint2uint_new(color);
if (mface->v4)
- c3 = KX_rgbaint2uint_new(colour);
+ c3 = KX_rgbaint2uint_new(color);
} break;
}
}
@@ -974,7 +974,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
if (mmcol)
{
- // Use vertex colours
+ // Use vertex colors
rgb0 = KX_Mcol2uint_new(mmcol[0]);
rgb1 = KX_Mcol2uint_new(mmcol[1]);
rgb2 = KX_Mcol2uint_new(mmcol[2]);
@@ -985,7 +985,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
else {
// no vertex colors: take from material if we have one,
// otherwise set to white
- unsigned int colour = 0xFFFFFFFFL;
+ unsigned int color = 0xFFFFFFFFL;
if (ma)
{
@@ -1000,15 +1000,15 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
col_converter.cp[1] = (unsigned char) (ma->b*255.0);
col_converter.cp[0] = (unsigned char) (ma->alpha*255.0);
- colour = col_converter.integer;
+ color = col_converter.integer;
}
- rgb0 = KX_rgbaint2uint_new(colour);
- rgb1 = KX_rgbaint2uint_new(colour);
- rgb2 = KX_rgbaint2uint_new(colour);
+ rgb0 = KX_rgbaint2uint_new(color);
+ rgb1 = KX_rgbaint2uint_new(color);
+ rgb2 = KX_rgbaint2uint_new(color);
if (mface->v4)
- rgb3 = KX_rgbaint2uint_new(colour);
+ rgb3 = KX_rgbaint2uint_new(color);
}
bool istriangle = (mface->v4==0);
@@ -1304,7 +1304,7 @@ static void my_tex_space_mesh(Mesh *me)
}
-static void my_get_local_bounds(Object *ob, float *centre, float *size)
+static void my_get_local_bounds(Object *ob, float *center, float *size)
{
BoundBox *bb= NULL;
/* uses boundbox, function used by Ketsji */
@@ -1321,7 +1321,7 @@ static void my_get_local_bounds(Object *ob, float *centre, float *size)
case OB_CURVE:
case OB_SURF:
case OB_FONT:
- centre[0]= centre[1]= centre[2]= 0.0;
+ center[0]= center[1]= center[2]= 0.0;
size[0] = size[1]=size[2]=0.0;
break;
case OB_MBALL:
@@ -1331,7 +1331,7 @@ static void my_get_local_bounds(Object *ob, float *centre, float *size)
if(bb==NULL)
{
- centre[0]= centre[1]= centre[2]= 0.0;
+ center[0]= center[1]= center[2]= 0.0;
size[0] = size[1]=size[2]=1.0;
}
else
@@ -1340,9 +1340,9 @@ static void my_get_local_bounds(Object *ob, float *centre, float *size)
size[1]= 0.5*fabs(bb->vec[0][1] - bb->vec[2][1]);
size[2]= 0.5*fabs(bb->vec[0][2] - bb->vec[1][2]);
- centre[0]= 0.5*(bb->vec[0][0] + bb->vec[4][0]);
- centre[1]= 0.5*(bb->vec[0][1] + bb->vec[2][1]);
- centre[2]= 0.5*(bb->vec[0][2] + bb->vec[1][2]);
+ center[0]= 0.5*(bb->vec[0][0] + bb->vec[4][0]);
+ center[1]= 0.5*(bb->vec[0][1] + bb->vec[2][1]);
+ center[2]= 0.5*(bb->vec[0][2] + bb->vec[1][2]);
}
}
@@ -1609,8 +1609,8 @@ static KX_GameObject *gameobject_from_blenderobject(
{
Mesh* mesh = static_cast<Mesh*>(ob->data);
RAS_MeshObject* meshobj = converter->FindGameMesh(mesh, ob->lay);
- float centre[3], extents[3];
- float radius = my_boundbox_mesh((Mesh*) ob->data, centre, extents);
+ float center[3], extents[3];
+ float radius = my_boundbox_mesh((Mesh*) ob->data, center, extents);
if (!meshobj) {
meshobj = BL_ConvertMesh(mesh,ob,rendertools,kxscene,converter);
@@ -1641,8 +1641,8 @@ static KX_GameObject *gameobject_from_blenderobject(
((BL_DeformableGameObject*)gameobj)->m_pDeformer = dcont;
}
- MT_Point3 min = MT_Point3(centre) - MT_Vector3(extents);
- MT_Point3 max = MT_Point3(centre) + MT_Vector3(extents);
+ MT_Point3 min = MT_Point3(center) - MT_Vector3(extents);
+ MT_Point3 max = MT_Point3(center) + MT_Vector3(extents);
SG_BBox bbox = SG_BBox(min, max);
gameobj->GetSGNode()->SetBBox(bbox);
gameobj->GetSGNode()->SetRadius(radius);
diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp
index 674528f719c..011443054a7 100644
--- a/source/gameengine/Ketsji/KX_Camera.cpp
+++ b/source/gameengine/Ketsji/KX_Camera.cpp
@@ -48,10 +48,10 @@ KX_Camera::KX_Camera(void* sgReplicationInfo,
KX_GameObject(sgReplicationInfo,callbacks,T),
m_camdata(camdata),
m_dirty(true),
- m_normalised(false),
+ m_normalized(false),
m_frustum_culling(frustum_culling && camdata.m_perspective),
m_set_projection_matrix(false),
- m_set_frustum_centre(false)
+ m_set_frustum_center(false)
{
// setting a name would be nice...
m_name = "cam";
@@ -120,7 +120,7 @@ void KX_Camera::SetProjectionMatrix(const MT_Matrix4x4 & mat)
m_projection_matrix = mat;
m_dirty = true;
m_set_projection_matrix = true;
- m_set_frustum_centre = false;
+ m_set_frustum_center = false;
}
@@ -132,7 +132,7 @@ void KX_Camera::SetModelviewMatrix(const MT_Matrix4x4 & mat)
{
m_modelview_matrix = mat;
m_dirty = true;
- m_set_frustum_centre = false;
+ m_set_frustum_center = false;
}
@@ -216,12 +216,12 @@ void KX_Camera::ExtractClipPlanes()
m_planes[5] = m[3] - m[2];
m_dirty = false;
- m_normalised = false;
+ m_normalized = false;
}
-void KX_Camera::NormaliseClipPlanes()
+void KX_Camera::NormalizeClipPlanes()
{
- if (m_normalised)
+ if (m_normalized)
return;
for (unsigned int p = 0; p < 6; p++)
@@ -231,15 +231,15 @@ void KX_Camera::NormaliseClipPlanes()
m_planes[p] /= factor;
}
- m_normalised = true;
+ m_normalized = true;
}
void KX_Camera::ExtractFrustumSphere()
{
- if (m_set_frustum_centre)
+ if (m_set_frustum_center)
return;
- // The most extreme points on the near and far plane. (normalised device coords)
+ // The most extreme points on the near and far plane. (normalized device coords)
MT_Vector4 hnear(1., 1., 0., 1.), hfar(1., 1., 1., 1.);
MT_Matrix4x4 clip_camcs_matrix = m_projection_matrix;
clip_camcs_matrix.invert();
@@ -252,16 +252,16 @@ void KX_Camera::ExtractFrustumSphere()
MT_Point3 nearpoint(hnear[0]/hnear[3], hnear[1]/hnear[3], hnear[2]/hnear[3]);
MT_Point3 farpoint(hfar[0]/hfar[3], hfar[1]/hfar[3], hfar[2]/hfar[3]);
- // Compute centre
- m_frustum_centre = MT_Point3(0., 0.,
+ // Compute center
+ m_frustum_center = MT_Point3(0., 0.,
(nearpoint.dot(nearpoint) - farpoint.dot(farpoint))/(2.0*(m_camdata.m_clipend - m_camdata.m_clipstart)));
- m_frustum_radius = m_frustum_centre.distance(farpoint);
+ m_frustum_radius = m_frustum_center.distance(farpoint);
// Transform to world space.
- m_frustum_centre = GetCameraToWorld()(m_frustum_centre);
+ m_frustum_center = GetCameraToWorld()(m_frustum_center);
m_frustum_radius /= fabs(NodeGetWorldScaling()[NodeGetWorldScaling().closestAxis()]);
- m_set_frustum_centre = true;
+ m_set_frustum_center = true;
}
bool KX_Camera::PointInsideFrustum(const MT_Point3& x)
@@ -308,15 +308,15 @@ int KX_Camera::BoxInsideFrustum(const MT_Point3 *box)
return INTERSECT;
}
-int KX_Camera::SphereInsideFrustum(const MT_Point3& centre, const MT_Scalar &radius)
+int KX_Camera::SphereInsideFrustum(const MT_Point3& center, const MT_Scalar &radius)
{
ExtractFrustumSphere();
- if (centre.distance2(m_frustum_centre) > (radius + m_frustum_radius)*(radius + m_frustum_radius))
+ if (center.distance2(m_frustum_center) > (radius + m_frustum_radius)*(radius + m_frustum_radius))
return OUTSIDE;
unsigned int p;
ExtractClipPlanes();
- NormaliseClipPlanes();
+ NormalizeClipPlanes();
MT_Scalar distance;
int intersect = INSIDE;
@@ -324,7 +324,7 @@ int KX_Camera::SphereInsideFrustum(const MT_Point3& centre, const MT_Scalar &rad
// -radius radius
for (p = 0; p < 6; p++)
{
- distance = m_planes[p][0]*centre[0] + m_planes[p][1]*centre[1] + m_planes[p][2]*centre[2] + m_planes[p][3];
+ distance = m_planes[p][0]*center[0] + m_planes[p][1]*center[1] + m_planes[p][2]*center[2] + m_planes[p][3];
if (fabs(distance) <= radius)
intersect = INTERSECT;
else if (distance < -radius)
@@ -537,10 +537,10 @@ int KX_Camera::_setattr(const STR_String &attr, PyObject *pyvalue)
}
KX_PYMETHODDEF_DOC(KX_Camera, sphereInsideFrustum,
-"sphereInsideFrustum(centre, radius) -> Integer\n"
+"sphereInsideFrustum(center, radius) -> Integer\n"
"\treturns INSIDE, OUTSIDE or INTERSECT if the given sphere is\n"
"\tinside/outside/intersects this camera's viewing frustum.\n\n"
-"\tcentre = the centre of the sphere (in world coordinates.)\n"
+"\tcenter = the center of the sphere (in world coordinates.)\n"
"\tradius = the radius of the sphere\n\n"
"\tExample:\n"
"\timport GameLogic\n\n"
@@ -554,18 +554,18 @@ KX_PYMETHODDEF_DOC(KX_Camera, sphereInsideFrustum,
"\t\t# Sphere is outside frustum\n"
)
{
- PyObject *pycentre;
+ PyObject *pycenter;
float radius;
- if (PyArg_ParseTuple(args, "Of", &pycentre, &radius))
+ if (PyArg_ParseTuple(args, "Of", &pycenter, &radius))
{
- MT_Point3 centre;
- if (PyVecTo(pycentre, centre))
+ MT_Point3 center;
+ if (PyVecTo(pycenter, center))
{
- return PyInt_FromLong(SphereInsideFrustum(centre, radius)); /* new ref */
+ return PyInt_FromLong(SphereInsideFrustum(center, radius)); /* new ref */
}
}
- PyErr_SetString(PyExc_TypeError, "sphereInsideFrustum: Expected arguments: (centre, radius)");
+ PyErr_SetString(PyExc_TypeError, "sphereInsideFrustum: Expected arguments: (center, radius)");
Py_Return;
}
diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h
index ed926f12123..60f0b107940 100644
--- a/source/gameengine/Ketsji/KX_Camera.h
+++ b/source/gameengine/Ketsji/KX_Camera.h
@@ -83,9 +83,9 @@ protected:
*/
bool m_dirty;
/**
- * true if the frustum planes have been normalised.
+ * true if the frustum planes have been normalized.
*/
- bool m_normalised;
+ bool m_normalized;
/**
* View Frustum clip planes.
@@ -104,11 +104,11 @@ protected:
bool m_set_projection_matrix;
/**
- * The centre point of the frustum.
+ * The center point of the frustum.
*/
- MT_Point3 m_frustum_centre;
+ MT_Point3 m_frustum_center;
MT_Scalar m_frustum_radius;
- bool m_set_frustum_centre;
+ bool m_set_frustum_center;
/**
* Python module doc string.
@@ -120,9 +120,9 @@ protected:
*/
void ExtractClipPlanes();
/**
- * Normalise the camera clip frames.
+ * Normalize the camera clip frames.
*/
- void NormaliseClipPlanes();
+ void NormalizeClipPlanes();
/**
* Extracts the bound sphere of the view frustum.
*/
@@ -181,11 +181,11 @@ public:
/**
* Tests if the given sphere is inside this camera's view frustum.
*
- * @param centre The centre of the sphere, in world coordinates.
+ * @param center The center of the sphere, in world coordinates.
* @param radius The radius of the sphere.
* @return INSIDE, INTERSECT, or OUTSIDE depending on the sphere's relation to the frustum.
*/
- int SphereInsideFrustum(const MT_Point3& centre, const MT_Scalar &radius);
+ int SphereInsideFrustum(const MT_Point3& center, const MT_Scalar &radius);
/**
* Tests the given eight corners of a box with the view frustum.
*
diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp
index dba4792c83c..9454e21132a 100644
--- a/source/gameengine/Ketsji/KX_CameraActuator.cpp
+++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp
@@ -89,12 +89,12 @@ GetReplica(
/* three functions copied from blender arith... don't know if there's an equivalent */
-static float Kx_Normalise(float *n)
+static float Kx_Normalize(float *n)
{
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 a scaled down utah teapot */
+ /* FLT_EPSILON is too large! A larger value causes normalize errors in a scaled down utah teapot */
if(d>0.0000000000001) {
d= sqrt(d);
@@ -158,14 +158,14 @@ static void Kx_VecUpMat3(float *vec, float mat[][3], short axis)
mat[coz][0]= vec[0];
mat[coz][1]= vec[1];
mat[coz][2]= vec[2];
- Kx_Normalise((float *)mat[coz]);
+ Kx_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.0 - inp*mat[coz][2];
- Kx_Normalise((float *)mat[coy]);
+ Kx_Normalize((float *)mat[coy]);
Kx_Crossf(mat[cox], mat[coy], mat[coz]);
diff --git a/source/gameengine/Ketsji/KX_Light.cpp b/source/gameengine/Ketsji/KX_Light.cpp
index 06a52c07b3f..4a92ea4ac13 100644
--- a/source/gameengine/Ketsji/KX_Light.cpp
+++ b/source/gameengine/Ketsji/KX_Light.cpp
@@ -191,12 +191,12 @@ int KX_LightObject::_setattr(const STR_String& attr, PyObject *pyvalue)
{
if (attr == "colour" || attr == "color")
{
- MT_Vector3 colour;
- if (PyVecTo(pyvalue, colour))
+ MT_Vector3 color;
+ if (PyVecTo(pyvalue, color))
{
- m_lightobj.m_red = colour[0];
- m_lightobj.m_green = colour[1];
- m_lightobj.m_blue = colour[2];
+ m_lightobj.m_red = color[0];
+ m_lightobj.m_green = color[1];
+ m_lightobj.m_blue = color[2];
return 0;
}
return 1;
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
index 0d383376d87..431efa07e0a 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
@@ -164,7 +164,7 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
* -> wcs_camcs_trafo ->
* camCS - camera coordinates
* -> camcs_clip_trafo ->
- * clipCS - normalised device coordinates?
+ * clipCS - normalized device coordinates?
* -> normview_win_trafo
* winCS - window coordinates
*
@@ -172,7 +172,7 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
* the projection matrix. These are passed to the rasterizer, and
* we store them in the camera for easy access.
*
- * For normalised device coords (xn = x/w, yn = y/w/zw) the
+ * For normalized device coords (xn = x/w, yn = y/w/zw) the
* windows coords become (lb = left bottom)
*
* xwin = [(xn + 1.0) * width]/2 + x_lb
@@ -215,7 +215,7 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
float nearclip = 0.0;
float farclip = 1.0;
- /* build the from and to point in normalised device coordinates
+ /* build the from and to point in normalized device coordinates
* Looks like normailized device coordinates are [-1,1] in x [-1,1] in y
* [0,-1] in z
*
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index a5bbfa41e3e..996c605df21 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -919,9 +919,9 @@ void KX_Scene::MarkVisible(SG_Tree *node, RAS_IRasterizer* rasty, KX_Camera* cam
if (dotest && !node->inside( cam->NodeGetWorldPosition()))
{
MT_Scalar radius = node->Radius();
- MT_Point3 centre = node->Centre();
+ MT_Point3 center = node->Center();
- intersect = cam->SphereInsideFrustum(centre, radius);
+ intersect = cam->SphereInsideFrustum(center, radius);
if (intersect == KX_Camera::INTERSECT)
{
diff --git a/source/gameengine/Ketsji/KX_VertexProxy.cpp b/source/gameengine/Ketsji/KX_VertexProxy.cpp
index cacf3987e63..9c5f3f611b6 100644
--- a/source/gameengine/Ketsji/KX_VertexProxy.cpp
+++ b/source/gameengine/Ketsji/KX_VertexProxy.cpp
@@ -93,9 +93,9 @@ KX_VertexProxy::_getattr(const STR_String& attr)
if (attr == "colour" || attr == "color")
{
const unsigned char *colp = m_vertex->getRGBA();
- MT_Vector4 colour(colp[0], colp[1], colp[2], colp[3]);
- colour /= 255.0;
- return PyObjectFrom(colour);
+ MT_Vector4 color(colp[0], colp[1], colp[2], colp[3]);
+ color /= 255.0;
+ return PyObjectFrom(color);
}
if (attr == "normal")
diff --git a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h
index 1911e186a1c..8b70bbc5779 100644
--- a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h
+++ b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h
@@ -206,7 +206,7 @@ public:
void applyImpulse(const MT_Point3& attach, const MT_Vector3& impulse) ;
/**
- * Applies an impulse through the centre of this object. (ie the angular
+ * Applies an impulse through the center of this object. (ie the angular
* velocity will not change.
*/
void applyCenterImpulse(const MT_Vector3& impulse);
diff --git a/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp b/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp
index fe1ac9becd9..c8a191cad0d 100644
--- a/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp
+++ b/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp
@@ -301,7 +301,7 @@ void SM_Object::dynamicCollision(const MT_Point3 &local2,
applyImpulse(local2 + getNextFrame().getPosition(), impulse * normal);
} else {
/**
- * Apply impulse through object centre. (no rotation.)
+ * Apply impulse through object center. (no rotation.)
*/
impulse /= invMass;
applyCenterImpulse( impulse * normal );
diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h
index 789b5eea21e..8ecc9e7ad05 100644
--- a/source/gameengine/Rasterizer/RAS_IRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h
@@ -207,7 +207,7 @@ public:
* 2 quads
* @param polymat (reserved)
* @param useObjectColor will render the object using @param rgbacolor instead of
- * vertex colours.
+ * vertex colors.
*/
virtual void IndexPrimitives( const vecVertexArray& vertexarrays,
const vecIndexArrays & indexarrays,
@@ -351,7 +351,7 @@ public:
bool perspective = true
)=0;
/**
- * Sets the specular colour component of the lighting equation.
+ * Sets the specular color component of the lighting equation.
*/
virtual void SetSpecularity(float specX,
float specY,
@@ -363,14 +363,14 @@ public:
*/
virtual void SetShinyness(float shiny)=0;
/**
- * Sets the diffuse colour component of the lighting equation.
+ * Sets the diffuse color component of the lighting equation.
*/
virtual void SetDiffuse(float difX,
float difY,
float difZ,
float diffuse)=0;
/**
- * Sets the emissive colour component of the lighting equation.
+ * Sets the emissive color component of the lighting equation.
*/
virtual void SetEmissive(float eX,
float eY,
diff --git a/source/gameengine/SceneGraph/SG_BBox.cpp b/source/gameengine/SceneGraph/SG_BBox.cpp
index bc7d00327a9..6f06e9b0424 100644
--- a/source/gameengine/SceneGraph/SG_BBox.cpp
+++ b/source/gameengine/SceneGraph/SG_BBox.cpp
@@ -119,9 +119,9 @@ void SG_BBox::translate(const MT_Vector3& dx)
void SG_BBox::scale(const MT_Vector3& size, const MT_Point3& point)
{
- MT_Vector3 centre = (m_max - m_min)/2. + point;
- m_max = (m_max - centre)*size;
- m_min = (m_min - centre)*size;
+ MT_Vector3 center = (m_max - m_min)/2. + point;
+ m_max = (m_max - center)*size;
+ m_min = (m_min - center)*size;
}
#endif
diff --git a/source/gameengine/SceneGraph/SG_Tree.cpp b/source/gameengine/SceneGraph/SG_Tree.cpp
index 947d771f06c..0bad621ff07 100644
--- a/source/gameengine/SceneGraph/SG_Tree.cpp
+++ b/source/gameengine/SceneGraph/SG_Tree.cpp
@@ -56,7 +56,7 @@ SG_Tree::SG_Tree(SG_Tree* left, SG_Tree* right) :
m_bbox += m_right->m_bbox;
m_right->m_parent = this;
}
- m_centre = (m_bbox.m_min + m_bbox.m_max)/2.0;
+ m_center = (m_bbox.m_min + m_bbox.m_max)/2.0;
m_radius = (m_bbox.m_max - m_bbox.m_min).length();
}
@@ -66,7 +66,7 @@ SG_Tree::SG_Tree(SG_Node* client) :
m_client_object(client)
{
m_bbox = SG_BBox(client->BBox(), client->GetWorldTransform());
- m_centre = (m_bbox.m_min + m_bbox.m_max)/2.0;
+ m_center = (m_bbox.m_min + m_bbox.m_max)/2.0;
m_radius = (m_bbox.m_max - m_bbox.m_min).length();
}
@@ -155,7 +155,7 @@ void SG_Tree::SetLeft(SG_Tree *left)
{
m_left = left;
m_bbox += left->m_bbox;
- m_centre = (m_bbox.m_min + m_bbox.m_max)/2.0;
+ m_center = (m_bbox.m_min + m_bbox.m_max)/2.0;
m_radius = (m_bbox.m_max - m_bbox.m_min).length();
}
@@ -163,7 +163,7 @@ void SG_Tree::SetRight(SG_Tree *right)
{
m_right = right;
m_bbox += right->m_bbox;
- m_centre = (m_bbox.m_min + m_bbox.m_max)/2.0;
+ m_center = (m_bbox.m_min + m_bbox.m_max)/2.0;
m_radius = (m_bbox.m_max - m_bbox.m_min).length();
}
diff --git a/source/gameengine/SceneGraph/SG_Tree.h b/source/gameengine/SceneGraph/SG_Tree.h
index 51eeec4f3e1..0877668c53d 100644
--- a/source/gameengine/SceneGraph/SG_Tree.h
+++ b/source/gameengine/SceneGraph/SG_Tree.h
@@ -52,7 +52,7 @@ class SG_Tree
SG_Tree* m_right;
SG_Tree* m_parent;
SG_BBox m_bbox;
- MT_Point3 m_centre;
+ MT_Point3 m_center;
MT_Scalar m_radius;
SG_Node* m_client_object;
public:
@@ -101,7 +101,7 @@ public:
void SetLeft(SG_Tree *left);
void SetRight(SG_Tree *right);
- MT_Point3 Centre() const { return m_centre; }
+ MT_Point3 Center() const { return m_center; }
MT_Scalar Radius() { return m_radius; }
//friend class SG_TreeFactory;