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

New code style refactor

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

107
Runtime/Character/CAllFormatsAnimSource.cpp
View File

@@ -4,77 +4,64 @@
#include "CAnimSourceReader.hpp"
#include "CFBStreamedAnimReader.hpp"
namespace urde
{
namespace urde {
static logvisor::Module Log("urde::CAllFormatsAnimSource");
void CAnimFormatUnion::SubConstruct(u8* storage, EAnimFormat fmt,
CInputStream& in, IObjectStore& store)
{
switch (fmt)
{
case EAnimFormat::Uncompressed:
new (storage) CAnimSource(in, store);
break;
case EAnimFormat::BitstreamCompressed:
new (storage) CFBStreamedCompression(in, store, false);
break;
case EAnimFormat::BitstreamCompressed24:
new (storage) CFBStreamedCompression(in, store, true);
break;
default:
Log.report(logvisor::Fatal, "unable to read ANIM format %d", int(fmt));
}
void CAnimFormatUnion::SubConstruct(u8* storage, EAnimFormat fmt, CInputStream& in, IObjectStore& store) {
switch (fmt) {
case EAnimFormat::Uncompressed:
new (storage) CAnimSource(in, store);
break;
case EAnimFormat::BitstreamCompressed:
new (storage) CFBStreamedCompression(in, store, false);
break;
case EAnimFormat::BitstreamCompressed24:
new (storage) CFBStreamedCompression(in, store, true);
break;
default:
Log.report(logvisor::Fatal, "unable to read ANIM format %d", int(fmt));
}
}
CAnimFormatUnion::CAnimFormatUnion(CInputStream& in, IObjectStore& store)
{
x0_format = EAnimFormat(in.readUint32Big());
SubConstruct(x4_storage, x0_format, in, store);
CAnimFormatUnion::CAnimFormatUnion(CInputStream& in, IObjectStore& store) {
x0_format = EAnimFormat(in.readUint32Big());
SubConstruct(x4_storage, x0_format, in, store);
}
CAnimFormatUnion::~CAnimFormatUnion()
{
switch (x0_format)
{
case EAnimFormat::Uncompressed:
reinterpret_cast<CAnimSource*>(x4_storage)->~CAnimSource();
break;
case EAnimFormat::BitstreamCompressed:
case EAnimFormat::BitstreamCompressed24:
reinterpret_cast<CFBStreamedCompression*>(x4_storage)->~CFBStreamedCompression();
default: break;
}
CAnimFormatUnion::~CAnimFormatUnion() {
switch (x0_format) {
case EAnimFormat::Uncompressed:
reinterpret_cast<CAnimSource*>(x4_storage)->~CAnimSource();
break;
case EAnimFormat::BitstreamCompressed:
case EAnimFormat::BitstreamCompressed24:
reinterpret_cast<CFBStreamedCompression*>(x4_storage)->~CFBStreamedCompression();
default:
break;
}
}
std::shared_ptr<IAnimReader>
CAllFormatsAnimSource::GetNewReader(const TLockedToken<CAllFormatsAnimSource>& tok,
const CCharAnimTime& startTime)
{
switch (tok->x0_format)
{
case EAnimFormat::Uncompressed:
return std::make_shared<CAnimSourceReader>(tok, startTime);
case EAnimFormat::BitstreamCompressed:
case EAnimFormat::BitstreamCompressed24:
return std::make_shared<CFBStreamedAnimReader>(tok, startTime);
default: break;
}
return {};
std::shared_ptr<IAnimReader> CAllFormatsAnimSource::GetNewReader(const TLockedToken<CAllFormatsAnimSource>& tok,
const CCharAnimTime& startTime) {
switch (tok->x0_format) {
case EAnimFormat::Uncompressed:
return std::make_shared<CAnimSourceReader>(tok, startTime);
case EAnimFormat::BitstreamCompressed:
case EAnimFormat::BitstreamCompressed24:
return std::make_shared<CFBStreamedAnimReader>(tok, startTime);
default:
break;
}
return {};
}
CAllFormatsAnimSource::CAllFormatsAnimSource(CInputStream& in,
IObjectStore& store,
const SObjectTag& tag)
CAllFormatsAnimSource::CAllFormatsAnimSource(CInputStream& in, IObjectStore& store, const SObjectTag& tag)
: CAnimFormatUnion(in, store), x74_tag(tag) {}
CFactoryFnReturn AnimSourceFactory(const SObjectTag& tag, CInputStream& in,
const CVParamTransfer& params,
CObjectReference* selfRef)
{
CSimplePool* sp = params.GetOwnedObj<CSimplePool*>();
return TToken<CAllFormatsAnimSource>::GetIObjObjectFor(
std::make_unique<CAllFormatsAnimSource>(in, *sp, tag));
CFactoryFnReturn AnimSourceFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& params,
CObjectReference* selfRef) {
CSimplePool* sp = params.GetOwnedObj<CSimplePool*>();
return TToken<CAllFormatsAnimSource>::GetIObjObjectFor(std::make_unique<CAllFormatsAnimSource>(in, *sp, tag));
}
}
} // namespace urde