AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 17:04:55 +00:00
Code Issues Projects Releases Wiki Activity

Add OIDS resource for translating against original IDs

Browse Source
This commit is contained in:
Jack Andersen
2017-01-30 19:01:40 -10:00
parent 1c7c9caef9
commit 0ed44f1cdc
7 changed files with 182 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Editor/ProjectManager.cpp
View File

@@ -129,7 +129,7 @@ makeProj:
else
m_vm.SetupEditorView();
m_factoryMP1.IndexMP1Resources(*m_proj);
m_factoryMP1.IndexMP1Resources(*m_proj, m_objStore);
m_mainMP1.emplace(m_factoryMP1, m_objStore, m_vm.m_mainBooFactory,
m_vm.m_mainCommandQueue, m_vm.m_renderTex);
m_vm.InitMP1(*m_mainMP1);

6
Editor/ProjectResourceFactoryBase.cpp
View File

@@ -375,6 +375,12 @@ void ProjectResourceFactoryBase::BackgroundIndexProc()
}
}
/* Add special original IDs resource if exists (not name-cached to disk) */
hecl::ProjectPath oidsPath(specRoot, "!original_ids.yaml");
SObjectTag oidsTag = BuildTagFromPath(oidsPath, m_backgroundBlender);
if (oidsTag)
m_catalogNameToTag["mp1originalids"] = oidsTag;
Log.report(logvisor::Info, _S("Background index of '%s' started"), m_origSpec->m_name);
BackgroundIndexRecursiveProc(specRoot, cacheWriter, nameWriter, 0);

73
Editor/ProjectResourceFactoryMP1.cpp
View File

@@ -23,6 +23,8 @@
#include "Audio/CSfxManager.hpp"
#include "Runtime/CDependencyGroup.hpp"
#include "DataSpec/DNACommon/TXTR.hpp"
#include "CSimplePool.hpp"
#include "GameGlobalObjects.hpp"
namespace DataSpec
{
@@ -33,6 +35,57 @@ extern hecl::Database::DataSpecEntry SpecEntMP1PC;
namespace urde
{
class MP1OriginalIDs
{
std::vector<std::pair<ResId, ResId>> m_origToNew;
std::vector<std::pair<ResId, ResId>> m_newToOrig;
public:
MP1OriginalIDs(CInputStream& in)
{
u32 count = in.readUint32Big();
m_origToNew.reserve(count);
for (u32 i=0 ; i<count ; ++i)
{
ResId a = in.readUint32Big();
ResId b = in.readUint32Big();
m_origToNew.push_back(std::make_pair(a, b));
}
m_newToOrig.reserve(count);
for (u32 i=0 ; i<count ; ++i)
{
ResId a = in.readUint32Big();
ResId b = in.readUint32Big();
m_newToOrig.push_back(std::make_pair(a, b));
}
}
ResId TranslateOriginalToNew(ResId id) const
{
auto search = std::lower_bound(m_origToNew.cbegin(), m_origToNew.cend(),
std::make_pair(id, ResId(0)));
if (search == m_origToNew.cend() || search->first != id)
return -1;
return search->second;
}
ResId TranslateNewToOriginal(ResId id) const
{
auto search = std::lower_bound(m_newToOrig.cbegin(), m_newToOrig.cend(),
std::make_pair(id, ResId(0)));
if (search == m_newToOrig.cend() || search->first != id)
return -1;
return search->second;
}
};
CFactoryFnReturn FMP1OriginalIDsFactory(const SObjectTag& tag, CInputStream& in,
const CVParamTransfer& param,
CObjectReference* selfRef)
{
return TToken<MP1OriginalIDs>::GetIObjObjectFor(std::make_unique<MP1OriginalIDs>(in));
}
ProjectResourceFactoryMP1::ProjectResourceFactoryMP1(hecl::ClientProcess& clientProc)
: ProjectResourceFactoryBase(clientProc)
{
@@ -54,11 +107,29 @@ ProjectResourceFactoryMP1::ProjectResourceFactoryMP1(hecl::ClientProcess& client
m_factoryMgr.AddFactory(FOURCC('HINT'), FFactoryFunc(FHintFactory));
m_factoryMgr.AddFactory(FOURCC('SAVW'), FFactoryFunc(FSaveWorldFactory));
m_factoryMgr.AddFactory(FOURCC('MAPW'), FFactoryFunc(FMapWorldFactory));
m_factoryMgr.AddFactory(FOURCC('OIDS'), FFactoryFunc(FMP1OriginalIDsFactory));
}
void ProjectResourceFactoryMP1::IndexMP1Resources(hecl::Database::Project& proj)
void ProjectResourceFactoryMP1::IndexMP1Resources(hecl::Database::Project& proj, CSimplePool& sp)
{
BeginBackgroundIndex(proj, DataSpec::SpecEntMP1, DataSpec::SpecEntMP1PC);
m_origIds = sp.GetObj("MP1OriginalIDs");
}
void ProjectResourceFactoryMP1::Shutdown()
{
m_origIds = TLockedToken<MP1OriginalIDs>();
ProjectResourceFactoryBase::Shutdown();
}
ResId ProjectResourceFactoryMP1::TranslateOriginalToNew(ResId id) const
{
return m_origIds->TranslateOriginalToNew(id);
}
ResId ProjectResourceFactoryMP1::TranslateNewToOriginal(ResId id) const
{
return m_origIds->TranslateNewToOriginal(id);
}
}

10
Editor/ProjectResourceFactoryMP1.hpp
View File

@@ -2,15 +2,23 @@
#define URDE_PROJECT_RESOURCE_FACTORY_MP1_HPP
#include "ProjectResourceFactoryBase.hpp"
#include "CToken.hpp"
namespace urde
{
class MP1OriginalIDs;
class CSimplePool;
class ProjectResourceFactoryMP1 : public ProjectResourceFactoryBase
{
TLockedToken<MP1OriginalIDs> m_origIds;
public:
ProjectResourceFactoryMP1(hecl::ClientProcess& clientProc);
void IndexMP1Resources(hecl::Database::Project& proj);
void IndexMP1Resources(hecl::Database::Project& proj, CSimplePool& sp);
void Shutdown();
ResId TranslateOriginalToNew(ResId id) const;
ResId TranslateNewToOriginal(ResId id) const;
};
}