mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 15:28:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work on J2DPictureEx (#1919)

Browse Source
This commit is contained in:
hatal175
2023-09-09 23:39:49 +03:00
committed by GitHub
parent 0f4eac4420
commit 8a146f81b6
36 changed files with 557 additions and 1249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_drawlist.cpp
+3 -3
View File
@@ -1389,7 +1389,7 @@ extern "C" asm void draw__12dDlst_2DMt_cFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::getTexture(u8 param_0) const {
asm JUTTexture* J2DPicture::getTexture(u8 param_0) const {
nofralloc
#include "asm/d/d_drawlist/getTexture__10J2DPictureCFUc.s"
}
@@ -1484,7 +1484,7 @@ extern "C" s32 getTypeID__7J2DPaneCFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::setWhite(JUtility::TColor param_0) {
asm bool J2DPicture::setWhite(JUtility::TColor param_0) {
nofralloc
#include "asm/d/d_drawlist/setWhite__10J2DPictureFQ28JUtility6TColor.s"
}
@@ -1494,7 +1494,7 @@ asm void J2DPicture::setWhite(JUtility::TColor param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::setBlack(JUtility::TColor param_0) {
asm bool J2DPicture::setBlack(JUtility::TColor param_0) {
nofralloc
#include "asm/d/d_drawlist/setBlack__10J2DPictureFQ28JUtility6TColor.s"
}
src/d/file/d_file_select.cpp
+1 -1
View File
@@ -3878,7 +3878,7 @@ asm void dFile_select_c::screenSet() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) {
asm bool J2DPicture::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) {
nofralloc
#include "asm/d/file/d_file_select/setBlackWhite__10J2DPictureFQ28JUtility6TColorQ28JUtility6TColor.s"
}
src/d/menu/d_menu_dmap.cpp
+1 -1
View File
@@ -1698,7 +1698,7 @@ asm void dMenu_Dmap_c::_create() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::append(ResTIMG const* param_0, f32 param_1) {
asm bool J2DPicture::append(ResTIMG const* param_0, f32 param_1) {
nofralloc
#include "asm/d/menu/d_menu_dmap/append__10J2DPictureFPC7ResTIMGf.s"
}
src/d/meter/d_meter2_draw.cpp
+4 -7
View File
@@ -2435,11 +2435,8 @@ SECTION_SBSS2 static u8 data_80456B9C[4];
#ifdef NONMATCHING
void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) {
CPaneMgr* pane = mpItemXY[i_button];
f32 local_68[2][2];
local_68[1][0] = 0.0f;
local_68[1][1] = 0.0f;
local_68[0][0] = 0.0f;
local_68[0][1] = 0.0f;
f32 local_74[2] = {0.0f};
f32 local_68[2] = {0.0f};
if (i_alphaRate == 1.0f) {
i_alphaRate = pane->getAlphaRate();
@@ -2448,8 +2445,8 @@ void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) {
JGeometry::TVec3<f32> vtx1 = pane->getPanePtr()->getGlbVtx(0);
JGeometry::TVec3<f32> vtx2 = pane->getPanePtr()->getGlbVtx(3);
mpKanteraMeter[i_button]->setPos((vtx1.x + vtx2.x) * 0.5f + 9.0f + local_68[1][i_button],
vtx2.y + local_68[0][i_button]);
mpKanteraMeter[i_button]->setPos((vtx1.x + vtx2.x) * 0.5f + 9.0f + local_74[i_button],
vtx2.y + local_68[i_button]);
mpKanteraMeter[i_button]->setScale(0.6f, 0.6f);
mpKanteraMeter[i_button]->setNowGauge(dComIfGs_getMaxOil(), dComIfGs_getOil());
mpKanteraMeter[i_button]->setAlphaRate(i_alphaRate);
src/f_op/f_op_msg_mng.cpp
+1 -1
View File
@@ -405,7 +405,7 @@ void J2DPicture::setBlendRatio(f32 param_0, f32 param_1) {
}
/* 80020338-80020368 01AC78 0030+00 0/0 1/0 0/0 .text append__10J2DPictureFPCcf */
void J2DPicture::append(char const* param_0, f32 param_1) {
bool J2DPicture::append(char const* param_0, f32 param_1) {
insert(param_0, mTextureCount, param_1);
}