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:
authorJorge Bernal <jbernalmartinez@gmail.com>2015-12-14 08:39:52 +0300
committerJorge Bernal <jbernalmartinez@gmail.com>2015-12-14 08:56:50 +0300
commit94b34c9d44dea4c3f22384a76122d57aec53b6ef (patch)
tree26f27ce23bb73aa8173166de245749be0aaccd0e /source/gameengine/SceneGraph/SG_Tree.cpp
parent9c53e55db50d1e745af4d85aa32a3d43a119a7c6 (diff)
BGE Scenegraph clean up: double-promotion warnings
Diffstat (limited to 'source/gameengine/SceneGraph/SG_Tree.cpp')
-rw-r--r--source/gameengine/SceneGraph/SG_Tree.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/gameengine/SceneGraph/SG_Tree.cpp b/source/gameengine/SceneGraph/SG_Tree.cpp
index bef246533a6..87feb2c012a 100644
--- a/source/gameengine/SceneGraph/SG_Tree.cpp
+++ b/source/gameengine/SceneGraph/SG_Tree.cpp
@@ -41,7 +41,7 @@ SG_Tree::SG_Tree() :
m_left(NULL),
m_right(NULL),
m_parent(NULL),
- m_radius(0.0),
+ m_radius(0.0f),
m_client_object(NULL)
{
}
@@ -62,7 +62,7 @@ SG_Tree::SG_Tree(SG_Tree* left, SG_Tree* right) :
m_bbox += m_right->m_bbox;
m_right->m_parent = this;
}
- m_center = (m_bbox.m_min + m_bbox.m_max)/2.0;
+ m_center = (m_bbox.m_min + m_bbox.m_max)/2.0f;
m_radius = (m_bbox.m_max - m_bbox.m_min).length();
}
@@ -73,7 +73,7 @@ SG_Tree::SG_Tree(SG_Node* client) :
m_client_object(client)
{
m_bbox = SG_BBox(client->BBox(), client->GetWorldTransform());
- m_center = (m_bbox.m_min + m_bbox.m_max)/2.0;
+ m_center = (m_bbox.m_min + m_bbox.m_max)/2.0f;
m_radius = (m_bbox.m_max - m_bbox.m_min).length();
}
@@ -162,7 +162,7 @@ void SG_Tree::SetLeft(SG_Tree *left)
{
m_left = left;
m_bbox += left->m_bbox;
- m_center = (m_bbox.m_min + m_bbox.m_max)/2.0;
+ m_center = (m_bbox.m_min + m_bbox.m_max)/2.0f;
m_radius = (m_bbox.m_max - m_bbox.m_min).length();
}
@@ -170,7 +170,7 @@ void SG_Tree::SetRight(SG_Tree *right)
{
m_right = right;
m_bbox += right->m_bbox;
- m_center = (m_bbox.m_min + m_bbox.m_max)/2.0;
+ m_center = (m_bbox.m_min + m_bbox.m_max)/2.0f;
m_radius = (m_bbox.m_max - m_bbox.m_min).length();
}
@@ -263,7 +263,7 @@ SG_Tree* SG_TreeFactory::MakeTreeDown(SG_BBox &bbox)
return root;
}
- if (bbox.volume() < 1.0)
+ if (bbox.volume() < 1.0f)
return MakeTreeUp();
SG_TreeFactory lefttree;