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

COBBTree: Simplify make_unique call 

We can use nullptr here instead of typing out the name of the type.
This commit is contained in:
Lioncash 2020-04-06 00:50:10 -04:00
parent 58adce472a
commit 19cfb92d5d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Collision/COBBTree.cpp
View File

@ -70,14 +70,16 @@ std::unique_ptr<COBBTree> COBBTree::BuildOrientedBoundingBoxTree(const zeus::CVe
idxData.x40_edges = std::vector<CCollisionEdge>(DefaultEdges.cbegin(), DefaultEdges.cend()); idxData.x40_edges = std::vector<CCollisionEdge>(DefaultEdges.cbegin(), DefaultEdges.cend());
idxData.x50_surfaceIndices = std::vector<u16>(DefaultSurfaceIndices.cbegin(), DefaultSurfaceIndices.cend()); idxData.x50_surfaceIndices = std::vector<u16>(DefaultSurfaceIndices.cbegin(), DefaultSurfaceIndices.cend());
idxData.x60_vertices.reserve(8); idxData.x60_vertices.reserve(8);
for (int i = 0; i < 8; ++i) for (int i = 0; i < 8; ++i) {
idxData.x60_vertices.push_back(aabb.getPoint(i)); idxData.x60_vertices.push_back(aabb.getPoint(i));
}
std::vector<u16> surface; std::vector<u16> surface;
surface.reserve(12); surface.reserve(12);
for (int i = 0; i < 12; ++i) for (int i = 0; i < 12; ++i) {
surface.push_back(i); surface.push_back(i);
ret->x88_root = std::make_unique<CNode>(zeus::CTransform::Translate(center), extent * 0.5f, }
std::unique_ptr<CNode>{}, std::unique_ptr<CNode>{}, std::make_unique<CLeafData>(std::move(surface))); ret->x88_root = std::make_unique<CNode>(zeus::CTransform::Translate(center), extent * 0.5f, nullptr, nullptr,
std::make_unique<CLeafData>(std::move(surface)));
return ret; return ret;
} }