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

Resource factories now provided with self-ref

Browse Source
This commit is contained in:
Jack Andersen
2016-09-02 09:32:57 -10:00
parent 6dff9b241a
commit f4ea728a61
43 changed files with 201 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Runtime/CFactoryMgr.cpp
View File

@@ -5,13 +5,13 @@ namespace urde
{
CFactoryFnReturn CFactoryMgr::MakeObject(const SObjectTag& tag, urde::CInputStream& in,
const CVParamTransfer& paramXfer)
const CVParamTransfer& paramXfer, CObjectReference* selfRef)
{
auto search = m_factories.find(tag.type);
if (search == m_factories.end())
return {};
return search->second(tag, in, paramXfer);
return search->second(tag, in, paramXfer, selfRef);
}
bool CFactoryMgr::CanMakeMemory(const urde::SObjectTag& tag) const
@@ -21,7 +21,8 @@ bool CFactoryMgr::CanMakeMemory(const urde::SObjectTag& tag) const
}
CFactoryFnReturn CFactoryMgr::MakeObjectFromMemory(const SObjectTag& tag, std::unique_ptr<u8[]>&& buf, int size,
bool compressed, const CVParamTransfer& paramXfer)
bool compressed, const CVParamTransfer& paramXfer,
CObjectReference* selfRef)
{
std::unique_ptr<u8[]> localBuf = std::move(buf);
@@ -35,11 +36,11 @@ CFactoryFnReturn CFactoryMgr::MakeObjectFromMemory(const SObjectTag& tag, std::u
u32 decompLen = compRead->readUint32Big();
CZipInputStream r(std::move(compRead));
std::unique_ptr<u8[]> decompBuf = r.readUBytes(decompLen);
return search->second(tag, std::move(decompBuf), decompLen, paramXfer);
return search->second(tag, std::move(decompBuf), decompLen, paramXfer, selfRef);
}
else
{
return search->second(tag, std::move(localBuf), size, paramXfer);
return search->second(tag, std::move(localBuf), size, paramXfer, selfRef);
}
}
else
@@ -54,12 +55,12 @@ CFactoryFnReturn CFactoryMgr::MakeObjectFromMemory(const SObjectTag& tag, std::u
std::make_unique<athena::io::MemoryReader>(localBuf.get(), size);
u32 decompLen = compRead->readUint32Big();
CZipInputStream r(std::move(compRead));
return search->second(tag, r, paramXfer);
return search->second(tag, r, paramXfer, selfRef);
}
else
{
CMemoryInStream r(localBuf.get(), size);
return search->second(tag, r, paramXfer);
return search->second(tag, r, paramXfer, selfRef);
}
}
}