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

Progress on J2DPane, JUTResFont (#39)

Browse Source
This commit is contained in:
Noah McQueen
2023-09-16 08:23:36 -06:00
committed by GitHub
parent f67a9d9411
commit a321031cb2
6 changed files with 508 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/J2DGraph/J2DPane.cpp
+13 -12
View File
@@ -5,6 +5,7 @@
#include "JSystem/J2DGraph/J2DPane.h"
#include "JSystem/JSupport/JSURandomInputStream.h"
#include "dolphin/gx/GXEnum.h"
#include "dolphin/types.h"
/* 802CF8F4-802CF984 .text __ct__7J2DPaneFv */
@@ -180,8 +181,18 @@ J2DPane* J2DPane::search(u32 tag) {
}
/* 802D0714-802D0800 .text makeMatrix__7J2DPaneFff */
void J2DPane::makeMatrix(float, float) {
/* Nonmatching */
void J2DPane::makeMatrix(f32 x, f32 y) {
Mtx stack1, stack2, stack3;
if (mRotation != 0.0f) {
MTXTrans(stack1, -mBasePosition.x, -mBasePosition.y, 0.0f);
f32 rot = mRotationAxis == ROTATE_Z ? -mRotation : mRotation;
MTXRotRad(stack2, mRotationAxis, rot * 0.017445329f);
MTXTrans(stack3, mBasePosition.x + x, mBasePosition.y + y, 0.0f);
MTXConcat(stack2, stack1, mMtx);
MTXConcat(stack3, mMtx, mMtx);
} else {
MTXTrans(mMtx, x, y, 0.0f);
}
}
/* 802D0800-802D08D8 .text setBasePosition__7J2DPaneF15J2DBasePosition */
@@ -209,13 +220,3 @@ void J2DPane::setBasePosition(J2DBasePosition pos) {
mRotationAxis = ROTATE_Z;
calcMtx();
}
/* 802D08D8-802D08DC .text drawSelf__7J2DPaneFffPA3_A4_f */
// void J2DPane::drawSelf(float, float, float (*)[3][4]) {
// /* Nonmatching */
// }
/* 802D08DC-802D08E4 .text getTypeID__7J2DPaneFv */
// u16 J2DPane::getTypeID() {
// /* Nonmatching */
// }