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

Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree

Browse Source
This commit is contained in:
verysecrethero
2015-12-07 10:03:55 +01:00
parent f0e407bec2 8e21b1fe35
commit 89aa8c44b0
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Core/OctTree.h
+1 -1
View File
@@ -26,7 +26,7 @@ private:
//start of Collision test, set on check, don't check if set already. Solves duplicate boxes in tree. //start of Collision test, set on check, don't check if set already. Solves duplicate boxes in tree.
AABB m_Box; AABB m_Box;
bool rayCollides(const Ray& ray, Output& data, const OctTree* const tree) const; bool rayCollides(const Ray& ray, Output& data) const;
inline bool hasChildren() const; inline bool hasChildren() const;
int childIndexContainingPoint(const glm::vec3& point) const; int childIndexContainingPoint(const glm::vec3& point) const;
}; };
src/Engine/Core/OctTree.cpp
+19 -17
View File
@@ -79,43 +79,45 @@ OctTree::~OctTree()
} }
} }
bool OctTree::RayCollides(const Ray& ray, Output& data) const bool OctTree::RayCollides(const Ray& ray, Output& data) const
{ {
data.CollideDistance = -1; data.CollideDistance = -1;
return rayCollides(ray, data, this); return rayCollides(ray, data);
} }
//Currently all Nodes must have exactly 0 or 8 children, and objectdata should only exist in the last bottom nodes. //Currently all Nodes must have exactly 0 or 8 children, and objectdata should only exist in the last bottom nodes.
bool OctTree::rayCollides(const Ray& ray, Output& data, const OctTree* const tree) const bool OctTree::rayCollides(const Ray& ray, Output& data) const
{ {
//If the node AABB is missed, everything it contains is missed. //If the node AABB is missed, everything it contains is missed.
if (Collision::RayAABBIntr(ray, tree->m_Box)) { if (Collision::RayAABBIntr(ray, m_Box)) {
//If the ray shoots the tree, and it is a parent to 8 children :o //If the ray shoots the tree, and it is a parent to 8 children :o
if (tree->hasChildren()) { if (hasChildren()) {
//Sort children according to their distance from the ray origin. //Sort children according to their distance from the ray origin.
std::vector<ChildInfo> childInfos; std::vector<ChildInfo> childInfos;
childInfos.reserve(8); childInfos.reserve(8);
for (int i = 0; i < 8; ++i) { for (int i = 0; i < 8; ++i) {
childInfos.push_back({ i, glm::distance(ray.Origin, tree->m_Children[i]->m_Box.Center()) }); childInfos.push_back({ i, glm::distance(ray.Origin, m_Children[i]->m_Box.Center()) });
} }
std::sort(childInfos.begin(), childInfos.end(), isFirstLower); std::sort(childInfos.begin(), childInfos.end(), isFirstLower);
//Loop through the children, starting with the one closest to the ray origin. I.e the first to be hit. //Loop through the children, starting with the one closest to the ray origin. I.e the first to be hit.
for (const ChildInfo& info : childInfos) { for (const ChildInfo& info : childInfos) {
if (rayCollides(ray, data, tree->m_Children[info.Index])) { if (m_Children[info.Index]->rayCollides(ray, data)) {
return true; return true;
} }
} }
} else { } else {
////TODO: Check against objects in the node. //Check against boxes in the node.
//float minDist = INFINITY; float minDist = INFINITY;
//for (const auto& obj : m_ObjectsInBox) { bool intersected = false;
// float dist = Collide(ray, obj); for (const auto& objBox : m_ContainingBoxes) {
// minDist = min(dist, minDist); float dist;
//} if (Collision::RayVsAABB(ray, objBox, dist)) {
//data.CollideDistance = minDist; minDist = std::min(dist, minDist);
//if minDist != Collide()'s non-collide value: return false; intersected = true;
return true; }
}
data.CollideDistance = minDist;
return intersected;
} }
} }
return false; return false;
@@ -138,7 +140,7 @@ void OctTree::AddBox(const AABB& box)
case 2: //Four children. case 2: //Four children.
bits.flip(); bits.flip();
for (int c = 0; c < 8; ++c) { for (int c = 0; c < 8; ++c) {
if ((bits & std::bitset<3>(c))[0]) { if ((bits & std::bitset<3>(c)).any()) {
m_Children[c]->AddBox(box); m_Children[c]->AddBox(box);
} }
} }