AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 01:47:43 +00:00
Code Issues Projects Releases Wiki Activity

New code style refactor

Browse Source
This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
Runtime/Graphics/CPVSVisOctree.cpp
View File

@@ -1,113 +1,86 @@
#include "CPVSVisOctree.hpp"
namespace urde
{
namespace urde {
CPVSVisOctree CPVSVisOctree::MakePVSVisOctree(const u8* data)
{
CMemoryInStream r(data, 68);
zeus::CAABox aabb = aabb.ReadBoundingBoxBig(r);
u32 numObjects = r.readUint32Big();
u32 numLights = r.readUint32Big();
r.readUint32Big();
return CPVSVisOctree(aabb, numObjects, numLights, data + r.position());
CPVSVisOctree CPVSVisOctree::MakePVSVisOctree(const u8* data) {
CMemoryInStream r(data, 68);
zeus::CAABox aabb = aabb.ReadBoundingBoxBig(r);
u32 numObjects = r.readUint32Big();
u32 numLights = r.readUint32Big();
r.readUint32Big();
return CPVSVisOctree(aabb, numObjects, numLights, data + r.position());
}
CPVSVisOctree::CPVSVisOctree(const zeus::CAABox& aabb, u32 numObjects, u32 numLights, const u8* c)
: x0_aabb(aabb), x18_numObjects(numObjects), x1c_numLights(numLights), x20_bufferFlag(c != nullptr), x24_octreeData(c)
{
x2c_searchAabb = x0_aabb;
x20_bufferFlag = 0;
: x0_aabb(aabb), x18_numObjects(numObjects), x1c_numLights(numLights), x20_bufferFlag(c != nullptr), x24_octreeData(c) {
x2c_searchAabb = x0_aabb;
x20_bufferFlag = 0;
}
static const u32 NumChildTable[] =
{
0, 2, 2, 4, 2, 4, 4, 8
};
static const u32 NumChildTable[] = {0, 2, 2, 4, 2, 4, 4, 8};
u32 CPVSVisOctree::GetNumChildren(u8 byte) const
{
return NumChildTable[byte & 0x7];
u32 CPVSVisOctree::GetNumChildren(u8 byte) const { return NumChildTable[byte & 0x7]; }
u32 CPVSVisOctree::GetChildIndex(const u8*, const zeus::CVector3f&) const { return 0; }
s32 CPVSVisOctree::IterateSearch(u8 nodeData, const zeus::CVector3f& tp) const {
if (!(nodeData & 0x7))
return -1; // Leaf node
zeus::CVector3f newMin = x2c_searchAabb.center();
zeus::CVector3f newMax;
bool highFlags[3];
if (tp.x() > newMin.x()) {
newMax.x() = x2c_searchAabb.max.x();
highFlags[0] = true;
} else {
newMax.x() = float(newMin.x());
newMin.x() = float(x2c_searchAabb.min.x());
highFlags[0] = false;
}
if (tp.y() > newMin.y()) {
newMax.y() = float(x2c_searchAabb.max.y());
highFlags[1] = true;
} else {
newMax.y() = float(newMin.y());
newMin.y() = float(x2c_searchAabb.min.y());
highFlags[1] = false;
}
if (tp.z() > newMin.z()) {
newMax.z() = float(x2c_searchAabb.max.z());
highFlags[2] = true;
} else {
newMax.z() = float(newMin.z());
newMin.z() = float(x2c_searchAabb.min.z());
highFlags[2] = false;
}
u8 axisCounts[2] = {1, 1};
if (nodeData & 0x1)
axisCounts[0] = 2;
if (nodeData & 0x2)
axisCounts[1] = 2;
zeus::CAABox& newSearch = const_cast<zeus::CAABox&>(x2c_searchAabb);
if (nodeData & 0x1) {
newSearch.min.x() = float(newMin.x());
newSearch.max.x() = float(newMax.x());
}
if (nodeData & 0x2) {
newSearch.min.y() = float(newMin.y());
newSearch.max.y() = float(newMax.y());
}
if (nodeData & 0x4) {
newSearch.min.z() = float(newMin.z());
newSearch.max.z() = float(newMax.z());
}
// Branch node - calculate next relative pointer
return highFlags[0] * bool(nodeData & 0x1) + highFlags[1] * axisCounts[0] * bool(nodeData & 0x2) +
highFlags[2] * axisCounts[0] * axisCounts[1] * bool(nodeData & 0x4);
}
u32 CPVSVisOctree::GetChildIndex(const u8*, const zeus::CVector3f&) const
{
return 0;
}
s32 CPVSVisOctree::IterateSearch(u8 nodeData, const zeus::CVector3f& tp) const
{
if (!(nodeData & 0x7))
return -1; // Leaf node
zeus::CVector3f newMin = x2c_searchAabb.center();
zeus::CVector3f newMax;
bool highFlags[3];
if (tp.x() > newMin.x())
{
newMax.x() = x2c_searchAabb.max.x();
highFlags[0] = true;
}
else
{
newMax.x() = float(newMin.x());
newMin.x() = float(x2c_searchAabb.min.x());
highFlags[0] = false;
}
if (tp.y() > newMin.y())
{
newMax.y() = float(x2c_searchAabb.max.y());
highFlags[1] = true;
}
else
{
newMax.y() = float(newMin.y());
newMin.y() = float(x2c_searchAabb.min.y());
highFlags[1] = false;
}
if (tp.z() > newMin.z())
{
newMax.z() = float(x2c_searchAabb.max.z());
highFlags[2] = true;
}
else
{
newMax.z() = float(newMin.z());
newMin.z() = float(x2c_searchAabb.min.z());
highFlags[2] = false;
}
u8 axisCounts[2] = {1, 1};
if (nodeData & 0x1)
axisCounts[0] = 2;
if (nodeData & 0x2)
axisCounts[1] = 2;
zeus::CAABox& newSearch = const_cast<zeus::CAABox&>(x2c_searchAabb);
if (nodeData & 0x1)
{
newSearch.min.x() = float(newMin.x());
newSearch.max.x() = float(newMax.x());
}
if (nodeData & 0x2)
{
newSearch.min.y() = float(newMin.y());
newSearch.max.y() = float(newMax.y());
}
if (nodeData & 0x4)
{
newSearch.min.z() = float(newMin.z());
newSearch.max.z() = float(newMax.z());
}
// Branch node - calculate next relative pointer
return
highFlags[0] * bool(nodeData & 0x1) +
highFlags[1] * axisCounts[0] * bool(nodeData & 0x2) +
highFlags[2] * axisCounts[0] * axisCounts[1] * bool(nodeData & 0x4);
}
}
} // namespace urde