lyt_bounding OK

This commit is contained in:
elijah-thomas774
2024-05-31 20:28:32 -04:00
parent 217c03e5b8
commit b9b7f68da7
6 changed files with 36 additions and 6 deletions
+6
View File
@@ -360,6 +360,12 @@ nw4r/lyt/lyt_window.cpp:
.sbss start:0x80576710 end:0x80576714
.sdata2 start:0x8057F268 end:0x8057F280
nw4r/lyt/lyt_bounding.cpp:
.text start:0x8048D700 end:0x8048D7CC
.ctors start:0x804DB984 end:0x804DB988
.data start:0x8056E6C0 end:0x8056E734
.sbss start:0x80576718 end:0x8057671C
nw4r/lyt/lyt_resourceAccessor.cpp:
.text start:0x80492000 end:0x80492058
.data start:0x8056E7E0 end:0x8056E7F8
+3 -3
View File
@@ -25968,7 +25968,7 @@ __ct__Q34nw4r3lyt8BoundingFPCQ44nw4r3lyt3res8BoundingRCQ34nw4r3lyt11ResBlockSet
__dt__Q34nw4r3lyt8BoundingFv = .text:0x8048D740; // type:function size:0x58
DrawSelf__Q34nw4r3lyt8BoundingFRCQ34nw4r3lyt8DrawInfo = .text:0x8048D7A0; // type:function size:0x4
GetRuntimeTypeInfo__Q34nw4r3lyt8BoundingCFv = .text:0x8048D7B0; // type:function size:0x8 scope:weak
__sinit_lyt_bounding_cpp = .text:0x8048D7C0; // type:function size:0xC
__sinit_\lyt_bounding_cpp = .text:0x8048D7C0; // type:function size:0xC scope:local
CalcTextureMtx__Q34nw4r3lyt26@unnamed@lyt_material_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3lyt6TexSRT = .text:0x8048D7D0; // type:function size:0x108
SetIndTexMtx__Q34nw4r3lyt26@unnamed@lyt_material_cpp@F14_GXIndTexMtxIDPA3_Cf = .text:0x8048D8E0; // type:function size:0x200
__as__Q34nw4r4math4VEC2FRCQ34nw4r4math4VEC2 = .text:0x8048DAE0; // type:function size:0x14
@@ -37079,7 +37079,7 @@ __vt__Q34nw4r3lyt7Picture = .data:0x8056E4F8; // type:object size:0x78
__vt__Q34nw4r3lyt7TextBox = .data:0x8056E570; // type:object size:0x84
@LOCAL@GetTextureFlipInfo__Q34nw4r3lyt24@unnamed@lyt_window_cpp@FUc@flipInfos = .data:0x8056E5F8; // type:object size:0x3C
__vt__Q34nw4r3lyt6Window = .data:0x8056E634; // type:object size:0x8C
lbl_8056E6C0 = .data:0x8056E6C0; // type:object size:0x78
__vt__Q34nw4r3lyt8Bounding = .data:0x8056E6C0; // type:object size:0x74
lbl_8056E738 = .data:0x8056E738; // type:object size:0x20 data:4byte
lbl_8056E758 = .data:0x8056E758; // type:object size:0x20 data:4byte
lbl_8056E778 = .data:0x8056E778; // type:object size:0x30
@@ -40880,7 +40880,7 @@ mspAllocator__Q34nw4r3lyt6Layout = .sbss:0x805766F8; // type:object size:0x4 dat
typeInfo__Q34nw4r3lyt7Picture = .sbss:0x80576700; // type:object size:0x4 data:4byte
typeInfo__Q34nw4r3lyt7TextBox = .sbss:0x80576708; // type:object size:0x4 data:4byte
typeInfo__Q34nw4r3lyt6Window = .sbss:0x80576710; // type:object size:0x4 data:4byte
lbl_80576718 = .sbss:0x80576718; // type:object size:0x4 data:4byte
typeInfo__Q34nw4r3lyt8Bounding = .sbss:0x80576718; // type:object size:0x4 data:4byte
@GUARD@SetSize__Q44nw4r3lyt6detail11TexCoordAryFUc@texCoords = .sbss:0x80576720; // type:object size:0x1 data:byte
lbl_80576728 = .sbss:0x80576728; // type:object size:0x8 data:byte
lbl_80576730 = .sbss:0x80576730; // type:object size:0x8 data:byte
+1
View File
@@ -359,6 +359,7 @@ config.libs = [
Object(Matching, "nw4r/lyt/lyt_picture.cpp"),
Object(Matching, "nw4r/lyt/lyt_textBox.cpp"),
Object(Matching, "nw4r/lyt/lyt_window.cpp"),
Object(Matching, "nw4r/lyt/lyt_bounding.cpp"),
Object(Matching, "nw4r/lyt/lyt_resourceAccessor.cpp"),
Object(Matching, "nw4r/lyt/lyt_arcResourceAccessor.cpp"),
Object(Matching, "nw4r/lyt/lyt_common.cpp"),
+2 -2
View File
@@ -10,10 +10,10 @@ namespace lyt {
class Bounding : public Pane {
public:
Bounding(const res::Bounding *, const ResBlockSet &);
Bounding(const res::Bounding *pBlock, const ResBlockSet &);
virtual ~Bounding();
NW4R_UT_RTTI_DECL(Bounding);
virtual void DrawSelf(const DrawInfo &);
virtual void DrawSelf(const DrawInfo &drawInfo);
};
} // namespace lyt
} // namespace nw4r
+22
View File
@@ -0,0 +1,22 @@
#include <nw4r/lyt/lyt_bounding.h>
namespace nw4r {
namespace lyt {
NW4R_UT_RTTI_DEF_DERIVED(Bounding, Pane);
// __ct__Q34nw4r3lyt8BoundingFPCQ44nw4r3lyt3res8BoundingRCQ34nw4r3lyt11ResBlockSet
Bounding::Bounding(const res::Bounding *pBlock, const ResBlockSet &) : Pane(pBlock) {}
// __dt__Q34nw4r3lyt8BoundingFv
Bounding::~Bounding() {}
// DrawSelf__Q34nw4r3lyt8BoundingFRCQ34nw4r3lyt8DrawInfo
void Bounding::DrawSelf(const DrawInfo &drawInfo) {
return;
}
} // namespace lyt
} // namespace nw4r
+2 -1
View File
@@ -280,7 +280,8 @@ void TextBox::SetVtxColorElement(u32 idx, u8 value) {
// 1] IDK which one is accurate, both symbols exist
// GetTextDrawRect__Q34nw4r3lyt7TextBoxCFv
ut::Rect TextBox::GetTextDrawRect() const {
return GetTextDrawRect(&ut::TextWriterBase<wchar_t>());
ut::TextWriterBase<wchar_t> temp;
return GetTextDrawRect(&temp);
}
// 2] IDK which one is accurate, both symbols exist