mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-01 03:20:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix J3DTransformInfo array ctor

Browse Source
This commit is contained in:
LagoLunatic
2023-10-18 14:46:05 -04:00
parent 3cd46d49ac
commit 2486016599
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphBase/J3DTransform.h
+15 -2
View File
@@ -6,10 +6,23 @@
struct J3DTextureSRTInfo;
// struct J3DTransformInfo {
// /* 0x00 */ JGeometry::TVec3<f32> mScale;
// /* 0x0C */ JGeometry::TVec3<s16> mRotation;
// /* 0x14 */ JGeometry::TVec3<f32> mTranslate;
// }; // Size: 0x20
// I doubt this is right but it seems like the only way to prevent an empty ctor being added on array construction
struct J3DTransformInfo {
/* 0x00 */ JGeometry::TVec3<f32> mScale;
/* 0x00 */ Vec mScale;
/* 0x0C */ JGeometry::TVec3<s16> mRotation;
/* 0x14 */ JGeometry::TVec3<f32> mTranslate;
/* 0x14 */ Vec mTranslate;
inline J3DTransformInfo& operator=(const J3DTransformInfo& b) {
mScale = b.mScale;
mRotation = b.mRotation;
mTranslate = b.mTranslate;
return *this;
}
}; // Size: 0x20
extern J3DTransformInfo const j3dDefaultTransformInfo;
src/m_Do/m_Do_ext.cpp
+4 -5
View File
@@ -1152,7 +1152,6 @@ void mDoExt_MtxCalcOldFrame::decOldFrameMorfCounter() {
/* 80012650-800129E4 .text __ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl */
mDoExt_McaMorf::mDoExt_McaMorf(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* callback1, mDoExt_McaMorfCallBack2_c* callback2, J3DAnmTransform* anmTransform, int param_4, f32 param_5, int param_6, int param_7, int param_8, void* param_9, u32 param_10, u32 param_11) {
/* Nonmatching - JGeometry::TVec3<f32> ctor */
mpModel = NULL;
mpSound = NULL;
mpTransformInfo = NULL;
@@ -1510,10 +1509,10 @@ void mDoExt_3DlineMat1_c::update(u16, _GXColor&, dKy_tevstr_c*) {
JUT_ASSERT(5243, size_p != 0);
}
/* 80016518-8001657C .text setMat__26mDoExt_3DlineMatSortPacketFP18mDoExt_3DlineMat_c */
void mDoExt_3DlineMatSortPacket::setMat(mDoExt_3DlineMat_c*) {
/* Nonmatching */
}
// /* 80016518-8001657C .text setMat__26mDoExt_3DlineMatSortPacketFP18mDoExt_3DlineMat_c */
// void mDoExt_3DlineMatSortPacket::setMat(mDoExt_3DlineMat_c*) {
// /* Nonmatching */
// }
/* 8001657C-800165E4 .text draw__26mDoExt_3DlineMatSortPacketFv */
void mDoExt_3DlineMatSortPacket::draw() {