mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-24 07:10:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Out of ideas

Browse Source
This commit is contained in:
robojumper
2025-04-03 13:26:28 +02:00
parent c890868bad
commit e7e08fa546
2 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/lyt/d_textbox.h
+16 -4
View File
@@ -79,6 +79,18 @@ private:
bool hasDynamicText();
void someDebugCheckMaybe();
int GetStoredLineStrNum(int i, f32 *pLineWidth, bool *pbOver) const {
*pbOver = mbOvers[i];
*pLineWidth = mLineWidths[i];
return mLineStrNums[i];
}
void SetStoredLineStrNum(int i, f32 lineWidth, int lineStrNum, bool bOver) {
mLineWidths[i] = lineWidth;
mLineStrNums[i] = lineStrNum;
mbOvers[i] = bOver;
}
/* 0x104 */ d2d::LytBase_c *mpLytBase;
/* 0x108 */ f32 mFixedWidth;
/* 0x10C */ u8 mIsWidthFixed;
@@ -87,11 +99,11 @@ private:
/* 0x120 */ f32 mMyScale;
/* 0x124 */ nw4r::ut::TextWriterBase<wchar_t> mTextWriter;
/* 0x188 */ nw4r::ut::Rect field_0x188;
/* 0x198 */ u32 field_0x198[10];
/* 0x198 */ u32 mLineStrNums[10];
/* 0x1C0 */ u8 mFontIdx;
/* 0x1C1 */ u8 mWindowSubtype;
/* 0x1C4 */ f32 field_0x1C4[10];
/* 0x1EC */ bool field_0x1EC[10];
/* 0x1C4 */ f32 mLineWidths[10];
/* 0x1EC */ bool mbOvers[10];
/* 0x1F6 */ u8 field_0x1F6;
/* 0x1F7 */ u8 field_0x1F7;
/* 0x1F8 */ u8 field_0x1F8;
@@ -99,7 +111,7 @@ private:
/* 0x1FA */ u8 field_0x1FA;
/* 0x1FC */ dTagProcessor_c *mpMyTagProcessor;
/* 0x200 */ bool mHasTextWriter;
/* 0x201 */ u8 field_0x201;
/* 0x201 */ bool field_0x201;
};
#endif
src/d/lyt/d_textbox.cpp
+19 -16
View File
@@ -486,9 +486,9 @@ void dTextBox_c::init() {
mpMyTagProcessor = nullptr;
MySetFontSize(GetFontSize());
for (int i = 0; i < 10; i++) {
field_0x198[i] = 0;
field_0x1C4[i] = 0.0f;
field_0x1EC[i] = 0;
mLineStrNums[i] = 0;
mLineWidths[i] = 0.0f;
mbOvers[i] = 0;
}
f32 f1 = 35.0f;
@@ -506,7 +506,7 @@ void dTextBox_c::init() {
mMyTextScale = sz;
mMyScale = 1.0f;
mWindowSubtype = 0x24;
field_0x201 = 1;
field_0x201 = true;
}
bool dTextBox_c::hasDynamicText() {
@@ -638,11 +638,11 @@ void dTextBox_c::DrawSelf(const nw4r::lyt::DrawInfo &drawInfo) {
textRect.bottom -= f;
}
nw4r::ut::Color c1 = nw4r::lyt::detail::MultipleAlpha(GetTextColor(0), GetGlobalAlpha());
nw4r::ut::Color c2 = nw4r::lyt::detail::MultipleAlpha(GetTextColor(2), GetGlobalAlpha());
nw4r::ut::Color topCol = nw4r::lyt::detail::MultipleAlpha(mTextColors[0], mGlbAlpha);
nw4r::ut::Color btmCol = nw4r::lyt::detail::MultipleAlpha(mTextColors[1], mGlbAlpha);
writer.SetGradationMode(c1 != c2 ? nw4r::ut::CharWriter::GRADMODE_V : nw4r::ut::CharWriter::GRADMODE_NONE);
writer.SetTextColor(c1, c2);
writer.SetGradationMode(topCol != btmCol ? nw4r::ut::CharWriter::GRADMODE_V : nw4r::ut::CharWriter::GRADMODE_NONE);
writer.SetTextColor(topCol, btmCol);
nw4r::ut::Color minCol = GetColor(mpMaterial->GetTevColor(0));
nw4r::ut::Color maxCol = GetColor(mpMaterial->GetTevColor(1));
@@ -681,14 +681,16 @@ void dTextBox_c::DrawSelf(const nw4r::lyt::DrawInfo &drawInfo) {
strPos += lineStrNum;
remain -= lineStrNum;
}
} else if (!mHasTextWriter && field_0x201 == 1) {
} else if (!mHasTextWriter && field_0x201 == true) {
// Taking parameters from the three arrays, instead of calculating them
int remain = mTextLen;
while (remain > 0 && i < 10) {
bool bOver;
f32 lineWidth = field_0x1C4[i];
int lineStrNum = field_0x198[i];
bOver = field_0x1EC[i];
f32 lineWidth;
int lineStrNum = GetStoredLineStrNum(i, &lineWidth, &bOver);
// lineWidth = mLineWidths[i];
// int lineStrNum = mLineStrNums[i];
// bOver = mbOvers[i];
f32 textPosX = textRect.left + hMag * (texWidth - lineWidth);
writer.SetCursorX(textPosX);
writer.PrintMutable(strPos, lineStrNum);
@@ -709,10 +711,11 @@ void dTextBox_c::DrawSelf(const nw4r::lyt::DrawInfo &drawInfo) {
f32 textPosX = textRect.left + hMag * (texWidth - lineWidth);
writer.SetCursorX(textPosX);
writer.PrintMutable(strPos, lineStrNum);
if (mHasTextWriter && field_0x201 == 1 && i < 10) {
field_0x1C4[i] = lineWidth;
field_0x198[i] = lineStrNum;
field_0x1EC[i] = bOver;
if (mHasTextWriter && field_0x201 == true && i < 10) {
SetStoredLineStrNum(i, lineWidth, lineStrNum, bOver);
// mLineWidths[i] = lineWidth;
// mLineStrNums[i] = lineStrNum;
// mbOvers[i] = bOver;
}
if (bOver) {
writer.PrintMutable(L"\n", 1);