sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Compiler portability fixes (MSVC 6)

Browse Source
This commit is contained in:
Kester Maddock 2004-05-17 23:56:56 +00:00
parent a6458b3cfa
commit fba0e401c9
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/gameengine/SceneGraph/SG_Tree.cpp
View File

@ -103,7 +103,7 @@ SG_Tree* SG_Tree::Find(SG_Node *node)
if (m_client_object == node) if (m_client_object == node)
return this; return this;
SG_Tree *left(m_left), *right(m_right); SG_Tree *left = m_left, *right = m_right;
if (left && right) if (left && right)
{ {
@ -227,10 +227,11 @@ SG_Tree* SG_TreeFactory::MakeTree()
HalfArray<SG_Tree*> sizes; HalfArray<SG_Tree*> sizes;
sizes.resize(num_objects); sizes.resize(num_objects);
for( unsigned int y = 0; y < num_objects; y++) unsigned int x, y;
for( y = 0; y < num_objects; y++)
{ {
sizes(y, y) = m_objects[y]; sizes(y, y) = m_objects[y];
for( unsigned int x = y+1; x < num_objects; x++) for( x = y+1; x < num_objects; x++)
{ {
sizes(x, y) = new SG_Tree(m_objects[x], m_objects[y]); sizes(x, y) = new SG_Tree(m_objects[x], m_objects[y]);
@ -243,13 +244,13 @@ SG_Tree* SG_TreeFactory::MakeTree()
MT_Scalar min_volume = FLT_MAX; MT_Scalar min_volume = FLT_MAX;
SG_Tree *min; SG_Tree *min;
//char temp[16]; //char temp[16];
for( unsigned int y = 0; y < num_objects; y++) for( y = 0; y < num_objects; y++)
{ {
/*std::cout << sizes(y, y) << " "; /*std::cout << sizes(y, y) << " ";
for( unsigned int x = 0; x < y; x++) for( unsigned int x = 0; x < y; x++)
std::cout << " "; */ std::cout << " "; */
for( unsigned int x = y+1; x < num_objects; x++) for( x = y+1; x < num_objects; x++)
{ {
//sprintf(temp, "%7.1f", sizes(x, y)->volume()); //sprintf(temp, "%7.1f", sizes(x, y)->volume());
//std::cout << sizes(x, y) << "(" << temp << ") "; //std::cout << sizes(x, y) << "(" << temp << ") ";
@ -269,7 +270,7 @@ SG_Tree* SG_TreeFactory::MakeTree()
/* Remove other bboxes that contain the two bboxes */ /* Remove other bboxes that contain the two bboxes */
sizes.delete_column(miny); sizes.delete_column(miny);
for( unsigned int x = miny + 1; x < num_objects; x++) for( x = miny + 1; x < num_objects; x++)
{ {
if (x == minx) if (x == minx)
continue; continue;
@ -280,12 +281,12 @@ SG_Tree* SG_TreeFactory::MakeTree()
num_objects--; num_objects--;
minx--; minx--;
sizes(minx, minx) = min; sizes(minx, minx) = min;
for( unsigned int x = minx + 1; x < num_objects; x++) for( x = minx + 1; x < num_objects; x++)
{ {
delete sizes(x, minx); delete sizes(x, minx);
sizes(x, minx) = new SG_Tree(min, sizes(x, x)); sizes(x, minx) = new SG_Tree(min, sizes(x, x));
} }
for( unsigned int y = 0; y < minx; y++) for( y = 0; y < minx; y++)
{ {
delete sizes(minx, y); delete sizes(minx, y);
sizes(minx, y) = new SG_Tree(sizes(y, y), min); sizes(minx, y) = new SG_Tree(sizes(y, y), min);