falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

J2DPicture::setBlendRatio OK

This commit is contained in:
Pheenoh 2021-03-27 18:07:36 -04:00
parent 2354fa1bf1
commit 2b2f8c1257
No known key found for this signature in database
GPG Key ID: 4312662758CE7D5A
4 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/J2DGraph/J2DPicture.s
View File

@ -2874,7 +2874,10 @@ swap__10J2DPictureFRfRf:
/* 802FEA64 002FB9A4 C0 04 00 00 */ lfs f0, 0(r4)
/* 802FEA68 002FB9A8 D0 03 00 00 */ stfs f0, 0(r3)
/* 802FEA6C 002FB9AC D0 24 00 00 */ stfs f1, 0(r4)
/* 802FEA70 002FB9B0 4E 80 00 20 */ blr
/* 802FEA70 002FB9B0 4E 80 00 20 */ blr
.global setBlendColorRatio__10J2DPictureFff
setBlendColorRatio__10J2DPictureFff:
/* 802FEA74 002FB9B4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802FEA78 002FB9B8 7C 08 02 A6 */ mflr r0
/* 802FEA7C 002FB9BC 90 01 00 14 */ stw r0, 0x14(r1)
@ -2885,6 +2888,9 @@ swap__10J2DPictureFRfRf:
/* 802FEA90 002FB9D0 7C 08 03 A6 */ mtlr r0
/* 802FEA94 002FB9D4 38 21 00 10 */ addi r1, r1, 0x10
/* 802FEA98 002FB9D8 4E 80 00 20 */ blr
.global setBlendAlphaRatio__10J2DPictureFff
setBlendAlphaRatio__10J2DPictureFff:
/* 802FEA9C 002FB9DC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802FEAA0 002FB9E0 7C 08 02 A6 */ mflr r0
/* 802FEAA4 002FB9E4 90 01 00 14 */ stw r0, 0x14(r1)

44
include/JSystem/J2DGraph/J2DPicture/J2DPicture.h
View File

@ -1,15 +1,47 @@
#ifndef J2DPICTURE_H_
#define J2DPICTURE_H_
#include "JSystem/J2DGraph/J2DPane.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "JSystem/JGeometry/JGeometry.h"
#include "dolphin/types.h"
class J2DPicture {
public:
// define and move to appropriate header later
class JUTPalette;
// member functions
void setBlendRatio(f32, f32);
void append(const char*, f32);
void insert(const char*, u8, f32);
class J2DPicture : public J2DPane {
public:
virtual void initiate();
virtual u32 prepareTexture(); // return type may be wrong
virtual void append(const ResTIMG*, f32);
virtual void append(const ResTIMG*, JUTPalette*, f32);
virtual void append(const char*, f32);
virtual void append(const char*, JUTPalette*, f32);
virtual void append(JUTTexture*, f32);
virtual void prepend(const ResTIMG*, f32);
virtual void prepend(const ResTIMG*, JUTPalette*, f32);
virtual void prepend(const char*, f32);
virtual void prepend(const char*, JUTPalette*, f32);
virtual void prepend(JUTTexture*, f32);
virtual void insert(const ResTIMG*, u8, f32);
virtual void insert(const ResTIMG*, JUTPalette*, u8, f32);
virtual void insert(const char*, u8, f32);
virtual void insert(const char*, JUTPalette*, u8, f32);
virtual void insert(JUTTexture*, u8, f32);
virtual void remove(u8);
virtual void remove(void);
virtual void remove(JUTTexture*);
virtual void draw(f32,f32,bool,bool,bool);
virtual void draw(f32,f32,u8,bool,bool,bool);
virtual void draw(f32,f32,f32,f32,bool,bool,bool);
virtual void drawOut(f32,f32,f32,f32,f32,f32);
virtual void drawOut(f32,f32,f32,f32,f32,f32,f32,f32);
virtual void drawOut(const JGeometry::TBox2<float>&, const JGeometry::TBox2<float>&);
virtual void load(_GXTexMapID, u8);
virtual void load(u8);
virtual void setBlendRatio(f32, f32);
virtual void setBlendColorRatio(f32, f32);
virtual void setBlendAlphaRatio(f32, f32);
};
#endif

2
include/JSystem/JUtility/JUTTexture.h
View File

@ -29,4 +29,6 @@ struct ResTIMG { /* Acts as the header to image data. Usually texture data immed
u32 texture_data_offset;
};
class JUTTexture;
#endif // JSYSTEM_JUTILITY_TEXTURE_H

8
src/f/f_op/f_op_msg_mng.cpp
View File

@ -184,11 +184,9 @@ asm void fopMsgM_valueIncrease(int, int, u8) {
#include "f/f_op/f_op_msg_mng/asm/func_80020160.s"
}
// setBlendRatio__10J2DPictureFff
// J2DPicture::setBlendRatio(f32, f32)
asm void J2DPicture::setBlendRatio(f32, f32) {
nofralloc
#include "f/f_op/f_op_msg_mng/asm/func_800202CC.s"
void J2DPicture::setBlendRatio(f32 param_1, f32 param_2) {
setBlendColorRatio(param_1,param_2);
setBlendAlphaRatio(param_1,param_2);
}
// append__10J2DPictureFPCcf