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/SceneGraph
parent203e6ed82b444786d7999e88cebef84d6d429765 (diff)
moved source and text to american spelling
* colour -> color * centre -> center * normalise -> normalize * modelling -> modeling
Diffstat (limited to 'source/gameengine/SceneGraph')
-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
3 files changed, 9 insertions, 9 deletions
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;