encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

move J2D / JUTResFont (#144)

Browse Source 
* move some JSystem and meter2_info stuff

* more J2D / JUTTexture / JUTPalette

* setup dScnKy_env_light_c
This commit is contained in:
TakaRikka
2021-08-28 16:25:03 +02:00
committed by GitHub
parent e14b04c54a
commit daf45f768d
167 changed files with 3800 additions and 5691 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/J2DGraph/J2DAnimation.cpp
-75
View File
@@ -15,10 +15,6 @@ struct _GXTlutFmt {};
struct _GXTlut {};
struct _GXColorS10 {};
struct _GXColor {};
struct JUTTransparency {};
struct JKRArchive {};
@@ -55,77 +51,6 @@ struct J2DDataManage {
/* 8030CE18 */ void get(char const*);
};
struct J2DAnmVtxColorKey {
/* 8030B704 */ void getColor(u8, u16, _GXColor*) const;
/* 8030CC20 */ ~J2DAnmVtxColorKey();
};
struct J2DAnmVtxColorFull {
/* 8030B4C4 */ void getColor(u8, u16, _GXColor*) const;
/* 8030CC8C */ ~J2DAnmVtxColorFull();
};
struct J2DAnmVisibilityFull {
/* 8030C048 */ void getVisibility(u16, u8*) const;
};
struct J2DAnmTransformKey {
/* 801959C0 */ ~J2DAnmTransformKey();
/* 8030AAFC */ void calcTransform(f32, u16, J3DTransformInfo*) const;
/* 8030CD7C */ void getTransform(u16, J3DTransformInfo*) const;
};
struct J2DAnmTransformFull {
/* 8030A590 */ void getTransform(u16, J3DTransformInfo*) const;
/* 8030CDAC */ ~J2DAnmTransformFull();
};
struct J2DAnmTextureSRTKey {
/* 80184274 */ ~J2DAnmTextureSRTKey();
/* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
/* 8030BC60 */ void searchUpdateMaterialID(J2DScreen*);
};
struct J2DAnmTexPattern {
struct J2DAnmTexPatternTIMGPointer {
/* 8030CB2C */ J2DAnmTexPatternTIMGPointer();
/* 8030CB3C */ ~J2DAnmTexPatternTIMGPointer();
};
/* 8030BD10 */ void searchUpdateMaterialID(J2DScreen*);
/* 8030BEE8 */ void getTexNo(u16, u16*) const;
/* 8030BF9C */ void getResTIMG(u16) const;
/* 8030BFF0 */ void getPalette(u16) const;
/* 8030CB90 */ ~J2DAnmTexPattern();
};
struct J2DAnmTevRegKey {
/* 801841EC */ ~J2DAnmTevRegKey();
/* 8030C0F0 */ void getTevColorReg(u16, _GXColorS10*) const;
/* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const;
/* 8030C678 */ void searchUpdateMaterialID(J2DScreen*);
};
struct J2DAnmColorKey {
/* 80239BE0 */ ~J2DAnmColorKey();
/* 8030B200 */ void getColor(u16, _GXColor*) const;
};
struct J2DAnmColorFull {
/* 8030AFC8 */ void getColor(u16, _GXColor*) const;
/* 8030CCF8 */ ~J2DAnmColorFull();
};
struct J2DAnmColor {
/* 801842FC */ ~J2DAnmColor();
/* 802EB390 */ void getColor(u16, _GXColor*) const;
/* 8030AF24 */ void searchUpdateMaterialID(J2DScreen*);
};
struct J2DAnmBase {
/* 800569B0 */ void searchUpdateMaterialID(J2DScreen*);
};
//
// Forward References:
//
libs/JSystem/J2DGraph/J2DGrafContext.cpp
-40
View File
@@ -7,46 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct JUtility {
struct TColor {};
};
struct JGeometry {
template <typename A1>
struct TBox2 {};
/* TBox2<f32> */
struct TBox2__template0 {};
template <typename A1>
struct TVec2 {};
/* TVec2<f32> */
struct TVec2__template1 {};
};
struct J2DGrafContext {
/* 802E8B08 */ J2DGrafContext(f32, f32, f32, f32);
/* 802E8BB4 */ void setPort();
/* 802E8C44 */ void setup2D();
/* 802E8E20 */ void setScissor();
/* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&);
/* 802E90E4 */ void place(JGeometry::TBox2<f32> const&);
/* 802E961C */ void place(f32, f32, f32, f32);
/* 802E9118 */ void setColor(JUtility::TColor, JUtility::TColor, JUtility::TColor,
JUtility::TColor);
/* 802E9234 */ void setLineWidth(u8);
/* 802E9260 */ void fillBox(JGeometry::TBox2<f32> const&);
/* 802E9368 */ void drawFrame(JGeometry::TBox2<f32> const&);
/* 802E9488 */ void line(JGeometry::TVec2<f32>, JGeometry::TVec2<f32>);
/* 802E9564 */ void lineTo(JGeometry::TVec2<f32>);
/* 802E95D4 */ ~J2DGrafContext();
/* 802E9664 */ bool getGrafType() const;
/* 802E966C */ void setLookat();
};
//
// Forward References:
//
libs/JSystem/J2DGraph/J2DManage.cpp
-18
View File
@@ -7,24 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct JSUInputStream {
/* 802DC298 */ void read(void*, s32);
};
struct J2DResReference {
/* 8030CF10 */ void getResReference(u16) const;
/* 8030CF44 */ void getName(u16) const;
};
struct J2DDataManage {
/* 8030CE18 */ void get(char const*);
/* 8030CE7C */ void get(JSUInputStream*);
};
//
// Forward References:
//
libs/JSystem/J2DGraph/J2DMaterial.cpp
-41
View File
@@ -13,10 +13,6 @@
struct _GXTlut {};
struct _GXColorS10 {};
struct _GXColor {};
struct ResTIMG {};
struct JUtility {
@@ -82,43 +78,6 @@ struct J2DPEBlock {
/* 802F1840 */ void setGX();
};
struct J2DAnmTexPattern {
/* 8030BEE8 */ void getTexNo(u16, u16*) const;
/* 8030BF9C */ void getResTIMG(u16) const;
/* 8030BFF0 */ void getPalette(u16) const;
};
struct J2DAnmTevRegKey {
/* 8030C0F0 */ void getTevColorReg(u16, _GXColorS10*) const;
/* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const;
};
struct J2DAnmTextureSRTKey {
/* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
};
struct J2DAnmColor {
/* 802EB390 */ void getColor(u16, _GXColor*) const;
};
struct J2DMaterial {
struct J2DMaterialAnmPointer {
/* 802EA79C */ J2DMaterialAnmPointer();
};
/* 802EA1AC */ J2DMaterial();
/* 802EA2CC */ ~J2DMaterial();
/* 802EA38C */ void setGX();
/* 802EA410 */ void createTevBlock(int, bool);
/* 802EA5C4 */ void createIndBlock(int, bool);
/* 802EA84C */ void makeAnmPointer();
/* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
/* 802EAC78 */ void animation();
};
struct J2DIndTexOrder {
/* 802EB378 */ J2DIndTexOrder();
};
libs/JSystem/J2DGraph/J2DPane.cpp
+352 -317
View File
File diff suppressed because it is too large Load Diff
libs/JSystem/J2DGraph/J2DPicture.cpp
+157 -411
View File
File diff suppressed because it is too large Load Diff
libs/JSystem/J2DGraph/J2DScreen.cpp
+58 -222
View File
@@ -11,103 +11,10 @@
// Types:
//
struct _GXCullMode {};
struct ResTIMG {};
struct ResNTAB {};
struct ResFONT {};
struct JUTNameTab {
/* 802DE9E0 */ JUTNameTab(ResNTAB const*);
};
struct JSUStreamSeekFrom {};
struct JSURandomInputStream {
/* 802DC458 */ void peek(void*, s32);
/* 802DC4DC */ void seek(s32, JSUStreamSeekFrom);
};
struct JSUMemoryInputStream {
/* 802DC520 */ void setBuffer(void const*, s32);
};
struct JSUInputStream {
/* 802DC23C */ ~JSUInputStream();
/* 802DC298 */ void read(void*, s32);
};
struct JKRFileLoader {
/* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*);
};
struct JKRArchive {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
/* TBox2<f32> */
struct TBox2__template0 {};
};
struct J2DAnmVisibilityFull {};
struct J2DAnmBase {};
struct J2DGrafContext {};
struct J2DAnmTransform {};
struct J2DAnmVtxColor {};
struct J2DPane {
/* 80053C00 */ void makeMatrix(f32, f32);
/* 802F7540 */ void makeMatrix(f32, f32, f32, f32);
/* 802F5F9C */ J2DPane(J2DPane*, JSURandomInputStream*, u8);
/* 802F5D40 */ J2DPane(J2DPane*, bool, u64, JGeometry::TBox2<f32> const&);
/* 802F658C */ ~J2DPane();
/* 802F67E0 */ void draw(f32, f32, J2DGrafContext const*, bool, bool);
/* 802F6D18 */ void place(JGeometry::TBox2<f32> const&);
/* 802F6F60 */ void move(f32, f32);
/* 802F6FB4 */ void add(f32, f32);
/* 802F6FF8 */ void resize(f32, f32);
/* 802F72E0 */ void search(u64);
/* 802F7388 */ void searchUserInfo(u64);
/* 802F7430 */ void isUsed(ResTIMG const*);
/* 802F74B8 */ void isUsed(ResFONT const*);
/* 802F7680 */ void setCullBack(_GXCullMode);
/* 802F8428 */ void setCullBack(bool);
/* 802F7EF4 */ void setAnimation(J2DAnmBase*);
/* 802F8080 */ void animationTransform(J2DAnmTransform const*);
/* 802F8118 */ void setVisibileAnimation(J2DAnmVisibilityFull*);
/* 802F81A0 */ void setVtxColorAnimation(J2DAnmVtxColor*);
/* 802F8228 */ void animationPane(J2DAnmTransform const*);
/* 802F83CC */ void rewriteAlpha();
/* 802F8464 */ void setConnectParent(bool);
/* 802F8474 */ void update();
/* 802F8478 */ void drawSelf(f32, f32);
};
struct J2DAnmTexPattern {};
struct J2DAnmTevRegKey {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DMaterial {
/* 802EA1AC */ J2DMaterial();
/* 802EA2CC */ ~J2DMaterial();
/* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
/* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
/* 802EAC78 */ void animation();
};
struct J2DWindowEx {
/* 80300C94 */ J2DWindowEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
};
@@ -126,50 +33,6 @@ struct J2DTextBox {
/* 802FF75C */ J2DTextBox(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
};
struct J2DScrnBlockHeader {};
struct J2DScreen {
/* 80053BA0 */ void clearAnmTransform();
/* 802F9704 */ void setAnimation(J2DAnmColor*);
/* 80192414 */ void setAnimation(J2DAnmTransform*);
/* 802F9798 */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802F99A8 */ void setAnimation(J2DAnmVtxColor*);
/* 802F9838 */ void setAnimation(J2DAnmTexPattern*);
/* 802F99C8 */ void setAnimation(J2DAnmVisibilityFull*);
/* 802F98CC */ void setAnimation(J2DAnmTevRegKey*);
/* 802F9A54 */ void setAnimation(J2DAnmBase*);
/* 802F8498 */ J2DScreen();
/* 802F8540 */ ~J2DScreen();
/* 802F85A8 */ void clean();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8748 */ void setPriority(JSURandomInputStream*, u32, JKRArchive*);
/* 802F8778 */ void private_set(JSURandomInputStream*, u32, JKRArchive*);
/* 802F8834 */ void checkSignature(JSURandomInputStream*);
/* 802F8894 */ void getScreenInformation(JSURandomInputStream*);
/* 802F8990 */ void makeHierarchyPanes(J2DPane*, JSURandomInputStream*, u32, JKRArchive*);
/* 802F8B98 */ void createPane(J2DScrnBlockHeader const&, JSURandomInputStream*, J2DPane*, u32,
JKRArchive*);
/* 802F99E8 */ void createPane(J2DScrnBlockHeader const&, JSURandomInputStream*, J2DPane*, u32);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
/* 802F90A0 */ void search(u64);
/* 802F90E0 */ void searchUserInfo(u64);
/* 802F9120 */ void drawSelf(f32, f32, f32 (*)[3][4]);
/* 802F9280 */ void getResReference(JSURandomInputStream*, u32);
/* 802F937C */ void createMaterial(JSURandomInputStream*, u32, JKRArchive*);
/* 802F9600 */ void isUsed(ResTIMG const*);
/* 802F9620 */ void isUsed(ResFONT const*);
/* 802F9640 */ void getNameResource(char const*);
/* 802F9690 */ void animation();
/* 802F9A18 */ s32 getTypeID() const;
/* 802F9A20 */ void calcMtx();
/* 802F9A74 */ void setAnimationVF(J2DAnmVisibilityFull*);
/* 802F9A78 */ void setAnimationVC(J2DAnmVtxColor*);
static u8 mDataManage[4 + 4 /* padding */];
};
struct J2DResReference {};
struct J2DPictureEx {
/* 803036EC */ J2DPictureEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
};
@@ -192,10 +55,6 @@ struct J2DMaterialFactory {
JKRArchive*) const;
};
struct J2DDataManage {
/* 8030CE18 */ void get(char const*);
};
//
// Forward References:
//
@@ -301,19 +160,9 @@ extern "C" void __ct__11J2DWindowExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMate
extern "C" void __ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial();
extern "C" void __ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial();
extern "C" void get__13J2DDataManageFPCc();
extern "C" void GXSetVtxDesc();
extern "C" void GXSetVtxAttrFmt();
extern "C" void GXSetNumTexGens();
extern "C" void GXBegin();
extern "C" void GXSetCullMode();
extern "C" void GXSetChanCtrl();
extern "C" void GXSetNumIndStages();
extern "C" void GXSetTevDirect();
extern "C" void GXSetTevOp();
extern "C" void GXSetTevSwapModeTable();
extern "C" void GXSetTevOrder();
extern "C" void GXSetNumTevStages();
extern "C" void GXSetBlendMode();
extern "C" void GXSetScissor();
extern "C" void GXGetScissor();
extern "C" void __destroy_new_array();
@@ -416,21 +265,31 @@ asm J2DScreen::J2DScreen() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J2DScreen::~J2DScreen() {
// asm J2DScreen::~J2DScreen() {
extern "C" asm void __dt__9J2DScreenFv() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/__dt__9J2DScreenFv.s"
}
#pragma pop
/* 802F85A8-802F8648 2F2EE8 00A0+00 3/3 0/0 0/0 .text clean__9J2DScreenFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::clean() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/clean__9J2DScreenFv.s"
void J2DScreen::clean() {
delete[] mMaterials;
mMaterialNum = 0;
mMaterials = NULL;
delete[] field_0x108;
field_0x108 = NULL;
delete[] field_0x10c;
field_0x10c = NULL;
if (mNameTable != NULL) {
delete[] mNameTable->getResNameTable();
delete mNameTable;
mNameTable = NULL;
}
}
#pragma pop
/* 802F8648-802F8748 2F2F88 0100+00 0/0 58/58 4/4 .text setPriority__9J2DScreenFPCcUlP10JKRArchive
*/
@@ -445,21 +304,20 @@ asm void J2DScreen::setPriority(char const* param_0, u32 param_1, JKRArchive* pa
/* 802F8748-802F8778 2F3088 0030+00 1/1 1/1 0/0 .text
* setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::setPriority(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s"
bool J2DScreen::setPriority(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) {
if (param_2 == NULL) {
return false;
} else {
return private_set(param_0, param_1, param_2);
}
}
#pragma pop
/* 802F8778-802F8834 2F30B8 00BC+00 1/1 0/0 0/0 .text
* private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::private_set(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) {
asm bool J2DScreen::private_set(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s"
}
@@ -467,14 +325,27 @@ asm void J2DScreen::private_set(JSURandomInputStream* param_0, u32 param_1, JKRA
/* 802F8834-802F8894 2F3174 0060+00 1/1 0/0 0/0 .text
* checkSignature__9J2DScreenFP20JSURandomInputStream */
#ifdef NONMATCHING
bool J2DScreen::checkSignature(JSURandomInputStream* param_0) {
int tag;
param_0->read(&tag, 32);
if (tag == 'SCRN' && (tag2 == 'blo1' || tag2 == 'blo2')) {
return true;
} else {
return false;
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::checkSignature(JSURandomInputStream* param_0) {
asm bool J2DScreen::checkSignature(JSURandomInputStream* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/checkSignature__9J2DScreenFP20JSURandomInputStream.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 80456230-80456238 004830 0008+00 1/1 0/0 0/0 .sdata2 @1705 */
@@ -536,7 +407,7 @@ asm void J2DScreen::draw(f32 param_0, f32 param_1, J2DGrafContext const* param_2
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::search(u64 param_0) {
asm const J2DPane* J2DScreen::search(u64 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/search__9J2DScreenFUx.s"
}
@@ -546,7 +417,7 @@ asm void J2DScreen::search(u64 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::searchUserInfo(u64 param_0) {
asm const J2DPane* J2DScreen::searchUserInfo(u64 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/searchUserInfo__9J2DScreenFUx.s"
}
@@ -586,34 +457,24 @@ asm void J2DScreen::createMaterial(JSURandomInputStream* param_0, u32 param_1,
#pragma pop
/* 802F9600-802F9620 2F3F40 0020+00 1/0 0/0 0/0 .text isUsed__9J2DScreenFPC7ResTIMG */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::isUsed(ResTIMG const* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/isUsed__9J2DScreenFPC7ResTIMG.s"
bool J2DScreen::isUsed(ResTIMG const* param_0) {
return J2DPane::isUsed(param_0);
}
#pragma pop
/* 802F9620-802F9640 2F3F60 0020+00 1/0 0/0 0/0 .text isUsed__9J2DScreenFPC7ResFONT */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::isUsed(ResFONT const* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/isUsed__9J2DScreenFPC7ResFONT.s"
bool J2DScreen::isUsed(ResFONT const* param_0) {
return J2DPane::isUsed(param_0);
}
#pragma pop
/* ############################################################################################## */
/* 80451590-80451598 000A90 0004+04 1/1 3/3 0/0 .sbss mDataManage__9J2DScreen */
u8 J2DScreen::mDataManage[4 + 4 /* padding */];
J2DDataManage* J2DScreen::mDataManage;
/* 802F9640-802F9690 2F3F80 0050+00 0/0 6/6 0/0 .text getNameResource__9J2DScreenFPCc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::getNameResource(char const* param_0) {
asm void* J2DScreen::getNameResource(char const* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/getNameResource__9J2DScreenFPCc.s"
}
@@ -674,37 +535,22 @@ asm void J2DScreen::setAnimation(J2DAnmTevRegKey* param_0) {
/* 802F99A8-802F99C8 2F42E8 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP14J2DAnmVtxColor
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::setAnimation(J2DAnmVtxColor* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP14J2DAnmVtxColor.s"
void J2DScreen::setAnimation(J2DAnmVtxColor* param_0) {
J2DPane::setVtxColorAnimation(param_0);
}
#pragma pop
/* 802F99C8-802F99E8 2F4308 0020+00 1/0 0/0 0/0 .text
* setAnimation__9J2DScreenFP20J2DAnmVisibilityFull */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::setAnimation(J2DAnmVisibilityFull* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP20J2DAnmVisibilityFull.s"
void J2DScreen::setAnimation(J2DAnmVisibilityFull* param_0) {
J2DPane::setVisibileAnimation(param_0);
}
#pragma pop
/* 802F99E8-802F9A18 2F4328 0030+00 1/0 0/0 0/0 .text
* createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUl */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::createPane(J2DScrnBlockHeader const& param_0, JSURandomInputStream* param_1,
J2DPane* param_2, u32 param_3) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUl.s"
void J2DScreen::createPane(J2DScrnBlockHeader const& param_0, JSURandomInputStream* param_1,
J2DPane* param_2, u32 param_3) {
createPane(param_0, param_1, param_2, param_3, NULL);
}
#pragma pop
/* 802F9A18-802F9A20 2F4358 0008+00 1/0 0/0 0/0 .text getTypeID__9J2DScreenCFv */
s32 J2DScreen::getTypeID() const {
@@ -712,24 +558,14 @@ s32 J2DScreen::getTypeID() const {
}
/* 802F9A20-802F9A54 2F4360 0034+00 1/0 0/0 0/0 .text calcMtx__9J2DScreenFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::calcMtx() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/calcMtx__9J2DScreenFv.s"
void J2DScreen::calcMtx() {
makeMatrix(mTranslateX, mTranslateY);
}
#pragma pop
/* 802F9A54-802F9A74 2F4394 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP10J2DAnmBase */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::setAnimation(J2DAnmBase* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP10J2DAnmBase.s"
void J2DScreen::setAnimation(J2DAnmBase* param_0) {
J2DPane::setAnimation(param_0);
}
#pragma pop
/* 802F9A74-802F9A78 2F43B4 0004+00 1/0 0/0 0/0 .text
* setAnimationVF__9J2DScreenFP20J2DAnmVisibilityFull */
libs/JSystem/J2DGraph/J2DTextBox.cpp
+89 -191
View File
@@ -6,140 +6,12 @@
#include "JSystem/J2DGraph/J2DTextBox.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "msl_c/string.h"
//
// Types:
//
struct _GXCullMode {};
struct ResTIMG {};
struct ResFONT {};
struct JUtility {
struct TColor {};
};
struct JKRHeap {};
struct JUTResFont {
/* 802DEF94 */ JUTResFont(ResFONT const*, JKRHeap*);
};
struct JUTFont {};
struct JSUStreamSeekFrom {};
struct JSURandomInputStream {
/* 802DC458 */ void peek(void*, s32);
/* 802DC4DC */ void seek(s32, JSUStreamSeekFrom);
};
struct JSUInputStream {
/* 802DC298 */ void read(void*, s32);
};
struct JKRArchive {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
/* TBox2<f32> */
struct TBox2__template0 {};
};
struct J2DTextBoxVBinding {};
struct J2DTextBoxHBinding {};
struct J2DAnmTexPattern {};
struct J2DAnmVisibilityFull {};
struct J2DAnmBase {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTransform {};
struct J2DAnmVtxColor {};
struct J2DPane {
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
/* 802F7540 */ void makeMatrix(f32, f32, f32, f32);
/* 80256018 */ void setAnimation(J2DAnmVtxColor*);
/* 8025601C */ void setAnimation(J2DAnmVisibilityFull*);
/* 80256020 */ void setAnimation(J2DAnmTexPattern*);
/* 8018BF28 */ void setAnimation(J2DAnmTextureSRTKey*);
/* 80126350 */ void setAnimation(J2DAnmTevRegKey*);
/* 80126354 */ void setAnimation(J2DAnmColor*);
/* 802F7EF4 */ void setAnimation(J2DAnmBase*);
/* 802F5E88 */ J2DPane(u64, JGeometry::TBox2<f32> const&);
/* 802F5BF8 */ J2DPane();
/* 802F60C4 */ void makePaneStream(J2DPane*, JSURandomInputStream*);
/* 802F658C */ ~J2DPane();
/* 802F6F60 */ void move(f32, f32);
/* 802F6FB4 */ void add(f32, f32);
/* 802F6FF8 */ void resize(f32, f32);
/* 802F72E0 */ void search(u64);
/* 802F7388 */ void searchUserInfo(u64);
/* 802F7430 */ void isUsed(ResTIMG const*);
/* 802F74B8 */ void isUsed(ResFONT const*);
/* 802F7680 */ void setCullBack(_GXCullMode);
/* 802F8428 */ void setCullBack(bool);
/* 802F7B18 */ void makePaneExStream(J2DPane*, JSURandomInputStream*);
/* 802F7DB8 */ void getPointer(JSURandomInputStream*, u32, JKRArchive*);
/* 802F8004 */ void clearAnmTransform();
/* 802F8080 */ void animationTransform(J2DAnmTransform const*);
/* 802F8118 */ void setVisibileAnimation(J2DAnmVisibilityFull*);
/* 802F81A0 */ void setVtxColorAnimation(J2DAnmVtxColor*);
/* 802F8228 */ void animationPane(J2DAnmTransform const*);
/* 802F83D0 */ void setAnimationVF(J2DAnmVisibilityFull*);
/* 802F83FC */ void setAnimationVC(J2DAnmVtxColor*);
/* 802F8474 */ void update();
};
struct J2DMaterial {};
struct J2DTextBox {
/* 80186C84 */ void setWhite(JUtility::TColor);
/* 8019230C */ void setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 801DFA28 */ void getWhite() const;
/* 801DFA34 */ void getBlack() const;
/* 8021C7F4 */ void getFont() const;
/* 80254408 */ void setBlack(JUtility::TColor);
/* 8025602C */ bool getMaterial() const;
/* 802FFBC4 */ J2DTextBox(u64, JGeometry::TBox2<f32> const&, ResFONT const*, char const*, s16,
J2DTextBoxHBinding, J2DTextBoxVBinding);
/* 802FF6D8 */ J2DTextBox(J2DPane*, JSURandomInputStream*, JKRArchive*);
/* 802FF75C */ J2DTextBox(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
/* 802FF660 */ J2DTextBox();
/* 802FFC58 */ void initiate(ResFONT const*, char const*, s16, J2DTextBoxHBinding,
J2DTextBoxVBinding);
/* 802FFE88 */ void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
/* 803001E0 */ ~J2DTextBox();
/* 80300278 */ void setFont(JUTFont*);
/* 80300490 */ void draw(f32, f32, f32, J2DTextBoxHBinding);
/* 803002E8 */ void draw(f32, f32);
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
/* 80300660 */ void setString(char const*, ...);
/* 80300870 */ void setConnectParent(bool);
/* 80300950 */ void drawSelf(f32, f32, f32 (*)[3][4]);
/* 803008E8 */ void drawSelf(f32, f32);
/* 80300AF8 */ void resize(f32, f32);
/* 80300C70 */ void isUsed(ResTIMG const*);
/* 80300BFC */ void isUsed(ResFONT const*);
/* 80300C68 */ s32 getTypeID() const;
/* 80300C90 */ void rewriteAlpha();
};
struct J2DPrint {
/* 802F4394 */ J2DPrint(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor);
@@ -237,10 +109,7 @@ extern "C" void setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull();
extern "C" void setAnimationVC__7J2DPaneFP14J2DAnmVtxColor();
extern "C" void setCullBack__7J2DPaneFb();
extern "C" void update__7J2DPaneFv();
extern "C" void PSMTXIdentity();
extern "C" void PSMTXConcat();
extern "C" void GXSetTexCoordGen2();
extern "C" void GXSetNumTexGens();
extern "C" void GXSetNumIndStages();
extern "C" void GXSetTevDirect();
extern "C" void GXLoadPosMtxImm();
@@ -255,9 +124,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strncpy();
extern "C" void strcpy();
extern "C" void strlen();
//
// Declarations:
@@ -318,25 +184,17 @@ SECTION_DATA extern void* __vt__10J2DTextBox[47 + 1 /* padding */] = {
};
/* 802FF660-802FF6D8 2F9FA0 0078+00 0/0 1/1 0/0 .text __ct__10J2DTextBoxFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J2DTextBox::J2DTextBox() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFv.s"
J2DTextBox::J2DTextBox()
: mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() {
initiate(NULL, 0, 0, HBIND_LEFT, VBIND_TOP);
}
#pragma pop
/* 802FF6D8-802FF75C 2FA018 0084+00 0/0 1/1 0/0 .text
* __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J2DTextBox::J2DTextBox(J2DPane* param_0, JSURandomInputStream* param_1, JKRArchive* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s"
J2DTextBox::J2DTextBox(J2DPane* param_0, JSURandomInputStream* param_1, JKRArchive* param_2)
: mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() {
private_readStream(param_0, param_1, param_2);
}
#pragma pop
/* ############################################################################################## */
/* 80456280-80456288 004880 0004+04 6/6 0/0 0/0 .sdata2 @1660 */
@@ -367,16 +225,13 @@ asm J2DTextBox::J2DTextBox(J2DPane* param_0, JSURandomInputStream* param_1, u32
/* 802FFBC4-802FFC58 2FA504 0094+00 0/0 1/1 0/0 .text
* __ct__10J2DTextBoxFUxRCQ29JGeometry8TBox2<f>PC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J2DTextBox::J2DTextBox(u64 param_0, JGeometry::TBox2<f32> const& param_1,
ResFONT const* param_2, char const* param_3, s16 param_4,
J2DTextBoxHBinding param_5, J2DTextBoxVBinding param_6) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DTextBox/func_802FFBC4.s"
J2DTextBox::J2DTextBox(u64 param_0, JGeometry::TBox2<f32> const& param_1, ResFONT const* param_2,
char const* param_3, s16 param_4, J2DTextBoxHBinding param_5,
J2DTextBoxVBinding param_6)
: J2DPane(param_0, param_1), mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL),
mWhiteColor(), mBlackColor() {
initiate(param_2, param_3, param_4, param_5, param_6);
}
#pragma pop
/* 802FFC58-802FFE88 2FA598 0230+00 2/2 1/0 0/0 .text
* initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding */
@@ -406,21 +261,23 @@ asm void J2DTextBox::private_readStream(J2DPane* param_0, JSURandomInputStream*
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J2DTextBox::~J2DTextBox() {
// asm J2DTextBox::~J2DTextBox() {
extern "C" asm void __dt__10J2DTextBoxFv() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DTextBox/__dt__10J2DTextBoxFv.s"
}
#pragma pop
/* 80300278-803002E8 2FABB8 0070+00 1/0 0/0 0/0 .text setFont__10J2DTextBoxFP7JUTFont */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTextBox::setFont(JUTFont* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DTextBox/setFont__10J2DTextBoxFP7JUTFont.s"
void J2DTextBox::setFont(JUTFont* pFont) {
if (pFont) {
if (mTextFontOwned) {
delete mFont;
}
mFont = pFont;
mTextFontOwned = false;
}
}
#pragma pop
/* ############################################################################################## */
/* 803A1C58-803A1C58 02E2B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
@@ -451,54 +308,100 @@ asm void J2DTextBox::draw(f32 param_0, f32 param_1, f32 param_2, J2DTextBoxHBind
#pragma pop
/* 80300658-80300660 2FAF98 0008+00 0/0 62/62 2/2 .text getStringPtr__10J2DTextBoxCFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTextBox::getStringPtr() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DTextBox/getStringPtr__10J2DTextBoxCFv.s"
char* J2DTextBox::getStringPtr() const {
return mStringPtr;
}
#pragma pop
/* 80300660-8030074C 2FAFA0 00EC+00 0/0 6/6 0/0 .text setString__10J2DTextBoxFPCce */
// missing block of instructions before delete[]
#ifdef NONMATCHING
s32 J2DTextBox::setString(char const* string, ...) {
delete[] mStringPtr;
u32 len = strlen(string);
if (len >= 0xFFFF) {
len = 0xFFFF - 1;
}
mStringLength = 0;
char* tmp = new char[len + 1];
mStringPtr = tmp;
if (mStringPtr) {
mStringLength = len + 1;
strcpy(mStringPtr, string);
}
return len;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTextBox::setString(char const* param_0, ...) {
asm s32 J2DTextBox::setString(char const* param_0, ...) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFPCce.s"
}
#pragma pop
#endif
/* 8030074C-80300870 2FB08C 0124+00 0/0 41/41 2/2 .text setString__10J2DTextBoxFsPCce */
#ifdef NONMATCHING
s32 J2DTextBox::setString(s16 param_0, char const* string, ...) {
delete[] mStringPtr;
mStringPtr = NULL;
u32 len = strlen(string);
if (param_0 == -1) {
if (len >= 0xFFFF) {
len = 0xFFFF - 1;
}
param_0 = len + 1;
}
mStringLength = 0;
if (param_0 != 0) {
char* tmp = new char[param_0];
mStringPtr = tmp;
}
if (mStringPtr) {
strncpy(mStringPtr, string, param_0 - 1);
mStringPtr[param_0 - 1] = 0;
mStringLength = param_0;
}
return len;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTextBox::setString(s16 param_0, char const* param_1, ...) {
asm s32 J2DTextBox::setString(s16 param_0, char const* param_1, ...) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFsPCce.s"
}
#pragma pop
#endif
/* 80300870-803008E8 2FB1B0 0078+00 1/0 1/0 0/0 .text setConnectParent__10J2DTextBoxFb */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTextBox::setConnectParent(bool param_0) {
asm bool J2DTextBox::setConnectParent(bool param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DTextBox/setConnectParent__10J2DTextBoxFb.s"
}
#pragma pop
/* 803008E8-80300950 2FB228 0068+00 1/0 1/0 0/0 .text drawSelf__10J2DTextBoxFff */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTextBox::drawSelf(f32 param_0, f32 param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DTextBox/drawSelf__10J2DTextBoxFff.s"
void J2DTextBox::drawSelf(f32 param_0, f32 param_1) {
Mtx tmp;
PSMTXIdentity(tmp);
drawSelf(param_0, param_1, &tmp);
}
#pragma pop
/* ############################################################################################## */
/* 80456298-804562A0 004898 0004+04 1/1 0/0 0/0 .sdata2 @2049 */
@@ -533,7 +436,7 @@ asm void J2DTextBox::resize(f32 param_0, f32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTextBox::isUsed(ResFONT const* param_0) {
asm bool J2DTextBox::isUsed(ResFONT const* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DTextBox/isUsed__10J2DTextBoxFPC7ResFONT.s"
}
@@ -545,14 +448,9 @@ s32 J2DTextBox::getTypeID() const {
}
/* 80300C70-80300C90 2FB5B0 0020+00 1/0 0/0 0/0 .text isUsed__10J2DTextBoxFPC7ResTIMG */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTextBox::isUsed(ResTIMG const* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DTextBox/isUsed__10J2DTextBoxFPC7ResTIMG.s"
bool J2DTextBox::isUsed(ResTIMG const* param_0) {
return J2DPane::isUsed(param_0);
}
#pragma pop
/* 80300C90-80300C94 2FB5D0 0004+00 1/0 0/0 0/0 .text rewriteAlpha__10J2DTextBoxFv */
void J2DTextBox::rewriteAlpha() {