2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 11:07:44 +00:00

New code style refactor

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

View File

@@ -1,51 +1,43 @@
#include "MP1OriginalIDs.hpp"
#include "CToken.hpp"
namespace urde
{
namespace urde {
MP1OriginalIDs::MP1OriginalIDs(CInputStream& in)
{
u32 count = in.readUint32Big();
m_origToNew.reserve(count);
for (u32 i=0 ; i<count ; ++i)
{
CAssetId a = in.readUint32Big();
CAssetId b = in.readUint32Big();
m_origToNew.push_back(std::make_pair(a, b));
}
m_newToOrig.reserve(count);
for (u32 i=0 ; i<count ; ++i)
{
CAssetId a = in.readUint32Big();
CAssetId b = in.readUint32Big();
m_newToOrig.push_back(std::make_pair(a, b));
}
MP1OriginalIDs::MP1OriginalIDs(CInputStream& in) {
u32 count = in.readUint32Big();
m_origToNew.reserve(count);
for (u32 i = 0; i < count; ++i) {
CAssetId a = in.readUint32Big();
CAssetId b = in.readUint32Big();
m_origToNew.push_back(std::make_pair(a, b));
}
m_newToOrig.reserve(count);
for (u32 i = 0; i < count; ++i) {
CAssetId a = in.readUint32Big();
CAssetId b = in.readUint32Big();
m_newToOrig.push_back(std::make_pair(a, b));
}
}
CAssetId MP1OriginalIDs::TranslateOriginalToNew(CAssetId id) const
{
auto search = rstl::binary_find(m_origToNew.cbegin(), m_origToNew.cend(), id,
[](const auto& id) { return id.first; });
if (search == m_origToNew.cend())
return {};
return search->second;
CAssetId MP1OriginalIDs::TranslateOriginalToNew(CAssetId id) const {
auto search =
rstl::binary_find(m_origToNew.cbegin(), m_origToNew.cend(), id, [](const auto& id) { return id.first; });
if (search == m_origToNew.cend())
return {};
return search->second;
}
CAssetId MP1OriginalIDs::TranslateNewToOriginal(CAssetId id) const
{
auto search = rstl::binary_find(m_newToOrig.cbegin(), m_newToOrig.cend(), id,
[](const auto& id) { return id.first; });
if (search == m_newToOrig.cend())
return {};
return search->second;
CAssetId MP1OriginalIDs::TranslateNewToOriginal(CAssetId id) const {
auto search =
rstl::binary_find(m_newToOrig.cbegin(), m_newToOrig.cend(), id, [](const auto& id) { return id.first; });
if (search == m_newToOrig.cend())
return {};
return search->second;
}
CFactoryFnReturn FMP1OriginalIDsFactory(const SObjectTag& tag, CInputStream& in,
const CVParamTransfer& param,
CObjectReference* selfRef)
{
return TToken<MP1OriginalIDs>::GetIObjObjectFor(std::make_unique<MP1OriginalIDs>(in));
CFactoryFnReturn FMP1OriginalIDsFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& param,
CObjectReference* selfRef) {
return TToken<MP1OriginalIDs>::GetIObjObjectFor(std::make_unique<MP1OriginalIDs>(in));
}
}
} // namespace urde