AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

AROTBuilder: Make use of std::array where applicable 

While we're at it, we can dehardcode some sizes.
This commit is contained in:
Lioncash 2020-03-31 07:23:18 -04:00
parent 12e42ba58a
commit a2709f1d20
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
DataSpec/DNACommon/AROTBuilder.cpp
View File

@ -1,4 +1,8 @@
#include "AROTBuilder.hpp" #include "AROTBuilder.hpp"
#include <algorithm>
#include <array>
#include "hecl/Blender/Connection.hpp" #include "hecl/Blender/Connection.hpp"
#include "../DNAMP1/PATH.hpp" #include "../DNAMP1/PATH.hpp"
@ -128,7 +132,9 @@ size_t AROTBuilder::BitmapPool::addIndices(const std::set<int>& indices) {
return m_pool.size() - 1; return m_pool.size() - 1;
} }
static const uint32_t AROTChildCounts[] = {0, 2, 2, 4, 2, 4, 4, 8}; constexpr std::array<uint32_t, 8> AROTChildCounts{
0, 2, 2, 4, 2, 4, 4, 8,
};
void AROTBuilder::Node::nodeCount(size_t& sz, size_t& idxRefs, BitmapPool& bmpPool, size_t& curOff) { void AROTBuilder::Node::nodeCount(size_t& sz, size_t& idxRefs, BitmapPool& bmpPool, size_t& curOff) {
sz += 1; sz += 1;
@ -176,7 +182,7 @@ void AROTBuilder::Node::writeNodes(athena::io::MemoryWriter& w, int nodeIdx) {
if (curIdx > 65535) if (curIdx > 65535)
Log.report(logvisor::Fatal, fmt("AROT node exceeds 16-bit node addressing; area too complex")); Log.report(logvisor::Fatal, fmt("AROT node exceeds 16-bit node addressing; area too complex"));
int childIndices[8]; std::array<int, 8> childIndices;
for (int k = 0; k < 1 + ((compSubdivs & 0x4) != 0); ++k) { for (int k = 0; k < 1 + ((compSubdivs & 0x4) != 0); ++k) {
for (int j = 0; j < 1 + ((compSubdivs & 0x2) != 0); ++j) { for (int j = 0; j < 1 + ((compSubdivs & 0x2) != 0); ++j) {
@ -280,17 +286,16 @@ void AROTBuilder::Node::pathWrite(DNAMP1::PATH& path, const zeus::CAABox& curAAB
n.aabb[0] = curAABB.min; n.aabb[0] = curAABB.min;
n.aabb[1] = curAABB.max; n.aabb[1] = curAABB.max;
n.centroid = curAABB.center(); n.centroid = curAABB.center();
for (int i = 0; i < 8; ++i) std::fill(std::begin(n.children), std::end(n.children), 0xFFFFFFFF);
n.children[i] = 0xffffffff;
n.regionCount = childIndices.size(); n.regionCount = childIndices.size();
n.regionStart = path.octreeRegionLookup.size(); n.regionStart = path.octreeRegionLookup.size();
for (int r : childIndices) for (int r : childIndices)
path.octreeRegionLookup.push_back(r); path.octreeRegionLookup.push_back(r);
} else { } else {
atUint32 children[8]; std::array<atUint32, 8> children;
for (int i = 0; i < 8; ++i) { for (size_t i = 0; i < children.size(); ++i) {
/* Head recursion (first node will be a leaf) */ /* Head recursion (first node will be a leaf) */
childNodes[i].pathWrite(path, SplitAABB(curAABB, i)); childNodes[i].pathWrite(path, SplitAABB(curAABB, static_cast<int>(i)));
children[i] = path.octree.size() - 1; children[i] = path.octree.size() - 1;
} }
@ -300,8 +305,7 @@ void AROTBuilder::Node::pathWrite(DNAMP1::PATH& path, const zeus::CAABox& curAAB
n.aabb[0] = curAABB.min; n.aabb[0] = curAABB.min;
n.aabb[1] = curAABB.max; n.aabb[1] = curAABB.max;
n.centroid = curAABB.center(); n.centroid = curAABB.center();
for (int i = 0; i < 8; ++i) std::copy(children.cbegin(), children.cend(), std::begin(n.children));
n.children[i] = children[i];
n.regionCount = 0; n.regionCount = 0;
n.regionStart = 0; n.regionStart = 0;
} }
@ -377,11 +381,10 @@ std::pair<std::unique_ptr<uint8_t[]>, uint32_t> AROTBuilder::buildCol(const ColM
std::vector<zeus::CAABox> triBoxes; std::vector<zeus::CAABox> triBoxes;
triBoxes.reserve(mesh.trianges.size()); triBoxes.reserve(mesh.trianges.size());
for (const ColMesh::Triangle& tri : mesh.trianges) { for (const ColMesh::Triangle& tri : mesh.trianges) {
triBoxes.emplace_back(); zeus::CAABox& aabb = triBoxes.emplace_back();
zeus::CAABox& aabb = triBoxes.back(); for (size_t e = 0; e < tri.edges.size(); ++e) {
for (int e = 0; e < 3; ++e) {
const ColMesh::Edge& edge = mesh.edges[tri.edges[e]]; const ColMesh::Edge& edge = mesh.edges[tri.edges[e]];
for (int v = 0; v < 2; ++v) { for (size_t v = 0; v < edge.verts.size(); ++v) {
const auto& vert = mesh.verts[edge.verts[v]]; const auto& vert = mesh.verts[edge.verts[v]];
aabb.accumulateBounds(zeus::CVector3f(vert)); aabb.accumulateBounds(zeus::CVector3f(vert));
} }