a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 12:40:00 +00:00
Code Issues Projects Releases Wiki Activity

More font fixes

Browse source
This commit is contained in:
Sergeanur 2021-01-13 01:01:04 +02:00
parent 4505b8795a
commit 92b1e8ab75
1 changed files with 92 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
src/render/Font.cpp
View file

@ -274,13 +274,13 @@ CFont::Initialise(void)
SetScale(1.0f, 1.0f); SetScale(1.0f, 1.0f);
SetSlantRefPoint(SCREEN_WIDTH, 0.0f); SetSlantRefPoint(SCREEN_WIDTH, 0.0f);
SetSlant(0.0f); SetSlant(0.0f);
SetColor(CRGBA(0xFF, 0xFF, 0xFF, 0)); SetColor(CRGBA(255, 255, 255, 0));
SetJustifyOff(); SetJustifyOff();
SetCentreOff(); SetCentreOff();
SetWrapx(SCREEN_WIDTH); SetWrapx(SCREEN_WIDTH);
SetCentreSize(SCREEN_WIDTH); SetCentreSize(SCREEN_WIDTH);
SetBackgroundOff(); SetBackgroundOff();
SetBackgroundColor(CRGBA(0x80, 0x80, 0x80, 0x80)); SetBackgroundColor(CRGBA(128, 128, 128, 128));
SetBackGroundOnlyTextOff(); SetBackGroundOnlyTextOff();
SetPropOn(); SetPropOn();
SetFontStyle(FONT_BANK); SetFontStyle(FONT_BANK);
@ -614,10 +614,10 @@ CFont::PrintString(float xstart, float ystart, wchar *s)
x = xstart; x = xstart;
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
if (IsJapaneseFont()) if (IsJapaneseFont())
y += 32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY; y += 32.0f * Details.scaleY / 2.75f + 2.0f * Details.scaleY;
else else
#endif #endif
y += 32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY; y += 32.0f * Details.scaleY * 0.5f + 2.0f * Details.scaleY;
start = s; start = s;
}else }else
break; break;
@ -653,7 +653,7 @@ CFont::PrintString(float xstart, float ystart, wchar *s)
else else
x = 0.0f; x = 0.0f;
y += 32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY; y += 32.0f * Details.scaleY / 2.75f + 2.0f * Details.scaleY;
numSpaces = 0; numSpaces = 0;
first = true; first = true;
lineLength = 0.0f; lineLength = 0.0f;
@ -676,7 +676,7 @@ CFont::PrintString(float xstart, float ystart, wchar *s)
x = xstart; x = xstart;
else else
x = 0.0f; x = 0.0f;
y += 32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY; y += 32.0f * Details.scaleY / 2.75f + 2.0f * Details.scaleY;
numSpaces = 0; numSpaces = 0;
first = true; first = true;
lineLength = 0.0f; lineLength = 0.0f;
@ -753,10 +753,10 @@ CFont::GetNumberLines(float xstart, float ystart, wchar *s)
// Why even? // Why even?
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
if (IsJapanese()) if (IsJapanese())
y += 32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY; y += 32.0f * Details.scaleY / 2.75f + 2.0f * Details.scaleY;
else else
#endif #endif
y += 32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY; y += 32.0f * Details.scaleY * 0.5f + 2.0f * Details.scaleY;
}else{ }else{
// still space in current line // still space in current line
t = GetNextSpace(s); t = GetNextSpace(s);
@ -827,7 +827,7 @@ CFont::GetTextRect(CRect *rect, float xstart, float ystart, wchar *s)
else else
x = xstart; x = xstart;
numLines++; numLines++;
y += 32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY; y += 32.0f * Details.scaleY * 0.5f + 2.0f * Details.scaleY;
}else{ }else{
// still space in current line // still space in current line
t = GetNextSpace(s); t = GetNextSpace(s);
@ -855,11 +855,11 @@ CFont::GetTextRect(CRect *rect, float xstart, float ystart, wchar *s)
rect->right = xstart + maxlength/2 + 4.0f; rect->right = xstart + maxlength/2 + 4.0f;
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
if (IsJapaneseFont()) { if (IsJapaneseFont()) {
rect->bottom = (32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY) * numLines + ystart + (4.0f / 2.75f); rect->bottom = (32.0f * Details.scaleY / 2.75f + 2.0f * Details.scaleY) * numLines + ystart + (4.0f / 2.75f);
rect->top = ystart - (4.0f / 2.75f); rect->top = ystart - (4.0f / 2.75f);
} else { } else {
#endif #endif
rect->bottom = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines + ystart + 2.0f; rect->bottom = (32.0f * Details.scaleY * 0.5f + 2.0f * Details.scaleY) * numLines + ystart + 2.0f;
rect->top = ystart - 2.0f; rect->top = ystart - 2.0f;
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
} }
@ -869,11 +869,11 @@ CFont::GetTextRect(CRect *rect, float xstart, float ystart, wchar *s)
rect->right = xstart + Details.centreSize*0.5f + 4.0f; rect->right = xstart + Details.centreSize*0.5f + 4.0f;
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
if (IsJapaneseFont()) { if (IsJapaneseFont()) {
rect->bottom = (32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY) * numLines + ystart + (4.0f / 2.75f); rect->bottom = (32.0f * Details.scaleY / 2.75f + 2.0f * Details.scaleY) * numLines + ystart + (4.0f / 2.75f);
rect->top = ystart - (4.0f / 2.75f); rect->top = ystart - (4.0f / 2.75f);
} else { } else {
#endif #endif
rect->bottom = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines + ystart + 2.0f; rect->bottom = (32.0f * Details.scaleY * 0.5f + 2.0f * Details.scaleY) * numLines + ystart + 2.0f;
rect->top = ystart - 2.0f; rect->top = ystart - 2.0f;
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
} }
@ -886,10 +886,10 @@ CFont::GetTextRect(CRect *rect, float xstart, float ystart, wchar *s)
rect->bottom = ystart - 4.0f + 4.0f; rect->bottom = ystart - 4.0f + 4.0f;
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
if (IsJapaneseFont()) if (IsJapaneseFont())
rect->top = (32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY) * numLines + ystart + 2.0f + (4.0f / 2.75f); rect->top = (32.0f * Details.scaleY / 2.75f + 2.0f * Details.scaleY) * numLines + ystart + 2.0f + (4.0f / 2.75f);
else else
#endif #endif
rect->top = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines + ystart + 2.0f + 2.0f; rect->top = (32.0f * Details.scaleY * 0.5f + 2.0f * Details.scaleY) * numLines + ystart + 2.0f + 2.0f;
} }
} }
@ -1315,27 +1315,89 @@ CFont::ParseToken(wchar *s)
case 'n': case 'n':
NewLine = 1; NewLine = 1;
break; break;
case 'b': SetColor(CRGBA(27, 89, 130, 255)); Details.anonymous_23 = true; break; case 'b':
Details.color.r = 27;
Details.color.g = 89;
Details.color.b = 130;
Details.anonymous_23 = true;
break;
case 'f': case 'f':
Details.bFlash = !Details.bFlash; Details.bFlash = !Details.bFlash;
if (!Details.bFlash) if (!Details.bFlash)
Details.color.a = 255; Details.color.a = 255;
break; break;
case 'g': SetColor(CRGBA(255, 150, 225, 255)); Details.anonymous_23 = true; break; case 'g':
case 'h': SetColor(CRGBA(225, 225, 225, 255)); Details.anonymous_23 = true; break; Details.color.r = 255;
case 'l': SetColor(CRGBA(0, 0, 0, 255)); Details.anonymous_23 = true; break; Details.color.g = 150;
case 'o': SetColor(CRGBA(229, 125, 126, 255)); Details.anonymous_23 = true; break; Details.color.b = 225;
case 'p': SetColor(CRGBA(168, 110, 252, 255)); Details.anonymous_23 = true; break; Details.anonymous_23 = true;
case 'q': SetColor(CRGBA(199, 144, 203, 255)); Details.anonymous_23 = true; break; break;
case 'r': SetColor(CRGBA(255, 150, 225, 255)); Details.anonymous_23 = true; break; case 'h':
case 't': SetColor(CRGBA(86, 212, 146, 255)); Details.anonymous_23 = true; break; Details.color.r = 225;
case 'w': SetColor(CRGBA(175, 175, 175, 255)); Details.anonymous_23 = true; break; Details.color.g = 225;
Details.color.b = 225;
Details.anonymous_23 = true;
break;
case 'l':
Details.color.r = 0;
Details.color.g = 0;
Details.color.b = 0;
Details.anonymous_23 = true;
break;
case 'o':
Details.color.r = 229;
Details.color.g = 125;
Details.color.b = 126;
Details.anonymous_23 = true;
break;
case 'p':
Details.color.r = 168;
Details.color.g = 110;
Details.color.b = 252;
Details.anonymous_23 = true;
break;
case 'q':
Details.color.r = 199;
Details.color.g = 144;
Details.color.b = 203;
Details.anonymous_23 = true;
break;
case 'r':
Details.color.r = 255;
Details.color.g = 150;
Details.color.b = 225;
Details.anonymous_23 = true;
break;
case 't':
Details.color.r = 86;
Details.color.g = 212;
Details.color.b = 146;
Details.anonymous_23 = true;
break;
case 'w':
Details.color.r = 175;
Details.color.g = 175;
Details.color.b = 175;
Details.anonymous_23 = true;
break;
case 'x':
#ifdef FIX_BUGS #ifdef FIX_BUGS
case 'x': SetColor(CRGBA(0, 255, 255, 255)); Details.anonymous_23 = true; break; Details.color.r = 0;
Details.color.g = 255;
Details.color.b = 255;
#else #else
case 'x': SetColor(CRGBA(132, 146, 197, 255)); Details.anonymous_23 = true; break; Details.color.r = 132;
Details.color.g = 146;
Details.color.b = 197;
#endif #endif
case 'y': SetColor(CRGBA(255, 227, 79, 255)); Details.anonymous_23 = true; break; Details.anonymous_23 = true;
break;
case 'y':
Details.color.r = 255;
Details.color.g = 227;
Details.color.b = 79;
Details.anonymous_23 = true;
break;
#ifdef BUTTON_ICONS #ifdef BUTTON_ICONS
case 'U': PS2Symbol = BUTTON_UP; break; case 'U': PS2Symbol = BUTTON_UP; break;
case 'D': PS2Symbol = BUTTON_DOWN; break; case 'D': PS2Symbol = BUTTON_DOWN; break;
@ -1542,7 +1604,7 @@ CFont::RenderFontBuffer()
if (RenderState.bFontHalfTexture) if (RenderState.bFontHalfTexture)
c = FindNewCharacter(c); c = FindNewCharacter(c);
else if (c > 155) else if (c > 155)
c = 0; c = '\0';
if (RenderState.slant != 0.0f) if (RenderState.slant != 0.0f)
textPosY = (RenderState.slantRefX - textPosX) * RenderState.slant + RenderState.slantRefY; textPosY = (RenderState.slantRefX - textPosX) * RenderState.slant + RenderState.slantRefY;
@ -1556,7 +1618,7 @@ CFont::RenderFontBuffer()
// PS2 uses different chars for some symbols // PS2 uses different chars for some symbols
if (!RenderState.bFontHalfTexture && c == 30) c = 61; // wanted star if (!RenderState.bFontHalfTexture && c == 30) c = 61; // wanted star
#endif #endif
textPosX += RenderState.scaleX * (RenderState.proportional ? Size[RenderState.style][c] : Size[RenderState.style][209]); textPosX += RenderState.scaleX * GetCharacterWidth(c);
if (c == '\0') if (c == '\0')
textPosX += RenderState.fExtraSpace; textPosX += RenderState.fExtraSpace;
} }