Match & link CMatrix3f

This commit is contained in:
Luke Street
2026-03-02 12:05:33 -07:00
parent e1e57985e4
commit 471781b6d3
4 changed files with 63 additions and 71 deletions
+54 -55
View File
@@ -12430,29 +12430,29 @@ NonConstCopy__28TToken<18CAnimationDatabase>CFv = .text:0x802D6DF0; // type:func
GetMetaAnimation__17CAnimationManagerCFUi = .text:0x802D6E10; // type:function size:0x80 scope:global
GetAnimationTree__17CAnimationManagerCFUiRC24CMetaAnimTreeBuildOrders = .text:0x802D6E90; // type:function size:0xA8 scope:global
StreamAnimResIdEventResIdList__13CAnimationSetFUsR12CInputStream = .text:0x802D6F38; // type:function size:0x48 scope:global
__ct__Q24rstl52vector<Q24rstl9pair<i,i>,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator = .text:0x802D6F80; // type:function size:0xD4 scope:global
__ct__Q24rstl52vector<Q24rstl9pair<i,i>,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator = .text:0x802D6F80; // type:function size:0xD4 scope:weak
StreamHalfTransitions__13CAnimationSetFUsR12CInputStream = .text:0x802D7054; // type:function size:0x48 scope:global
__ct__Q24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator = .text:0x802D709C; // type:function size:0x104 scope:global
Get<15CHalfTransition>__12CInputStreamFRC24TType<15CHalfTransition> = .text:0x802D71A0; // type:function size:0x3C scope:global
cinput_stream_helper<15CHalfTransition>__FRC24TType<15CHalfTransition>R12CInputStream = .text:0x802D71DC; // type:function size:0x24 scope:global
__ct__Q24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator = .text:0x802D709C; // type:function size:0x104 scope:weak
Get<15CHalfTransition>__12CInputStreamFRC24TType<15CHalfTransition> = .text:0x802D71A0; // type:function size:0x3C scope:local
cinput_stream_helper<15CHalfTransition>__FRC24TType<15CHalfTransition>R12CInputStream = .text:0x802D71DC; // type:function size:0x24 scope:weak
StreamDefaultAdditiveAnimInfo__13CAnimationSetFUsR12CInputStream = .text:0x802D7200; // type:function size:0x68 scope:global
StreamAdditiveAnimInfoList__13CAnimationSetFUsR12CInputStream = .text:0x802D7268; // type:function size:0x48 scope:global
__ct__Q24rstl77vector<Q24rstl33pair<Ui,22CAdditiveAnimationInfo>,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator = .text:0x802D72B0; // type:function size:0xE8 scope:global
Get<Q24rstl33pair<Ui,22CAdditiveAnimationInfo>>__12CInputStreamFRC49TType<Q24rstl33pair<Ui,22CAdditiveAnimationInfo>> = .text:0x802D7398; // type:function size:0x68 scope:global
__ct__Q24rstl77vector<Q24rstl33pair<Ui,22CAdditiveAnimationInfo>,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator = .text:0x802D72B0; // type:function size:0xE8 scope:weak
Get<Q24rstl33pair<Ui,22CAdditiveAnimationInfo>>__12CInputStreamFRC49TType<Q24rstl33pair<Ui,22CAdditiveAnimationInfo>> = .text:0x802D7398; // type:function size:0x68 scope:local
__ct__13CAnimationSetFR12CInputStream = .text:0x802D7400; // type:function size:0x35C scope:global
__dt__Q24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>Fv = .text:0x802D775C; // type:function size:0xB4 scope:global
__dt__Q24rstl48vector<11CTransition,Q24rstl17rmemory_allocator>Fv = .text:0x802D7810; // type:function size:0xB4
__ct__Q24rstl48vector<11CTransition,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator = .text:0x802D78C4; // type:function size:0x114 scope:global
Get<11CTransition>__12CInputStreamFRC20TType<11CTransition> = .text:0x802D79D8; // type:function size:0x3C scope:global
cinput_stream_helper<11CTransition>__FRC20TType<11CTransition>R12CInputStream = .text:0x802D7A14; // type:function size:0x24 scope:global
__dt__Q24rstl47vector<10CAnimation,Q24rstl17rmemory_allocator>Fv = .text:0x802D7A38; // type:function size:0xC4
__ct__Q24rstl47vector<10CAnimation,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator = .text:0x802D7AFC; // type:function size:0x110 scope:global
Get<10CAnimation>__12CInputStreamFRC19TType<10CAnimation> = .text:0x802D7C0C; // type:function size:0x3C scope:global
cinput_stream_helper<10CAnimation>__FRC19TType<10CAnimation>R12CInputStream = .text:0x802D7C48; // type:function size:0x24 scope:global
reserve__Q24rstl47vector<10CAnimation,Q24rstl17rmemory_allocator>Fi = .text:0x802D7C6C; // type:function size:0x124 scope:global
reserve__Q24rstl48vector<11CTransition,Q24rstl17rmemory_allocator>Fi = .text:0x802D7D90; // type:function size:0x11C scope:global
reserve__Q24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>Fi = .text:0x802D7EAC; // type:function size:0x10C scope:global
reserve__Q24rstl77vector<Q24rstl33pair<Ui,22CAdditiveAnimationInfo>,Q24rstl17rmemory_allocator>Fi = .text:0x802D7FB8; // type:function size:0x100 scope:global
__dt__Q24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>Fv = .text:0x802D775C; // type:function size:0xB4 scope:weak
__dt__Q24rstl48vector<11CTransition,Q24rstl17rmemory_allocator>Fv = .text:0x802D7810; // type:function size:0xB4 scope:weak
__ct__Q24rstl48vector<11CTransition,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator = .text:0x802D78C4; // type:function size:0x114 scope:weak
Get<11CTransition>__12CInputStreamFRC20TType<11CTransition> = .text:0x802D79D8; // type:function size:0x3C scope:local
cinput_stream_helper<11CTransition>__FRC20TType<11CTransition>R12CInputStream = .text:0x802D7A14; // type:function size:0x24 scope:weak
__dt__Q24rstl47vector<10CAnimation,Q24rstl17rmemory_allocator>Fv = .text:0x802D7A38; // type:function size:0xC4 scope:weak
__ct__Q24rstl47vector<10CAnimation,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator = .text:0x802D7AFC; // type:function size:0x110 scope:weak
Get<10CAnimation>__12CInputStreamFRC19TType<10CAnimation> = .text:0x802D7C0C; // type:function size:0x3C scope:local
cinput_stream_helper<10CAnimation>__FRC19TType<10CAnimation>R12CInputStream = .text:0x802D7C48; // type:function size:0x24 scope:weak
reserve__Q24rstl47vector<10CAnimation,Q24rstl17rmemory_allocator>Fi = .text:0x802D7C6C; // type:function size:0x124 scope:weak
reserve__Q24rstl48vector<11CTransition,Q24rstl17rmemory_allocator>Fi = .text:0x802D7D90; // type:function size:0x11C scope:weak
reserve__Q24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>Fi = .text:0x802D7EAC; // type:function size:0x10C scope:weak
reserve__Q24rstl77vector<Q24rstl33pair<Ui,22CAdditiveAnimationInfo>,Q24rstl17rmemory_allocator>Fi = .text:0x802D7FB8; // type:function size:0x100 scope:weak
FAnimCharacterSet__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer = .text:0x802D80B8; // type:function size:0x64 scope:global
__ct<17CAnimCharacterSet>__16CFactoryFnReturnFP17CAnimCharacterSet = .text:0x802D811C; // type:function size:0xA4
fn_802D81C0 = .text:0x802D81C0; // type:function size:0x90
@@ -13229,7 +13229,7 @@ reserve__Q24rstl47vector<10CTextColor,Q24rstl17rmemory_allocator>Fi = .text:0x80
__dt__26CLineExtraSpaceInstructionFv = .text:0x802FF80C; // type:function size:0x5C scope:weak
PageInvoke__26CLineExtraSpaceInstructionCFR16CFontRenderStateP17CTextRenderBuffer = .text:0x802FF868; // type:function size:0x2C scope:global
Invoke__26CLineExtraSpaceInstructionCFR16CFontRenderStateP17CTextRenderBuffer = .text:0x802FF894; // type:function size:0xC scope:global
__dt__16CLineInstructionFv = .text:0x802FF8A0; // type:function size:0x5C scope:global
__dt__16CLineInstructionFv = .text:0x802FF8A0; // type:function size:0x5C scope:weak
GetBaseline__16CLineInstructionCFv = .text:0x802FF8FC; // type:function size:0x38 scope:global
GetHeight__16CLineInstructionCFv = .text:0x802FF934; // type:function size:0x38 scope:global
TestLargestImage__16CLineInstructionFiii = .text:0x802FF96C; // type:function size:0x38 scope:global
@@ -15188,7 +15188,7 @@ __ct__20CElectricDescriptionFv = .text:0x80366AA0; // type:function size:0x58 sc
__dt__18CSwooshDescriptionFv = .text:0x80366AF8; // type:function size:0x26C scope:global
__ct__18CSwooshDescriptionFv = .text:0x80366D64; // type:function size:0xD4 scope:global
__dt__15CGenDescriptionFv = .text:0x80366E38; // type:function size:0x1DC scope:global
__dt__Q24rstl38single_ptr<24CSpawnSystemKeyframeData>Fv = .text:0x80367014; // type:function size:0x58 scope:global
__dt__Q24rstl38single_ptr<24CSpawnSystemKeyframeData>Fv = .text:0x80367014; // type:function size:0x58 scope:weak
__ct__15CGenDescriptionFv = .text:0x8036706C; // type:function size:0x1C8 scope:global
element_from_desc__FP15CGenDescriptioni = .text:0x80367234; // type:function size:0x8 scope:local
EnsureWorldPakReady__8CPakFileFv = .text:0x8036723C; // type:function size:0x1F0 scope:global
@@ -17335,7 +17335,7 @@ lbl_803D1A80 = .rodata:0x803D1A80; // type:object size:0x7 data:string
lbl_803D1A87 = .rodata:0x803D1A87; // type:object size:0x9 data:string
lbl_803D1A90 = .rodata:0x803D1A90; // type:object size:0x10
lbl_803D1AA0 = .rodata:0x803D1AA0; // type:object size:0x7 data:string
lbl_803D1AA8 = .rodata:0x803D1AA8; // type:object size:0xB data:string
@stringBase0 = .rodata:0x803D1AA8; // type:object size:0xB scope:local data:string
lbl_803D1AB8 = .rodata:0x803D1AB8; // type:object size:0xB data:string
@stringBase0 = .rodata:0x803D1AC8; // type:object size:0xB scope:local data:string_table
lbl_803D1AD8 = .rodata:0x803D1AD8; // type:object size:0x88
@@ -17749,7 +17749,7 @@ lbl_803D68F8 = .rodata:0x803D68F8; // type:object size:0x50
@stringBase0 = .rodata:0x803D69B0; // type:object size:0x11 scope:local data:string_table
lbl_803D69C8 = .rodata:0x803D69C8; // type:object size:0x18 data:4byte
lbl_803D69E0 = .rodata:0x803D69E0; // type:object size:0x7 data:string
lbl_803D69E8 = .rodata:0x803D69E8; // type:object size:0x11 data:string
@stringBase0 = .rodata:0x803D69E8; // type:object size:0x11 scope:local data:string
@stringBase0 = .rodata:0x803D6A00; // type:object size:0x1C scope:local data:string_table
@stringBase0 = .rodata:0x803D6A20; // type:object size:0x23 scope:local data:string_table
@stringBase0 = .rodata:0x803D6A48; // type:object size:0x7 scope:local data:string_table
@@ -17760,7 +17760,7 @@ lbl_803D6A78 = .rodata:0x803D6A78; // type:object size:0x18 align:8 data:double
@stringBase0 = .rodata:0x803D6A90; // type:object size:0x18 scope:local data:string_table
kUnknownType__10CCallStack = .rodata:0x803D6AA8; // type:object size:0xD scope:global
@stringBase0 = .rodata:0x803D6AB8; // type:object size:0x26F scope:local data:string_table
lbl_803D6D28 = .rodata:0x803D6D28; // type:object size:0x7 data:string
@stringBase0 = .rodata:0x803D6D28; // type:object size:0x7 scope:local data:string
lbl_803D6D30 = .rodata:0x803D6D30; // type:object size:0x7 data:string
lbl_803D6D38 = .rodata:0x803D6D38; // type:object size:0x8
lbl_803D6D40 = .rodata:0x803D6D40; // type:object size:0x8
@@ -18544,7 +18544,7 @@ lbl_803E5318 = .data:0x803E5318; // type:object size:0x70
lbl_803E5388 = .data:0x803E5388; // type:object size:0x2CC
jumptable_803E5654 = .data:0x803E5654; // type:object size:0xC4 scope:local
lbl_803E5718 = .data:0x803E5718; // type:object size:0x10
jumptable_803E5728 = .data:0x803E5728; // type:object size:0x20 scope:local
@698 = .data:0x803E5728; // type:object size:0x20 scope:local
__vt__15CTweakGuiColors = .data:0x803E5748; // type:object size:0xC scope:global
lbl_803E5758 = .data:0x803E5758; // type:object size:0x6C
lbl_803E57C4 = .data:0x803E57C4; // type:object size:0x6C
@@ -18842,7 +18842,7 @@ __vt__25CColorOverrideInstruction = .data:0x803ED5D0; // type:object size:0x1C s
__vt__16CFontInstruction = .data:0x803ED5F0; // type:object size:0x1C
__vt__26CLineExtraSpaceInstruction = .data:0x803ED610; // type:object size:0x1C scope:global
__vt__16CLineInstruction = .data:0x803ED630; // type:object size:0x1C
jumptable_803ED64C = .data:0x803ED64C; // type:object size:0x28 scope:local
@494 = .data:0x803ED64C; // type:object size:0x28 scope:local
__vt__23CLineSpacingInstruction = .data:0x803ED678; // type:object size:0x1C scope:global
__vt__20CPopStateInstruction = .data:0x803ED698; // type:object size:0x1C scope:global
__vt__21CPushStateInstruction = .data:0x803ED6B8; // type:object size:0x1C scope:global
@@ -21331,7 +21331,7 @@ lbl_805A86D4 = .sdata:0x805A86D4; // type:object size:0x4 align:4 data:float
@311 = .sdata:0x805A86D8; // type:object size:0x4 scope:local
@325 = .sdata:0x805A86DC; // type:object size:0x4 scope:local align:4 data:float
lbl_805A86E0 = .sdata:0x805A86E0; // type:object size:0x8 align:4 data:float
sTableIndex__16CCollidableAABox = .sdata:0x805A86E8; // type:object size:0x8 scope:global data:4byte
sTableIndex__16CCollidableAABox = .sdata:0x805A86E8; // type:object size:0x4 scope:global data:4byte
sTableIndex__27CCollidableCollisionSurface = .sdata:0x805A86F0; // type:object size:0x4 scope:global data:4byte
sTableIndex__17CCollidableSphere = .sdata:0x805A86F8; // type:object size:0x8 data:4byte
lbl_805A8700 = .sdata:0x805A8700; // type:object size:0x4 data:4byte
@@ -21981,13 +21981,13 @@ mGlobalTimer__10CStopwatch = .sbss:0x805A9238; // type:object size:0x8 scope:glo
gInitialized = .sbss:0x805A9240; // type:object size:0x1 scope:local data:byte
CallFatal = .sbss:0x805A9248; // type:object size:0x1 scope:local data:byte
rs_debugger_buffer_size = .sbss:0x805A924C; // type:object size:0x4 scope:local data:4byte
lbl_805A9250 = .sbss:0x805A9250; // type:object size:0x1 data:byte
lbl_805A9254 = .sbss:0x805A9254; // type:object size:0x1 data:byte
lbl_805A9258 = .sbss:0x805A9258; // type:object size:0x1 data:byte
lbl_805A925C = .sbss:0x805A925C; // type:object size:0x1 data:byte
lbl_805A9260 = .sbss:0x805A9260; // type:object size:0x1 data:byte
lbl_805A9264 = .sbss:0x805A9264; // type:object size:0x1 data:byte
lbl_805A9268 = .sbss:0x805A9268; // type:object size:0x8 data:byte
@105 = .sbss:0x805A9250; // type:object size:0x1 scope:local data:byte
@120 = .sbss:0x805A9254; // type:object size:0x1 scope:local data:byte
@167 = .sbss:0x805A9258; // type:object size:0x1 scope:local data:byte
@177 = .sbss:0x805A925C; // type:object size:0x1 scope:local data:byte
@372 = .sbss:0x805A9260; // type:object size:0x1 scope:local data:byte
@429 = .sbss:0x805A9264; // type:object size:0x1 scope:local data:byte
@439 = .sbss:0x805A9268; // type:object size:0x1 scope:local data:byte
lbl_805A9270 = .sbss:0x805A9270; // type:object size:0x1 data:byte
lbl_805A9274 = .sbss:0x805A9274; // type:object size:0x1 data:byte
lbl_805A9278 = .sbss:0x805A9278; // type:object size:0x1 data:byte
@@ -24218,10 +24218,10 @@ lbl_805ABA30 = .sdata2:0x805ABA30; // type:object size:0x4 align:4 data:float
lbl_805ABA34 = .sdata2:0x805ABA34; // type:object size:0x4 align:4 data:float
lbl_805ABA38 = .sdata2:0x805ABA38; // type:object size:0x4 align:4 data:float
lbl_805ABA3C = .sdata2:0x805ABA3C; // type:object size:0x4 align:4 data:float
lbl_805ABA40 = .sdata2:0x805ABA40; // type:object size:0x4 align:4 data:float
lbl_805ABA44 = .sdata2:0x805ABA44; // type:object size:0x4 align:4 data:float
lbl_805ABA48 = .sdata2:0x805ABA48; // type:object size:0x4 align:4 data:float
lbl_805ABA50 = .sdata2:0x805ABA50; // type:object size:0x8 align:8 data:double
@556 = .sdata2:0x805ABA40; // type:object size:0x4 scope:local align:4 data:float
@557 = .sdata2:0x805ABA44; // type:object size:0x4 scope:local align:4 data:float
@573 = .sdata2:0x805ABA48; // type:object size:0x4 scope:local align:4 data:float
@574 = .sdata2:0x805ABA50; // type:object size:0x8 scope:local align:8 data:double
@419 = .sdata2:0x805ABA58; // type:object size:0x4 scope:local align:4 data:float
@523 = .sdata2:0x805ABA5C; // type:object size:0x4 scope:local align:4 data:float
@524 = .sdata2:0x805ABA60; // type:object size:0x4 scope:local align:4 data:float
@@ -25024,9 +25024,9 @@ lbl_805AC87C = .sdata2:0x805AC87C; // type:object size:0x4 align:4 data:float
lbl_805AC880 = .sdata2:0x805AC880; // type:object size:0x4 align:4 data:float
lbl_805AC884 = .sdata2:0x805AC884; // type:object size:0x4 align:4 data:float
lbl_805AC888 = .sdata2:0x805AC888; // type:object size:0x8 align:4 data:float
@520 = .sdata2:0x805AC890; // type:object size:0x4 align:4 data:float
@653 = .sdata2:0x805AC894; // type:object size:0x4 align:4 data:float
@654 = .sdata2:0x805AC898; // type:object size:0x4 align:4 data:float
@563 = .sdata2:0x805AC890; // type:object size:0x4 scope:local align:4 data:float
@696 = .sdata2:0x805AC894; // type:object size:0x4 scope:local align:4 data:float
@697 = .sdata2:0x805AC898; // type:object size:0x4 scope:local align:4 data:float
lbl_805AC8A0 = .sdata2:0x805AC8A0; // type:object size:0x4 align:4 data:float
lbl_805AC8A4 = .sdata2:0x805AC8A4; // type:object size:0x4 align:4 data:float
lbl_805AC8A8 = .sdata2:0x805AC8A8; // type:object size:0x8 align:4 data:float
@@ -26441,10 +26441,10 @@ lbl_805AE188 = .sdata2:0x805AE188; // type:object size:0x8 align:8 data:double
@112 = .sdata2:0x805AE190; // type:object size:0x4 scope:local align:4 data:float
@113 = .sdata2:0x805AE194; // type:object size:0x4 scope:local align:4 data:float
@114 = .sdata2:0x805AE198; // type:object size:0x4 scope:local align:4 data:float
lbl_805AE1A0 = .sdata2:0x805AE1A0; // type:object size:0x4 align:4 data:float
lbl_805AE1A4 = .sdata2:0x805AE1A4; // type:object size:0x4 align:4 data:float
lbl_805AE1A8 = .sdata2:0x805AE1A8; // type:object size:0x4 align:4 data:float
lbl_805AE1B0 = .sdata2:0x805AE1B0; // type:object size:0x8 align:8 data:double
@469 = .sdata2:0x805AE1A0; // type:object size:0x4 scope:local align:4 data:float
@470 = .sdata2:0x805AE1A4; // type:object size:0x4 scope:local align:4 data:float
@471 = .sdata2:0x805AE1A8; // type:object size:0x4 scope:local align:4 data:float
@614 = .sdata2:0x805AE1B0; // type:object size:0x8 scope:local align:8 data:double
@226 = .sdata2:0x805AE1B8; // type:object size:0x4 scope:local align:4 data:float
lbl_805AE1C0 = .sdata2:0x805AE1C0; // type:object size:0x8 align:8 data:double
lbl_805AE1C8 = .sdata2:0x805AE1C8; // type:object size:0x8 align:8 data:double
@@ -26486,7 +26486,7 @@ lbl_805AE268 = .sdata2:0x805AE268; // type:object size:0x8 align:4 data:float
bg = .sdata2:0x805AE2A0; // type:object size:0x4 scope:local data:4byte
fg = .sdata2:0x805AE2A4; // type:object size:0x4 scope:local data:4byte
ExitButtons = .sdata2:0x805AE2A8; // type:object size:0x4 scope:local data:4byte
lbl_805AE2B0 = .sdata2:0x805AE2B0; // type:object size:0x8 align:4 data:float
@611 = .sdata2:0x805AE2B0; // type:object size:0x4 scope:local align:4 data:float
lbl_805AE2B8 = .sdata2:0x805AE2B8; // type:object size:0x4 align:4 data:float
lbl_805AE2BC = .sdata2:0x805AE2BC; // type:object size:0x4 align:4 data:float
lbl_805AE2C0 = .sdata2:0x805AE2C0; // type:object size:0x8 align:4 data:float
@@ -26620,8 +26620,8 @@ kHasNormals = .sdata2:0x805AE52C; // type:object size:0x1 scope:local data:byte
@1116 = .sdata2:0x805AE55C; // type:object size:0x4 scope:local align:4 data:float
@1118 = .sdata2:0x805AE560; // type:object size:0x8 scope:local align:8 data:double
@218 = .sdata2:0x805AE568; // type:object size:0x4 scope:local align:4 data:float
lbl_805AE570 = .sdata2:0x805AE570; // type:object size:0x4 align:4 data:float
lbl_805AE574 = .sdata2:0x805AE574; // type:object size:0x4 align:4 data:float
@359 = .sdata2:0x805AE570; // type:object size:0x4 scope:local align:4 data:float
@360 = .sdata2:0x805AE574; // type:object size:0x4 scope:local align:4 data:float
lbl_805AE578 = .sdata2:0x805AE578; // type:object size:0x4 align:4 data:float
lbl_805AE57C = .sdata2:0x805AE57C; // type:object size:0x4 align:4 data:float
lbl_805AE580 = .sdata2:0x805AE580; // type:object size:0x4 align:4 data:float
@@ -26776,11 +26776,11 @@ lbl_805AE86C = .sdata2:0x805AE86C; // type:object size:0x4 align:4 data:float
@1836 = .sdata2:0x805AE898; // type:object size:0x4 scope:local align:4 data:float
@231 = .sdata2:0x805AE8A0; // type:object size:0x4 scope:local align:4 data:float
@232 = .sdata2:0x805AE8A4; // type:object size:0x4 scope:local align:4 data:float
lbl_805AE8A8 = .sdata2:0x805AE8A8; // type:object size:0x4 align:4 data:float
lbl_805AE8AC = .sdata2:0x805AE8AC; // type:object size:0x4 align:4 data:float
lbl_805AE8B0 = .sdata2:0x805AE8B0; // type:object size:0x4 align:4 data:float
lbl_805AE8B4 = .sdata2:0x805AE8B4; // type:object size:0x4 align:4 data:float
lbl_805AE8B8 = .sdata2:0x805AE8B8; // type:object size:0x8 align:4 data:float
@664 = .sdata2:0x805AE8A8; // type:object size:0x4 scope:local align:4 data:float
@740 = .sdata2:0x805AE8AC; // type:object size:0x4 scope:local align:4 data:float
@782 = .sdata2:0x805AE8B0; // type:object size:0x4 scope:local align:4 data:float
@2138 = .sdata2:0x805AE8B4; // type:object size:0x4 scope:local align:4 data:float
@2139 = .sdata2:0x805AE8B8; // type:object size:0x4 scope:local align:4 data:float
lbl_805AE8C0 = .sdata2:0x805AE8C0; // type:object size:0x8 data:4byte
kInvalidAlloc__12CARAMManager = .sdata2:0x805AE8C8; // type:object size:0x4 scope:global data:4byte
kInvalidHandle__12CARAMManager = .sdata2:0x805AE8CC; // type:object size:0x4 scope:global data:4byte
@@ -27267,8 +27267,7 @@ lbl_805AF490 = .sbss2:0x805AF490; // type:object size:0x4 data:4byte
lbl_805AF494 = .sbss2:0x805AF494; // type:object size:0x4 data:4byte
lbl_805AF498 = .sbss2:0x805AF498; // type:object size:0x8 data:4byte
@223 = .sbss2:0x805AF4A0; // type:object size:0x4 scope:local data:4byte
lbl_805AF4A8 = .sbss2:0x805AF4A8; // type:object size:0x4 data:4byte
lbl_805AF4AC = .sbss2:0x805AF4AC; // type:object size:0x4 data:4byte
@384 = .sbss2:0x805AF4A8; // type:object size:0x8 scope:local data:4byte
lbl_805AF4B0 = .sbss2:0x805AF4B0; // type:object size:0x4 data:4byte
lbl_805AF4B4 = .sbss2:0x805AF4B4; // type:object size:0x4 data:4byte
lbl_805AF4B8 = .sbss2:0x805AF4B8; // type:object size:0x4 data:4byte
+1 -1
View File
@@ -1478,7 +1478,7 @@ config.libs = [
"Kyoto/Graphics/DolphinCTexture.cpp",
),
Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Math/CloseEnough.cpp"),
Object(NonMatching, "Kyoto/Math/CMatrix3f.cpp"),
Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Math/CMatrix3f.cpp"),
Object(Equivalent, "Kyoto/Math/CMatrix4f.cpp"),
Object(NonMatching, "Kyoto/Math/CQuaternion.cpp"),
Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/CRandom16.cpp"),
-4
View File
@@ -87,7 +87,6 @@ public:
static CMatrix3f FromTransform(const CTransform4f& xf);
private:
// TODO maybe individual floats
float m00;
float m01;
float m02;
@@ -97,9 +96,6 @@ private:
float m20;
float m21;
float m22;
// CVector3f m0;
// CVector3f m1;
// CVector3f m2;
};
CHECK_SIZEOF(CMatrix3f, 0x24);
+8 -11
View File
@@ -73,17 +73,14 @@ const CVector3f CMatrix3f::operator*(const CVector3f& vec) const {
}
const CMatrix3f CMatrix3f::operator*(const CMatrix3f& other) const {
const float _m00 = other.m00 * m00 + other.m10 * m01 + other.m20 * m02;
const float _m01 = other.m01 * m00 + other.m11 * m01 + other.m21 * m02;
const float _m20 = other.m00 * m20 + other.m10 * m21 + other.m20 * m22;
const float _m21 = other.m01 * m20 + other.m11 * m21 + other.m21 * m22;
const float _m02 = other.m02 * m00 + other.m12 * m01 + other.m22 * m02;
const float _m10 = other.m00 * m10 + other.m10 * m11 + other.m20 * m12;
const float _m11 = other.m01 * m10 + other.m11 * m11 + other.m21 * m12;
const float _m12 = other.m02 * m10 + other.m12 * m11 + other.m22 * m12;
const float _m22 = other.m02 * m20 + other.m12 * m21 + other.m22 * m22;
return CMatrix3f(_m00, _m01, _m02, _m10, _m11, _m12, _m20, _m21, _m22);
const float b00 = other.m00, b01 = other.m01, b02 = other.m02;
const float b10 = other.m10, b11 = other.m11, b12 = other.m12;
const float b20 = other.m20, b21 = other.m21, b22 = other.m22;
return CMatrix3f(m00 * b00 + m01 * b10 + m02 * b20, m00 * b01 + m01 * b11 + m02 * b21,
m00 * b02 + m01 * b12 + m02 * b22, m10 * b00 + m11 * b10 + m12 * b20,
m10 * b01 + m11 * b11 + m12 * b21, m10 * b02 + m11 * b12 + m12 * b22,
m20 * b00 + m21 * b10 + m22 * b20, m20 * b01 + m21 * b11 + m22 * b21,
m20 * b02 + m21 * b12 + m22 * b22);
}
float CMatrix3f::Determinant() const {