BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed warnings in OctTree. Cleaned unit tests.

Browse Source
This commit is contained in:
William Moberg
2015-12-11 16:45:38 +01:00
parent 9a7d77f29d
commit 55aad493ff
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Core/OctTree.cpp
+3 -3
View File
@@ -300,7 +300,7 @@ void OctTree::OctChild::AddDynamicObject(const AABB& box)
}
} else {
//Since it hasn't been added yet to the real object list, the index is after the last =size.
m_DynamicObjIndices.push_back(m_DynamicObjectsRef.size());
m_DynamicObjIndices.push_back((int)m_DynamicObjectsRef.size());
}
}
@@ -312,7 +312,7 @@ void OctTree::OctChild::AddStaticObject(const AABB& box)
}
} else {
//Since it hasn't been added yet to the real object list, the index is after the last =size.
m_StaticObjIndices.push_back(m_StaticObjectsRef.size());
m_StaticObjIndices.push_back((int)m_StaticObjectsRef.size());
}
}
@@ -323,7 +323,7 @@ void OctTree::OctChild::BoxesInSameRegion(const AABB& box, std::vector<AABB>& ou
m_Children[i]->BoxesInSameRegion(box, outBoxes);
}
} else {
int startIndex = outBoxes.size();
size_t startIndex = outBoxes.size();
int numDuplicates = 0;
outBoxes.resize(outBoxes.size() + m_StaticObjIndices.size() + m_DynamicObjIndices.size());
for (size_t i = 0; i < m_StaticObjIndices.size(); ++i){