mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-12 13:35:35 -04:00
Revert "Isolate JKRHeap operator overloads" (#39)
This commit is contained in:
@@ -9,8 +9,6 @@
|
||||
#include "JSystem/JSupport/JSupport.h"
|
||||
#include <os.h>
|
||||
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
|
||||
J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseFlag flag) {
|
||||
const JUTDataFileHeader* header = (const JUTDataFileHeader*)i_data;
|
||||
J3D_ASSERT_NULLPTR(48, i_data);
|
||||
@@ -21,68 +19,68 @@ J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseF
|
||||
switch (header->mType) {
|
||||
case 'bck1': {
|
||||
J3DAnmKeyLoader_v15 loader;
|
||||
loader.mAnm = JKR_NEW J3DAnmTransformKey();
|
||||
loader.mAnm = new J3DAnmTransformKey();
|
||||
return loader.load(i_data);
|
||||
}
|
||||
case 'bpk1': {
|
||||
J3DAnmKeyLoader_v15 loader;
|
||||
loader.mAnm = JKR_NEW J3DAnmColorKey();
|
||||
loader.mAnm = new J3DAnmColorKey();
|
||||
return loader.load(i_data);
|
||||
}
|
||||
case 'blk1': {
|
||||
J3DAnmKeyLoader_v15 loader;
|
||||
loader.mAnm = JKR_NEW J3DAnmClusterKey();
|
||||
loader.mAnm = new J3DAnmClusterKey();
|
||||
return loader.load(i_data);
|
||||
}
|
||||
case 'btk1': {
|
||||
J3DAnmKeyLoader_v15 loader;
|
||||
loader.mAnm = JKR_NEW J3DAnmTextureSRTKey();
|
||||
loader.mAnm = new J3DAnmTextureSRTKey();
|
||||
return loader.load(i_data);
|
||||
}
|
||||
case 'brk1': {
|
||||
J3DAnmKeyLoader_v15 loader;
|
||||
loader.mAnm = JKR_NEW J3DAnmTevRegKey();
|
||||
loader.mAnm = new J3DAnmTevRegKey();
|
||||
return loader.load(i_data);
|
||||
}
|
||||
case 'bxk1': {
|
||||
J3DAnmKeyLoader_v15 loader;
|
||||
loader.mAnm = JKR_NEW J3DAnmVtxColorKey();
|
||||
loader.mAnm = new J3DAnmVtxColorKey();
|
||||
return loader.load(i_data);
|
||||
}
|
||||
case 'bca1': {
|
||||
J3DAnmFullLoader_v15 loader;
|
||||
|
||||
if (flag & J3DLOADER_UNK_FLAG1) {
|
||||
loader.mAnm = JKR_NEW J3DAnmTransformFullWithLerp();
|
||||
loader.mAnm = new J3DAnmTransformFullWithLerp();
|
||||
} else {
|
||||
loader.mAnm = JKR_NEW J3DAnmTransformFull();
|
||||
loader.mAnm = new J3DAnmTransformFull();
|
||||
}
|
||||
|
||||
return loader.load(i_data);
|
||||
}
|
||||
case 'bpa1': {
|
||||
J3DAnmFullLoader_v15 loader;
|
||||
loader.mAnm = JKR_NEW J3DAnmColorFull();
|
||||
loader.mAnm = new J3DAnmColorFull();
|
||||
return loader.load(i_data);
|
||||
}
|
||||
case 'btp1': {
|
||||
J3DAnmFullLoader_v15 loader;
|
||||
loader.mAnm = JKR_NEW J3DAnmTexPattern();
|
||||
loader.mAnm = new J3DAnmTexPattern();
|
||||
return loader.load(i_data);
|
||||
}
|
||||
case 'bva1': {
|
||||
J3DAnmFullLoader_v15 loader;
|
||||
loader.mAnm = JKR_NEW J3DAnmVisibilityFull();
|
||||
loader.mAnm = new J3DAnmVisibilityFull();
|
||||
return loader.load(i_data);
|
||||
}
|
||||
case 'bla1': {
|
||||
J3DAnmFullLoader_v15 loader;
|
||||
loader.mAnm = JKR_NEW J3DAnmClusterFull();
|
||||
loader.mAnm = new J3DAnmClusterFull();
|
||||
return loader.load(i_data);
|
||||
}
|
||||
case 'bxa1': {
|
||||
J3DAnmFullLoader_v15 loader;
|
||||
loader.mAnm = JKR_NEW J3DAnmVtxColorFull();
|
||||
loader.mAnm = new J3DAnmVtxColorFull();
|
||||
return loader.load(i_data);
|
||||
}
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user