mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-25 06:01:55 +00:00
commit
3f5ecbe007
|
@ -160,7 +160,7 @@ cMusicManager::DisplayRadioStationName()
|
||||||
CFont::SetBackgroundOff();
|
CFont::SetBackgroundOff();
|
||||||
CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
|
CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
|
||||||
CFont::SetPropOn();
|
CFont::SetPropOn();
|
||||||
CFont::SetFontStyle(FONT_HEADING);
|
CFont::SetFontStyle(FONT_STANDARD);
|
||||||
CFont::SetCentreOn();
|
CFont::SetCentreOn();
|
||||||
CFont::SetCentreSize(SCREEN_SCALE_X(640.0f));
|
CFont::SetCentreSize(SCREEN_SCALE_X(640.0f));
|
||||||
CFont::SetColor(CRGBA(0, 0, 0, 255));
|
CFont::SetColor(CRGBA(0, 0, 0, 255));
|
||||||
|
|
|
@ -3,67 +3,38 @@
|
||||||
#include "Sprite2d.h"
|
#include "Sprite2d.h"
|
||||||
#include "TxdStore.h"
|
#include "TxdStore.h"
|
||||||
#include "Font.h"
|
#include "Font.h"
|
||||||
|
#include "Timer.h"
|
||||||
|
|
||||||
CFontDetails CFont::Details;
|
CFontDetails CFont::Details;
|
||||||
int16 CFont::NewLine;
|
int16 CFont::NewLine;
|
||||||
CSprite2d CFont::Sprite[MAX_FONTS];
|
CSprite2d CFont::Sprite[MAX_FONTS];
|
||||||
|
CFontRenderState CFont::RenderState;
|
||||||
|
|
||||||
#ifdef MORE_LANGUAGES
|
#ifdef MORE_LANGUAGES
|
||||||
uint8 CFont::LanguageSet = FONT_LANGSET_EFIGS;
|
uint8 CFont::LanguageSet = FONT_LANGSET_EFIGS;
|
||||||
int32 CFont::Slot = -1;
|
int32 CFont::Slot = -1;
|
||||||
#define JAP_TERMINATION (0x8000 | '~')
|
#define JAP_TERMINATION (0x8000 | '~')
|
||||||
|
|
||||||
int16 CFont::Size[LANGSET_MAX][MAX_FONTS][193] = {
|
int16 CFont::Size[LANGSET_MAX][MAX_FONTS][210] = {
|
||||||
{
|
{
|
||||||
#else
|
#else
|
||||||
int16 CFont::Size[MAX_FONTS][193] = {
|
int16 CFont::Size[MAX_FONTS][210] = {
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
13, 12, 31, 35, 23, 35, 31, 9, 14, 15, 25, 30, 11, 17, 13, 31,
|
12, 9, 22, 17, 19, 19, 25, 4, 33, 33, 25, 35, 11, 10, 6, 33, 18, 10, 17, 17, 17, 17, 17, 15, 12, 16, 5, 30, 30, 30, 30, 30, 12, 16, 19,
|
||||||
23, 16, 22, 21, 24, 23, 23, 20, 23, 22, 10, 35, 26, 26, 26, 26,
|
16, 19, 18, 18, 17, 22, 11, 17, 18, 18, 30, 22, 19, 22, 19, 19, 20, 18, 19, 19, 29, 19, 18, 19, 19, 33, 33, 19, 19, 12, 14, 11, 11, 16, 11,
|
||||||
30, 26, 24, 23, 24, 22, 21, 24, 26, 10, 20, 26, 22, 29, 26, 25,
|
12, 14, 14, 10, 13, 12, 10, 19, 18, 12, 16, 13, 13, 11, 12, 15, 12, 15, 13, 12, 12, 37, 33, 37, 35, 37, 16, 16, 16, 16, 33, 17, 18, 18, 18,
|
||||||
23, 25, 24, 24, 22, 25, 24, 29, 29, 23, 25, 37, 22, 37, 35, 37,
|
18, 11, 11, 11, 11, 19, 19, 19, 19, 19, 19, 19, 19, 15, 14, 14, 14, 14, 20, 14, 11, 11, 11, 11, 10, 10, 10, 10, 12, 12, 12, 12, 15, 15, 15,
|
||||||
35, 21, 22, 21, 21, 22, 13, 22, 21, 10, 16, 22, 11, 32, 21, 21,
|
15, 24, 18, 21, 10, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
|
||||||
23, 22, 16, 20, 14, 21, 20, 30, 25, 21, 21, 33, 33, 33, 33, 35,
|
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 16
|
||||||
27, 27, 27, 27, 32, 24, 23, 23, 23, 23, 11, 11, 11, 11, 26, 26,
|
|
||||||
26, 26, 26, 26, 26, 25, 26, 21, 21, 21, 21, 32, 23, 22, 22, 22,
|
|
||||||
22, 11, 11, 11, 11, 22, 22, 22, 22, 22, 22, 22, 22, 26, 21, 24,
|
|
||||||
12, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
|
|
||||||
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 18, 26, 26,
|
|
||||||
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
|
|
||||||
20
|
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
13, 9, 21, 35, 23, 35, 35, 11, 35, 35, 25, 35, 11, 17, 13, 33,
|
15, 7, 31, 25, 20, 23, 21, 7, 11, 10, 26, 14, 6, 12, 6, 26, 20, 7, 20, 20, 21, 20, 20, 19, 21, 20, 8, 30, 24, 30, 24, 19, 20, 22, 22, 21, 22, 18, 18, 22,
|
||||||
28, 14, 22, 21, 24, 23, 23, 21, 23, 22, 10, 35, 13, 35, 13, 33,
|
22, 9, 14, 21, 18, 27, 21, 24, 22, 22, 23, 20, 19, 23, 22, 31, 23, 23, 21, 25, 13, 30, 10, 19, 10, 17, 17, 16, 17, 17, 11, 17, 17, 7, 7, 18, 7, 25, 17,
|
||||||
5, 25, 22, 23, 24, 21, 21, 24, 24, 9, 20, 24, 21, 27, 25, 25,
|
17, 17, 17, 11, 17, 11, 17, 18, 25, 19, 18, 17, 28, 26, 20, 15, 15, 20, 20, 20, 20, 29, 22, 19, 19, 19, 19, 9, 9, 9, 9, 23, 23, 23, 23, 24, 24, 24, 24,
|
||||||
22, 25, 23, 20, 23, 23, 23, 31, 23, 23, 23, 37, 33, 37, 35, 37,
|
20, 19, 17, 17, 17, 30, 16, 17, 17, 17, 17, 11, 11, 15, 12, 17, 17, 17, 17, 17, 17, 17, 17, 19, 20, 20, 20, 18, 19, 19, 21, 19, 19, 19, 19, 19, 16, 19,
|
||||||
35, 21, 19, 19, 21, 19, 17, 21, 21, 8, 17, 18, 14, 24, 21, 21,
|
19, 19, 20, 19, 16, 19, 19, 9, 19, 20, 14, 29, 19, 19, 19, 19, 19, 19, 21, 19, 20, 32, 20, 19, 19, 19, 19, 19, 19, 29, 19, 19, 19, 19, 19, 9, 9, 9, 9,
|
||||||
20, 22, 19, 20, 20, 19, 20, 26, 21, 20, 21, 33, 33, 33, 33, 35,
|
19, 19, 19, 19, 19, 19, 19, 19, 19, 21, 21, 10, 9, 10, 20
|
||||||
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
|
|
||||||
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
|
|
||||||
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
|
|
||||||
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
|
|
||||||
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
|
|
||||||
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
|
|
||||||
16
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
15, 14, 16, 25, 19, 26, 22, 11, 18, 18, 27, 26, 13, 19, 9, 27,
|
|
||||||
19, 18, 19, 19, 22, 19, 20, 18, 19, 20, 12, 32, 15, 32, 15, 35,
|
|
||||||
15, 19, 19, 19, 19, 19, 16, 19, 20, 9, 19, 20, 14, 29, 19, 20,
|
|
||||||
19, 19, 19, 19, 21, 19, 20, 32, 20, 19, 19, 33, 31, 39, 37, 39,
|
|
||||||
37, 21, 21, 21, 23, 21, 19, 23, 23, 10, 19, 20, 16, 26, 23, 23,
|
|
||||||
20, 20, 20, 22, 21, 22, 22, 26, 22, 22, 23, 35, 35, 35, 35, 37,
|
|
||||||
19, 19, 19, 19, 29, 19, 19, 19, 19, 19, 9, 9, 9, 9, 19, 19,
|
|
||||||
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 30, 19, 19, 19, 19,
|
|
||||||
19, 10, 10, 10, 10, 19, 19, 19, 19, 19, 19, 19, 19, 19, 23, 35,
|
|
||||||
12, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
|
|
||||||
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 11, 19, 19,
|
|
||||||
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
|
|
||||||
19
|
|
||||||
}
|
}
|
||||||
#ifdef MORE_LANGUAGES
|
#ifdef MORE_LANGUAGES
|
||||||
},
|
},
|
||||||
|
@ -198,6 +169,21 @@ wchar foreign_table[128] = {
|
||||||
0, 174, 165, 166, 167, 0, 168, 0, 0, 169, 170, 171, 172, 0, 0, 0,
|
0, 174, 165, 166, 167, 0, 168, 0, 0, 169, 170, 171, 172, 0, 0, 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
union tFontRenderStatePointer
|
||||||
|
{
|
||||||
|
CFontRenderState *pRenderState;
|
||||||
|
wchar *pStr;
|
||||||
|
|
||||||
|
void Align()
|
||||||
|
{
|
||||||
|
if ((uintptr)pStr % 4)
|
||||||
|
pStr++;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
tFontRenderStatePointer FontRenderStatePointer;
|
||||||
|
uint8 FontRenderStateBuf[1024];
|
||||||
|
|
||||||
void
|
void
|
||||||
CFont::Initialise(void)
|
CFont::Initialise(void)
|
||||||
{
|
{
|
||||||
|
@ -228,16 +214,14 @@ CFont::Initialise(void)
|
||||||
CTxdStore::AddRef(slot);
|
CTxdStore::AddRef(slot);
|
||||||
CTxdStore::PushCurrentTxd();
|
CTxdStore::PushCurrentTxd();
|
||||||
CTxdStore::SetCurrentTxd(slot);
|
CTxdStore::SetCurrentTxd(slot);
|
||||||
Sprite[0].SetTexture("font2", "font2_mask");
|
Sprite[0].SetTexture("font2", "font2m");
|
||||||
#ifdef MORE_LANGUAGES
|
#ifdef MORE_LANGUAGES
|
||||||
if (IsJapanese()) {
|
if (IsJapanese()) {
|
||||||
Sprite[1].SetTexture("FONTJAP", "FONTJAP_mask");
|
Sprite[1].SetTexture("FONTJAP", "FONTJAP_mask");
|
||||||
Sprite[3].SetTexture("FONTJAP", "FONTJAP_mask");
|
Sprite[3].SetTexture("FONTJAP", "FONTJAP_mask");
|
||||||
}
|
}
|
||||||
else
|
|
||||||
#endif // MORE_LANGUAGES
|
#endif // MORE_LANGUAGES
|
||||||
Sprite[1].SetTexture("pager", "pager_mask");
|
Sprite[1].SetTexture("font1", "font1m");
|
||||||
Sprite[2].SetTexture("font1", "font1_mask");
|
|
||||||
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);
|
||||||
|
@ -250,7 +234,7 @@ CFont::Initialise(void)
|
||||||
SetBackgroundColor(CRGBA(0x80, 0x80, 0x80, 0x80));
|
SetBackgroundColor(CRGBA(0x80, 0x80, 0x80, 0x80));
|
||||||
SetBackGroundOnlyTextOff();
|
SetBackGroundOnlyTextOff();
|
||||||
SetPropOn();
|
SetPropOn();
|
||||||
SetFontStyle(FONT_STANDARD);
|
SetFontStyle(FONT_BANK);
|
||||||
SetRightJustifyWrap(0.0f);
|
SetRightJustifyWrap(0.0f);
|
||||||
SetAlphaFade(255.0f);
|
SetAlphaFade(255.0f);
|
||||||
SetDropShadowPosition(0);
|
SetDropShadowPosition(0);
|
||||||
|
@ -305,7 +289,6 @@ CFont::Shutdown(void)
|
||||||
{
|
{
|
||||||
Sprite[0].Delete();
|
Sprite[0].Delete();
|
||||||
Sprite[1].Delete();
|
Sprite[1].Delete();
|
||||||
Sprite[2].Delete();
|
|
||||||
#ifdef MORE_LANGUAGES
|
#ifdef MORE_LANGUAGES
|
||||||
if (IsJapanese())
|
if (IsJapanese())
|
||||||
Sprite[3].Delete();
|
Sprite[3].Delete();
|
||||||
|
@ -319,13 +302,9 @@ CFont::Shutdown(void)
|
||||||
void
|
void
|
||||||
CFont::InitPerFrame(void)
|
CFont::InitPerFrame(void)
|
||||||
{
|
{
|
||||||
Details.bank = CSprite2d::GetBank(30, Sprite[0].m_pTexture);
|
RenderState.style = -1;
|
||||||
CSprite2d::GetBank(15, Sprite[1].m_pTexture);
|
Details.anonymous_25 = 0;
|
||||||
CSprite2d::GetBank(15, Sprite[2].m_pTexture);
|
FontRenderStatePointer.pRenderState = (CFontRenderState*)FontRenderStateBuf;
|
||||||
#ifdef MORE_LANGUAGES
|
|
||||||
if (IsJapanese())
|
|
||||||
CSprite2d::GetBank(15, Sprite[3].m_pTexture);
|
|
||||||
#endif
|
|
||||||
SetDropShadowPosition(0);
|
SetDropShadowPosition(0);
|
||||||
NewLine = 0;
|
NewLine = 0;
|
||||||
}
|
}
|
||||||
|
@ -333,11 +312,15 @@ CFont::InitPerFrame(void)
|
||||||
void
|
void
|
||||||
CFont::PrintChar(float x, float y, wchar c)
|
CFont::PrintChar(float x, float y, wchar c)
|
||||||
{
|
{
|
||||||
|
bool bDontPrint = false;
|
||||||
if(x <= 0.0f || x > SCREEN_WIDTH ||
|
if(x <= 0.0f || x > SCREEN_WIDTH ||
|
||||||
y <= 0.0f || y > SCREEN_HEIGHT) // BUG: game uses SCREENW again
|
y <= 0.0f || y > SCREEN_HEIGHT) // BUG: game uses SCREENW again
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
bDontPrint = c == '\0';
|
||||||
float w = GetCharacterWidth(c) / 32.0f;
|
float w = GetCharacterWidth(c) / 32.0f;
|
||||||
|
if (Details.bFontHalfTexture && c == 208)
|
||||||
|
c = '\0';
|
||||||
float xoff = c % 16;
|
float xoff = c % 16;
|
||||||
float yoff = c / 16;
|
float yoff = c / 16;
|
||||||
#ifdef MORE_LANGUAGES
|
#ifdef MORE_LANGUAGES
|
||||||
|
@ -348,28 +331,40 @@ CFont::PrintChar(float x, float y, wchar c)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(Details.style == FONT_STANDARD || Details.style == FONT_HEADING){
|
if(Details.style == FONT_BANK || Details.style == FONT_STANDARD){
|
||||||
if(Details.dropShadowPosition != 0){
|
if (bDontPrint) return;
|
||||||
CSprite2d::AddSpriteToBank(Details.bank + Details.style, // BUG: game doesn't add bank
|
if (RenderState.slant == 0.0f) {
|
||||||
CRect(x + SCREEN_SCALE_X(Details.dropShadowPosition),
|
if (c < 193) {
|
||||||
y + SCREEN_SCALE_Y(Details.dropShadowPosition),
|
CSprite2d::AddToBuffer(
|
||||||
x + SCREEN_SCALE_X(Details.dropShadowPosition) + 32.0f * Details.scaleX * 1.0f,
|
|
||||||
y + SCREEN_SCALE_Y(Details.dropShadowPosition) + 40.0f * Details.scaleY * 0.5f),
|
|
||||||
Details.dropColor,
|
|
||||||
xoff/16.0f, yoff/12.8f,
|
|
||||||
(xoff+1.0f)/16.0f - 0.001f, yoff/12.8f,
|
|
||||||
xoff/16.0f, (yoff+1.0f)/12.8f,
|
|
||||||
(xoff+1.0f)/16.0f - 0.001f, (yoff+1.0f)/12.8f - 0.0001f);
|
|
||||||
}
|
|
||||||
CSprite2d::AddSpriteToBank(Details.bank + Details.style, // BUG: game doesn't add bank
|
|
||||||
CRect(x, y,
|
CRect(x, y,
|
||||||
x + 32.0f * Details.scaleX * 1.0f,
|
x + 32.0f * RenderState.scaleX * 1.0f,
|
||||||
y + 40.0f * Details.scaleY * 0.5f),
|
y + 40.0f * RenderState.scaleY * 0.5f),
|
||||||
Details.color,
|
RenderState.color,
|
||||||
|
xoff / 16.0f, yoff / 12.8f + 0.0021f,
|
||||||
|
(xoff + 1.0f) / 16.0f - 0.001f, yoff / 12.8f + 0.0021f,
|
||||||
|
xoff / 16.0f, (yoff + 1.0f) / 12.8f - 0.0021f,
|
||||||
|
(xoff + 1.0f) / 16.0f - 0.001f, (yoff + 1.0f) / 12.8f - 0.0021f);
|
||||||
|
} else {
|
||||||
|
CSprite2d::AddToBuffer(
|
||||||
|
CRect(x, y,
|
||||||
|
x + 32.0f * RenderState.scaleX * 1.0f,
|
||||||
|
y + 33.0f * RenderState.scaleY * 0.5f),
|
||||||
|
RenderState.color,
|
||||||
xoff / 16.0f, yoff / 12.8f,
|
xoff / 16.0f, yoff / 12.8f,
|
||||||
(xoff+1.0f)/16.0f - 0.001f, yoff/12.8f,
|
(xoff + 1.0f) / 16.0f - 0.001f, yoff / 12.8f - 0.017f,
|
||||||
xoff/16.0f, (yoff+1.0f)/12.8f - 0.002f,
|
xoff / 16.0f, (yoff + 1.0f) / 12.8f,
|
||||||
(xoff+1.0f)/16.0f - 0.001f, (yoff+1.0f)/12.8f - 0.002f);
|
(xoff + 1.0f) / 16.0f - 0.001f, (yoff + 1.0f) / 12.8f - 0.017f);
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
CSprite2d::AddToBuffer(
|
||||||
|
CRect(x, y,
|
||||||
|
x + 32.0f * RenderState.scaleX * 1.0f,
|
||||||
|
y + 40.0f * RenderState.scaleY * 0.5f),
|
||||||
|
RenderState.color,
|
||||||
|
xoff / 16.0f, yoff / 12.8f + 0.00055f,
|
||||||
|
(xoff + 1.0f) / 16.0f - 0.001f, yoff / 12.8f + 0.0021f + 0.01f,
|
||||||
|
xoff / 16.0f, (yoff + 1.0f) / 12.8f - 0.009f,
|
||||||
|
(xoff + 1.0f) / 16.0f - 0.001f, (yoff + 1.0f) / 12.8f - 0.0021f + 0.01f);
|
||||||
#ifdef MORE_LANGUAGES
|
#ifdef MORE_LANGUAGES
|
||||||
}else if (IsJapaneseFont()) {
|
}else if (IsJapaneseFont()) {
|
||||||
if (Details.dropShadowPosition != 0) {
|
if (Details.dropShadowPosition != 0) {
|
||||||
|
@ -394,17 +389,19 @@ CFont::PrintChar(float x, float y, wchar c)
|
||||||
xoff * w / 1024.0f, (yoff + 1.0f) / 25.6f - 0.002f,
|
xoff * w / 1024.0f, (yoff + 1.0f) / 25.6f - 0.002f,
|
||||||
xoff * w / 1024.0f + (1.0f / 48.0f) - 0.001f, (yoff + 1.0f) / 25.6f - 0.0001f);
|
xoff * w / 1024.0f + (1.0f / 48.0f) - 0.001f, (yoff + 1.0f) / 25.6f - 0.0001f);
|
||||||
#endif
|
#endif
|
||||||
}else
|
} else {
|
||||||
CSprite2d::AddSpriteToBank(Details.bank + Details.style, // BUG: game doesn't add bank
|
if (bDontPrint) return;
|
||||||
|
CSprite2d::AddToBuffer(
|
||||||
CRect(x, y,
|
CRect(x, y,
|
||||||
x + 32.0f * Details.scaleX * w,
|
x + 32.0f * RenderState.scaleX * w,
|
||||||
y + 32.0f * Details.scaleY * 0.5f),
|
y + 32.0f * RenderState.scaleY * 0.5f),
|
||||||
Details.color,
|
RenderState.color,
|
||||||
xoff / 16.0f, yoff / 16.0f,
|
xoff / 16.0f, yoff / 16.0f,
|
||||||
(xoff + w) / 16.0f, yoff / 16.0f,
|
(xoff + w) / 16.0f, yoff / 16.0f,
|
||||||
xoff / 16.0f, (yoff + 1.0f) / 16.0f,
|
xoff / 16.0f, (yoff + 1.0f) / 16.0f,
|
||||||
(xoff + w) / 16.0f - 0.0001f, (yoff + 1.0f) / 16.0f - 0.0001f);
|
(xoff + w) / 16.0f - 0.0001f, (yoff + 1.0f) / 16.0f - 0.0001f);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef MORE_LANGUAGES
|
#ifdef MORE_LANGUAGES
|
||||||
bool CFont::IsJapanesePunctuation(wchar *str)
|
bool CFont::IsJapanesePunctuation(wchar *str)
|
||||||
|
@ -483,6 +480,8 @@ CFont::PrintString(float xstart, float ystart, wchar *s)
|
||||||
xstart;
|
xstart;
|
||||||
#ifdef MORE_LANGUAGES
|
#ifdef MORE_LANGUAGES
|
||||||
PrintString(xleft, y, start, s, spaceWidth, xstart);
|
PrintString(xleft, y, start, s, spaceWidth, xstart);
|
||||||
|
#else
|
||||||
|
PrintString(xleft, y, Details.anonymous_25, start, s, spaceWidth);
|
||||||
#endif
|
#endif
|
||||||
// reset things
|
// reset things
|
||||||
lineLength = 0.0f;
|
lineLength = 0.0f;
|
||||||
|
@ -562,7 +561,7 @@ CFont::PrintString(float xstart, float ystart, wchar *s)
|
||||||
lineLength = 0.0f;
|
lineLength = 0.0f;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
PrintString(xleft, y, start, s, 0.0f);
|
PrintString(xleft, y, Details.anonymous_25, start, s, 0.0f);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -803,24 +802,81 @@ CFont::PrintString(float x, float y, wchar *start, wchar *&end, float spwidth, f
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
void
|
void
|
||||||
CFont::PrintString(float x, float y, wchar *start, wchar *end, float spwidth)
|
CFont::PrintString(float x, float y, uint32, wchar *start, wchar *end, float spwidth)
|
||||||
{
|
{
|
||||||
wchar *s, c, unused;
|
wchar *s;
|
||||||
|
|
||||||
for(s = start; s < end; s++){
|
if (RenderState.style != Details.style) {
|
||||||
if(*s == '~')
|
RenderFontBuffer();
|
||||||
s = ParseToken(s, &unused);
|
RenderState.style = Details.style;
|
||||||
c = *s - ' ';
|
|
||||||
if(Details.slant != 0.0f)
|
|
||||||
y = (Details.slantRefX - x)*Details.slant + Details.slantRefY;
|
|
||||||
PrintChar(x, y, c);
|
|
||||||
x += GetCharacterSize(c);
|
|
||||||
if(c == 0) // space
|
|
||||||
x += spwidth;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
float dropShadowPosition = Details.dropShadowPosition;
|
||||||
|
if (dropShadowPosition != 0.0f && (Details.style == FONT_BANK || Details.style == FONT_STANDARD)) {
|
||||||
|
CRGBA color = Details.color;
|
||||||
|
Details.color = Details.dropColor;
|
||||||
|
Details.dropShadowPosition = 0;
|
||||||
|
Details.bIsShadow = true;
|
||||||
|
if (Details.slant != 0.0f) {
|
||||||
|
Details.slantRefX += dropShadowPosition;
|
||||||
|
Details.slantRefY += dropShadowPosition;
|
||||||
|
PrintString(dropShadowPosition + x, dropShadowPosition + y, Details.anonymous_25, start, end, spwidth);
|
||||||
|
Details.slantRefX -= dropShadowPosition;
|
||||||
|
Details.slantRefY -= dropShadowPosition;
|
||||||
|
} else {
|
||||||
|
PrintString(dropShadowPosition + x, dropShadowPosition + y, Details.anonymous_25, start, end, spwidth);
|
||||||
|
}
|
||||||
|
Details.color = color;
|
||||||
|
Details.dropShadowPosition = dropShadowPosition;
|
||||||
|
Details.bIsShadow = false;
|
||||||
|
}
|
||||||
|
if (FontRenderStatePointer.pStr >= (wchar*)&FontRenderStateBuf[ARRAY_SIZE(FontRenderStateBuf)] - (end - start + 26)) // why 26?
|
||||||
|
RenderFontBuffer();
|
||||||
|
CFontRenderState *pRenderState = FontRenderStatePointer.pRenderState;
|
||||||
|
pRenderState->fTextPosX = x;
|
||||||
|
pRenderState->fTextPosY = y;
|
||||||
|
pRenderState->scaleX = Details.scaleX;
|
||||||
|
pRenderState->scaleY = Details.scaleY;
|
||||||
|
pRenderState->color = Details.color;
|
||||||
|
pRenderState->fExtraSpace = spwidth;
|
||||||
|
pRenderState->slant = Details.slant;
|
||||||
|
pRenderState->slantRefX = Details.slantRefX;
|
||||||
|
pRenderState->slantRefY = Details.slantRefY;
|
||||||
|
pRenderState->bFontHalfTexture = Details.bFontHalfTexture;
|
||||||
|
pRenderState->proportional = Details.proportional;
|
||||||
|
pRenderState->style = Details.style;
|
||||||
|
pRenderState->bIsShadow = Details.bIsShadow;
|
||||||
|
FontRenderStatePointer.pRenderState++;
|
||||||
|
|
||||||
|
for(s = start; s < end;){
|
||||||
|
if (*s == '~') {
|
||||||
|
for (wchar *i = ParseToken(s); s != i; FontRenderStatePointer.pStr++) {
|
||||||
|
*FontRenderStatePointer.pStr = *(s++);
|
||||||
|
}
|
||||||
|
if (Details.bFlash) {
|
||||||
|
if (CTimer::GetTimeInMilliseconds() - Details.nFlashTimer > 300) {
|
||||||
|
Details.bFlashState = !Details.bFlashState;
|
||||||
|
Details.nFlashTimer = CTimer::GetTimeInMilliseconds();
|
||||||
|
}
|
||||||
|
Details.color.a = Details.bFlashState ? 0 : 255;
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
*(FontRenderStatePointer.pStr++) = *(s++);
|
||||||
|
}
|
||||||
|
*(FontRenderStatePointer.pStr++) = '\0';
|
||||||
|
FontRenderStatePointer.Align();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
void
|
||||||
|
CFont::PrintStringFromBottom(float x, float y, wchar *str)
|
||||||
|
{
|
||||||
|
y -= (32.0f * Details.scaleY / 2.0f + 2.0f * Details.scaleY) * GetNumberLines(x, y, str);
|
||||||
|
if (Details.slant == 0.0f)
|
||||||
|
y -= ((Details.slantRefX - x) * Details.slant + Details.slantRefY);
|
||||||
|
PrintString(x, y, str);
|
||||||
|
}
|
||||||
|
|
||||||
float
|
float
|
||||||
CFont::GetCharacterWidth(wchar c)
|
CFont::GetCharacterWidth(wchar c)
|
||||||
{
|
{
|
||||||
|
@ -828,7 +884,7 @@ CFont::GetCharacterWidth(wchar c)
|
||||||
if (IsJapanese()) {
|
if (IsJapanese()) {
|
||||||
if (!Details.proportional)
|
if (!Details.proportional)
|
||||||
return Size[0][Details.style][192];
|
return Size[0][Details.style][192];
|
||||||
if (c <= 94 || Details.style == FONT_HEADING || Details.style == FONT_STANDARD) {
|
if (c <= 94 || Details.style == FONT_HEADING || Details.style == FONT_BANK) {
|
||||||
switch (Details.style)
|
switch (Details.style)
|
||||||
{
|
{
|
||||||
case FONT_JAPANESE:
|
case FONT_JAPANESE:
|
||||||
|
@ -844,7 +900,7 @@ CFont::GetCharacterWidth(wchar c)
|
||||||
{
|
{
|
||||||
case FONT_JAPANESE:
|
case FONT_JAPANESE:
|
||||||
return 29.4f;
|
return 29.4f;
|
||||||
case FONT_STANDARD:
|
case FONT_BANK:
|
||||||
return 10.0f;
|
return 10.0f;
|
||||||
case FONT_PAGER:
|
case FONT_PAGER:
|
||||||
return 31.5f;
|
return 31.5f;
|
||||||
|
@ -861,7 +917,7 @@ CFont::GetCharacterWidth(wchar c)
|
||||||
if (Details.proportional)
|
if (Details.proportional)
|
||||||
return Size[Details.style][c];
|
return Size[Details.style][c];
|
||||||
else
|
else
|
||||||
return Size[Details.style][192];
|
return Size[Details.style][209];
|
||||||
#endif // MORE_LANGUAGES
|
#endif // MORE_LANGUAGES
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -873,8 +929,8 @@ CFont::GetCharacterSize(wchar c)
|
||||||
if (IsJapanese())
|
if (IsJapanese())
|
||||||
{
|
{
|
||||||
if (!Details.proportional)
|
if (!Details.proportional)
|
||||||
return Size[0][Details.style][192] * Details.scaleX;
|
return Size[0][Details.style][209] * Details.scaleX;
|
||||||
if (c <= 94 || Details.style == FONT_HEADING || Details.style == FONT_STANDARD) {
|
if (c <= 94 || Details.style == FONT_HEADING || Details.style == FONT_BANK) {
|
||||||
switch (Details.style)
|
switch (Details.style)
|
||||||
{
|
{
|
||||||
case FONT_JAPANESE:
|
case FONT_JAPANESE:
|
||||||
|
@ -890,7 +946,7 @@ CFont::GetCharacterSize(wchar c)
|
||||||
{
|
{
|
||||||
case FONT_JAPANESE:
|
case FONT_JAPANESE:
|
||||||
return 29.4f * Details.scaleX;
|
return 29.4f * Details.scaleX;
|
||||||
case FONT_STANDARD:
|
case FONT_BANK:
|
||||||
return 10.0f * Details.scaleX;
|
return 10.0f * Details.scaleX;
|
||||||
case FONT_PAGER:
|
case FONT_PAGER:
|
||||||
return 31.5f * Details.scaleX;
|
return 31.5f * Details.scaleX;
|
||||||
|
@ -901,12 +957,14 @@ CFont::GetCharacterSize(wchar c)
|
||||||
else if(Details.proportional)
|
else if(Details.proportional)
|
||||||
return Size[LanguageSet][Details.style][c] * Details.scaleX;
|
return Size[LanguageSet][Details.style][c] * Details.scaleX;
|
||||||
else
|
else
|
||||||
return Size[LanguageSet][Details.style][192] * Details.scaleX;
|
return Size[LanguageSet][Details.style][209] * Details.scaleX;
|
||||||
#else
|
#else
|
||||||
|
if (Details.bFontHalfTexture)
|
||||||
|
c = FindNewCharacter(c);
|
||||||
if (Details.proportional)
|
if (Details.proportional)
|
||||||
return Size[Details.style][c] * Details.scaleX;
|
return Size[Details.style][c] * Details.scaleX;
|
||||||
else
|
else
|
||||||
return Size[Details.style][192] * Details.scaleX;
|
return Size[Details.style][209] * Details.scaleX;
|
||||||
#endif // MORE_LANGUAGES
|
#endif // MORE_LANGUAGES
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -954,7 +1012,8 @@ CFont::GetStringWidth(wchar *s, bool spaces)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
w += GetCharacterSize(c - ' ');
|
w += GetCharacterSize(c - ' ');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1020,7 +1079,7 @@ CFont::GetNextSpace(wchar *s)
|
||||||
|
|
||||||
#ifdef MORE_LANGUAGES
|
#ifdef MORE_LANGUAGES
|
||||||
wchar*
|
wchar*
|
||||||
CFont::ParseToken(wchar *s, wchar*, bool japShit)
|
CFont::ParseToken(wchar *s, bool japShit)
|
||||||
{
|
{
|
||||||
s++;
|
s++;
|
||||||
if ((Details.color.r || Details.color.g || Details.color.b) && !japShit) {
|
if ((Details.color.r || Details.color.g || Details.color.b) && !japShit) {
|
||||||
|
@ -1050,39 +1109,232 @@ CFont::ParseToken(wchar *s, wchar*, bool japShit)
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
wchar*
|
wchar*
|
||||||
CFont::ParseToken(wchar *s, wchar*)
|
CFont::ParseToken(wchar *s)
|
||||||
{
|
{
|
||||||
|
Details.anonymous_23 = false;
|
||||||
s++;
|
s++;
|
||||||
if(Details.color.r || Details.color.g || Details.color.b)
|
if(Details.color.r || Details.color.g || Details.color.b)
|
||||||
switch(*s){
|
switch(*s){
|
||||||
|
case 'B':
|
||||||
|
Details.bBold = !Details.bBold;
|
||||||
case 'N':
|
case 'N':
|
||||||
case 'n':
|
case 'n':
|
||||||
NewLine = 1;
|
NewLine = 1;
|
||||||
break;
|
break;
|
||||||
case 'b': SetColor(CRGBA(0x80, 0xA7, 0xF3, 0xFF)); break;
|
case 'b': SetColor(CRGBA(27, 89, 130, 255)); Details.anonymous_23 = true; break;
|
||||||
case 'g': SetColor(CRGBA(0x5F, 0xA0, 0x6A, 0xFF)); break;
|
case 'f':
|
||||||
case 'h': SetColor(CRGBA(0xE1, 0xE1, 0xE1, 0xFF)); break;
|
Details.bFlash = !Details.bFlash;
|
||||||
case 'l': SetColor(CRGBA(0x00, 0x00, 0x00, 0xFF)); break;
|
if (Details.bFlash)
|
||||||
case 'p': SetColor(CRGBA(0xA8, 0x6E, 0xFC, 0xFF)); break;
|
Details.color.a = 255;
|
||||||
case 'r': SetColor(CRGBA(0x71, 0x2B, 0x49, 0xFF)); break;
|
break;
|
||||||
case 'w': SetColor(CRGBA(0xAF, 0xAF, 0xAF, 0xFF)); break;
|
case 'g': SetColor(CRGBA(255, 150, 225, 255)); Details.anonymous_23 = true; break;
|
||||||
case 'y': SetColor(CRGBA(0xD2, 0xC4, 0x6A, 0xFF)); break;
|
case 'h': SetColor(CRGBA(225, 225, 225, 255)); Details.anonymous_23 = true; break;
|
||||||
|
case 'l': SetColor(CRGBA(0, 0, 0, 255)); Details.anonymous_23 = true; break;
|
||||||
|
case 'o': SetColor(CRGBA(229, 125, 126, 255)); Details.anonymous_23 = true; break;
|
||||||
|
case 'p': SetColor(CRGBA(168, 110, 252, 255)); Details.anonymous_23 = true; break;
|
||||||
|
case 'q': SetColor(CRGBA(199, 144, 203, 255)); Details.anonymous_23 = true; break;
|
||||||
|
case 'r': SetColor(CRGBA(255, 150, 225, 255)); Details.anonymous_23 = true; break;
|
||||||
|
case 't': SetColor(CRGBA(86, 212, 146, 255)); Details.anonymous_23 = true; break;
|
||||||
|
case 'w': SetColor(CRGBA(175, 175, 175, 255)); Details.anonymous_23 = true; break;
|
||||||
|
case 'x': SetColor(CRGBA(132, 146, 197, 255)); Details.anonymous_23 = true; break;
|
||||||
|
case 'y': SetColor(CRGBA(255, 227, 79, 255)); Details.anonymous_23 = true; break;
|
||||||
}
|
}
|
||||||
while(*s != '~') s++;
|
while(*s != '~') s++;
|
||||||
return s+1;
|
if (*(++s) == '~')
|
||||||
|
s = ParseToken(s);
|
||||||
|
return s;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
wchar*
|
||||||
|
CFont::ParseToken(wchar* str, CRGBA &color, bool &flash, bool &bold)
|
||||||
|
{
|
||||||
|
Details.anonymous_23 = false;
|
||||||
|
wchar *s = str + 1;
|
||||||
|
if (Details.color.r || Details.color.g || Details.color.b)
|
||||||
|
{
|
||||||
|
switch (*s)
|
||||||
|
{
|
||||||
|
case 'B':
|
||||||
|
bold = !bold;
|
||||||
|
break;
|
||||||
|
case 'b':
|
||||||
|
color.r = 27;
|
||||||
|
color.g = 89;
|
||||||
|
color.b = 130;
|
||||||
|
break;
|
||||||
|
case 'f':
|
||||||
|
flash = !flash;
|
||||||
|
break;
|
||||||
|
case 'g':
|
||||||
|
color.r = 255;
|
||||||
|
color.g = 150;
|
||||||
|
color.b = 225;
|
||||||
|
break;
|
||||||
|
case 'h':
|
||||||
|
color.r = 225;
|
||||||
|
color.g = 225;
|
||||||
|
color.b = 225;
|
||||||
|
break;
|
||||||
|
case 'l':
|
||||||
|
color.r = 0;
|
||||||
|
color.g = 0;
|
||||||
|
color.b = 0;
|
||||||
|
break;
|
||||||
|
case 'o':
|
||||||
|
color.r = 229;
|
||||||
|
color.g = 125;
|
||||||
|
color.b = 126;
|
||||||
|
break;
|
||||||
|
case 'p':
|
||||||
|
color.r = 168;
|
||||||
|
color.g = 110;
|
||||||
|
color.b = 252;
|
||||||
|
break;
|
||||||
|
case 'q':
|
||||||
|
color.r = 199;
|
||||||
|
color.g = 144;
|
||||||
|
color.b = 203;
|
||||||
|
break;
|
||||||
|
case 'r':
|
||||||
|
color.r = 255;
|
||||||
|
color.g = 150;
|
||||||
|
color.b = 225;
|
||||||
|
break;
|
||||||
|
case 't':
|
||||||
|
color.r = 86;
|
||||||
|
color.g = 212;
|
||||||
|
color.b = 146;
|
||||||
|
break;
|
||||||
|
case 'w':
|
||||||
|
color.r = 175;
|
||||||
|
color.g = 175;
|
||||||
|
color.b = 175;
|
||||||
|
break;
|
||||||
|
case 'x':
|
||||||
|
color.r = 132;
|
||||||
|
color.g = 146;
|
||||||
|
color.b = 197;
|
||||||
|
break;
|
||||||
|
case 'y':
|
||||||
|
color.r = 255;
|
||||||
|
color.g = 227;
|
||||||
|
color.b = 79;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
while (*s != '~')
|
||||||
|
++s;
|
||||||
|
if (*(++s) == '~')
|
||||||
|
s = ParseToken(s, color, flash, bold);
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
CFont::DrawFonts(void)
|
CFont::DrawFonts(void)
|
||||||
{
|
{
|
||||||
CSprite2d::DrawBank(Details.bank);
|
RenderFontBuffer();
|
||||||
CSprite2d::DrawBank(Details.bank+1);
|
}
|
||||||
CSprite2d::DrawBank(Details.bank+2);
|
|
||||||
#ifdef MORE_LANGUAGES
|
void
|
||||||
if (IsJapanese())
|
CFont::RenderFontBuffer()
|
||||||
CSprite2d::DrawBank(Details.bank+3);
|
{
|
||||||
#endif
|
if (FontRenderStatePointer.pRenderState == (CFontRenderState*)FontRenderStateBuf) return;
|
||||||
|
|
||||||
|
float textPosX;
|
||||||
|
float textPosY;
|
||||||
|
CRGBA color;
|
||||||
|
bool bBold = false;
|
||||||
|
bool bFlash = false;
|
||||||
|
|
||||||
|
Sprite[RenderState.style].SetRenderState();
|
||||||
|
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
|
||||||
|
RenderState = *(CFontRenderState*)&FontRenderStateBuf[0];
|
||||||
|
textPosX = RenderState.fTextPosX;
|
||||||
|
textPosY = RenderState.fTextPosY;
|
||||||
|
tFontRenderStatePointer pRenderStateBufPointer;
|
||||||
|
pRenderStateBufPointer.pRenderState = (CFontRenderState*)&FontRenderStateBuf[0];
|
||||||
|
for (++pRenderStateBufPointer.pRenderState; pRenderStateBufPointer.pStr < FontRenderStatePointer.pStr; pRenderStateBufPointer.pStr++) {
|
||||||
|
if (*pRenderStateBufPointer.pStr == '\0') {
|
||||||
|
tFontRenderStatePointer tmpPointer = pRenderStateBufPointer;
|
||||||
|
tmpPointer.pStr++;
|
||||||
|
tmpPointer.Align();
|
||||||
|
if (tmpPointer.pStr >= FontRenderStatePointer.pStr)
|
||||||
|
break;
|
||||||
|
|
||||||
|
RenderState = *(tmpPointer.pRenderState++);
|
||||||
|
|
||||||
|
pRenderStateBufPointer = tmpPointer;
|
||||||
|
|
||||||
|
textPosX = RenderState.fTextPosX;
|
||||||
|
textPosY = RenderState.fTextPosY;
|
||||||
|
color = RenderState.color;
|
||||||
|
}
|
||||||
|
if (*pRenderStateBufPointer.pStr == '~') {
|
||||||
|
pRenderStateBufPointer.pStr = ParseToken(pRenderStateBufPointer.pStr, color, bFlash, bBold);
|
||||||
|
if (bFlash) {
|
||||||
|
if (CTimer::GetTimeInMilliseconds() - Details.nFlashTimer > 300) {
|
||||||
|
Details.bFlashState = !Details.bFlashState;
|
||||||
|
Details.nFlashTimer = CTimer::GetTimeInMilliseconds();
|
||||||
|
}
|
||||||
|
Details.color.alpha = Details.bFlashState ? 0 : 255;
|
||||||
|
}
|
||||||
|
if (!RenderState.bIsShadow)
|
||||||
|
RenderState.color = color;
|
||||||
|
}
|
||||||
|
wchar c = *pRenderStateBufPointer.pStr;
|
||||||
|
c -= ' ';
|
||||||
|
if (RenderState.bFontHalfTexture)
|
||||||
|
c = FindNewCharacter(c);
|
||||||
|
else if (c > 155)
|
||||||
|
c = 0;
|
||||||
|
|
||||||
|
if (RenderState.slant != 0.0f)
|
||||||
|
textPosY = (RenderState.slantRefX - textPosX) * RenderState.slant + RenderState.slantRefY;
|
||||||
|
PrintChar(textPosX, textPosY, c);
|
||||||
|
if (bBold) {
|
||||||
|
PrintChar(textPosX + 1.0f, textPosY, c);
|
||||||
|
PrintChar(textPosX + 2.0f, textPosY, c);
|
||||||
|
textPosX += 2.0f;
|
||||||
|
}
|
||||||
|
textPosX += RenderState.scaleX * (RenderState.proportional ? Size[RenderState.style][c] : Size[RenderState.style][209]);
|
||||||
|
if (c == '\0')
|
||||||
|
textPosX += RenderState.fExtraSpace;
|
||||||
|
}
|
||||||
|
CSprite2d::RenderVertexBuffer();
|
||||||
|
FontRenderStatePointer.pRenderState = (CFontRenderState*)FontRenderStateBuf;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
CFont::SetFontStyle(int16 style)
|
||||||
|
{
|
||||||
|
if (style == FONT_HEADING) {
|
||||||
|
Details.style = FONT_STANDARD;
|
||||||
|
Details.bFontHalfTexture = true;
|
||||||
|
} else {
|
||||||
|
Details.style = style;
|
||||||
|
Details.bFontHalfTexture = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
wchar CFont::FindNewCharacter(wchar c)
|
||||||
|
{
|
||||||
|
if (c >= 16 && c <= 26) return c + 128;
|
||||||
|
if (c >= 8 && c <= 9) return c + 86;
|
||||||
|
if (c == 4) return c + 89;
|
||||||
|
if (c == 7) return 206;
|
||||||
|
if (c == 14) return 207;
|
||||||
|
if (c >= 33 && c <= 58) return c + 122;
|
||||||
|
if (c >= 65 && c <= 90) return c + 90;
|
||||||
|
if (c >= 96 && c <= 118) return c + 85;
|
||||||
|
if (c >= 119 && c <= 140) return c + 62;
|
||||||
|
if (c >= 141 && c <= 142) return 204;
|
||||||
|
if (c == 143) return 205;
|
||||||
|
if (c == 1) return 208;
|
||||||
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
wchar
|
wchar
|
||||||
|
|
|
@ -14,27 +14,54 @@ struct CFontDetails
|
||||||
bool background;
|
bool background;
|
||||||
bool backgroundOnlyText;
|
bool backgroundOnlyText;
|
||||||
bool proportional;
|
bool proportional;
|
||||||
|
bool bIsShadow;
|
||||||
|
bool bFlash;
|
||||||
|
bool bBold;
|
||||||
float alphaFade;
|
float alphaFade;
|
||||||
CRGBA backgroundColor;
|
CRGBA backgroundColor;
|
||||||
float wrapX;
|
float wrapX;
|
||||||
float centreSize;
|
float centreSize;
|
||||||
float rightJustifyWrap;
|
float rightJustifyWrap;
|
||||||
int16 style;
|
int16 style;
|
||||||
int32 bank;
|
bool bFontHalfTexture;
|
||||||
|
uint32 bank;
|
||||||
int16 dropShadowPosition;
|
int16 dropShadowPosition;
|
||||||
CRGBA dropColor;
|
CRGBA dropColor;
|
||||||
|
bool bFlashState;
|
||||||
|
int nFlashTimer;
|
||||||
|
bool anonymous_23;
|
||||||
|
uint32 anonymous_25;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct CFontRenderState
|
||||||
|
{
|
||||||
|
uint32 anonymous_0;
|
||||||
|
float fTextPosX;
|
||||||
|
float fTextPosY;
|
||||||
|
float scaleX;
|
||||||
|
float scaleY;
|
||||||
|
CRGBA color;
|
||||||
|
float fExtraSpace;
|
||||||
|
float slant;
|
||||||
|
float slantRefX;
|
||||||
|
float slantRefY;
|
||||||
|
bool bIsShadow;
|
||||||
|
bool bFontHalfTexture;
|
||||||
|
bool proportional;
|
||||||
|
bool anonymous_14;
|
||||||
|
int16 style;
|
||||||
};
|
};
|
||||||
|
|
||||||
class CSprite2d;
|
class CSprite2d;
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
FONT_BANK,
|
||||||
FONT_STANDARD,
|
FONT_STANDARD,
|
||||||
FONT_PAGER,
|
|
||||||
FONT_HEADING,
|
FONT_HEADING,
|
||||||
#ifdef MORE_LANGUAGES
|
#ifdef MORE_LANGUAGES
|
||||||
FONT_JAPANESE,
|
FONT_JAPANESE,
|
||||||
#endif
|
#endif
|
||||||
MAX_FONTS
|
MAX_FONTS = FONT_HEADING
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
@ -65,12 +92,13 @@ class CFont
|
||||||
static uint8 LanguageSet;
|
static uint8 LanguageSet;
|
||||||
static int32 Slot;
|
static int32 Slot;
|
||||||
#else
|
#else
|
||||||
static int16 Size[MAX_FONTS][193];
|
static int16 Size[MAX_FONTS][210];
|
||||||
#endif
|
#endif
|
||||||
static int16 NewLine;
|
static int16 NewLine;
|
||||||
public:
|
public:
|
||||||
static CSprite2d Sprite[MAX_FONTS];
|
static CSprite2d Sprite[MAX_FONTS];
|
||||||
static CFontDetails Details;
|
static CFontDetails Details;
|
||||||
|
static CFontRenderState RenderState;
|
||||||
|
|
||||||
static void Initialise(void);
|
static void Initialise(void);
|
||||||
static void Shutdown(void);
|
static void Shutdown(void);
|
||||||
|
@ -82,8 +110,9 @@ public:
|
||||||
#ifdef MORE_LANGUAGES
|
#ifdef MORE_LANGUAGES
|
||||||
static bool PrintString(float x, float y, wchar *start, wchar* &end, float spwidth, float japX);
|
static bool PrintString(float x, float y, wchar *start, wchar* &end, float spwidth, float japX);
|
||||||
#else
|
#else
|
||||||
static void PrintString(float x, float y, wchar *start, wchar *end, float spwidth);
|
static void PrintString(float x, float y, uint32, wchar *start, wchar *end, float spwidth);
|
||||||
#endif
|
#endif
|
||||||
|
static void PrintStringFromBottom(float x, float y, wchar *str);
|
||||||
static float GetCharacterWidth(wchar c);
|
static float GetCharacterWidth(wchar c);
|
||||||
static float GetCharacterSize(wchar c);
|
static float GetCharacterSize(wchar c);
|
||||||
static float GetStringWidth(wchar *s, bool spaces = false);
|
static float GetStringWidth(wchar *s, bool spaces = false);
|
||||||
|
@ -92,11 +121,13 @@ public:
|
||||||
#endif
|
#endif
|
||||||
static uint16 *GetNextSpace(wchar *s);
|
static uint16 *GetNextSpace(wchar *s);
|
||||||
#ifdef MORE_LANGUAGES
|
#ifdef MORE_LANGUAGES
|
||||||
static uint16 *ParseToken(wchar *s, wchar*, bool japShit = false);
|
static uint16 *ParseToken(wchar *s, bool japShit = false);
|
||||||
#else
|
#else
|
||||||
static uint16 *ParseToken(wchar *s, wchar*);
|
static uint16 *ParseToken(wchar *s);
|
||||||
|
static uint16* ParseToken(wchar *s, CRGBA &color, bool &flash, bool &bold);
|
||||||
#endif
|
#endif
|
||||||
static void DrawFonts(void);
|
static void DrawFonts(void);
|
||||||
|
static void RenderFontBuffer(void);
|
||||||
static uint16 character_code(uint8 c);
|
static uint16 character_code(uint8 c);
|
||||||
|
|
||||||
static CFontDetails GetDetails() { return Details; }
|
static CFontDetails GetDetails() { return Details; }
|
||||||
|
@ -155,14 +186,14 @@ public:
|
||||||
static void SetBackGroundOnlyTextOff(void) { Details.backgroundOnlyText = false; }
|
static void SetBackGroundOnlyTextOff(void) { Details.backgroundOnlyText = false; }
|
||||||
static void SetPropOn(void) { Details.proportional = true; }
|
static void SetPropOn(void) { Details.proportional = true; }
|
||||||
static void SetPropOff(void) { Details.proportional = false; }
|
static void SetPropOff(void) { Details.proportional = false; }
|
||||||
static void SetFontStyle(int16 style) { Details.style = style; }
|
static void SetFontStyle(int16 style);
|
||||||
static void SetRightJustifyWrap(float wrap) { Details.rightJustifyWrap = wrap; }
|
static void SetRightJustifyWrap(float wrap) { Details.rightJustifyWrap = wrap; }
|
||||||
static void SetAlphaFade(float fade) { Details.alphaFade = fade; }
|
static void SetAlphaFade(float fade) { Details.alphaFade = fade; }
|
||||||
static void SetDropShadowPosition(int16 pos) { Details.dropShadowPosition = pos; }
|
static void SetDropShadowPosition(int16 pos) { Details.dropShadowPosition = pos; }
|
||||||
static void SetBackgroundColor(CRGBA col);
|
static void SetBackgroundColor(CRGBA col);
|
||||||
static void SetColor(CRGBA col);
|
static void SetColor(CRGBA col);
|
||||||
static void SetDropColor(CRGBA col);
|
static void SetDropColor(CRGBA col);
|
||||||
|
static wchar FindNewCharacter(wchar c);
|
||||||
#ifdef MORE_LANGUAGES
|
#ifdef MORE_LANGUAGES
|
||||||
static void ReloadFonts(uint8 set);
|
static void ReloadFonts(uint8 set);
|
||||||
|
|
||||||
|
|
|
@ -412,6 +412,8 @@ void CHud::Draw()
|
||||||
CFont::SetRightJustifyWrap(0.0f);
|
CFont::SetRightJustifyWrap(0.0f);
|
||||||
CFont::SetRightJustifyOn();
|
CFont::SetRightJustifyOn();
|
||||||
CFont::SetPropOff();
|
CFont::SetPropOff();
|
||||||
|
CFont::SetDropShadowPosition(2);
|
||||||
|
CFont::SetDropColor(CRGBA(0, 0, 0, 255));
|
||||||
CFont::SetFontStyle(FONT_HEADING);
|
CFont::SetFontStyle(FONT_HEADING);
|
||||||
|
|
||||||
if (m_ItemToFlash == ITEM_HEALTH && CTimer::GetFrameCounter() & 8
|
if (m_ItemToFlash == ITEM_HEALTH && CTimer::GetFrameCounter() & 8
|
||||||
|
@ -429,12 +431,12 @@ void CHud::Draw()
|
||||||
#endif
|
#endif
|
||||||
AsciiToUnicode(sTemp, sPrint);
|
AsciiToUnicode(sTemp, sPrint);
|
||||||
|
|
||||||
CFont::SetColor(CRGBA(0, 0, 0, 255));
|
/*CFont::SetColor(CRGBA(0, 0, 0, 255));
|
||||||
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f - 2.0f), SCREEN_SCALE_Y(65.0f + 2.0f), sPrint);
|
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f - 2.0f), SCREEN_SCALE_Y(65.0f + 2.0f), sPrint);
|
||||||
|
|
||||||
if (!CWorld::Players[CWorld::PlayerInFocus].m_nTimeLastHealthLoss || CTimer::GetTimeInMilliseconds() > CWorld::Players[CWorld::PlayerInFocus].m_nTimeLastHealthLoss + 2000 || CTimer::GetFrameCounter() & 4) {
|
if (!CWorld::Players[CWorld::PlayerInFocus].m_nTimeLastHealthLoss || CTimer::GetTimeInMilliseconds() > CWorld::Players[CWorld::PlayerInFocus].m_nTimeLastHealthLoss + 2000 || CTimer::GetFrameCounter() & 4) {
|
||||||
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(164.0f - 2.0f), SCREEN_SCALE_Y(65.0f + 2.0f), sPrintIcon);
|
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(164.0f - 2.0f), SCREEN_SCALE_Y(65.0f + 2.0f), sPrintIcon);
|
||||||
}
|
}*/
|
||||||
CFont::SetColor(HEALTH_COLOR);
|
CFont::SetColor(HEALTH_COLOR);
|
||||||
|
|
||||||
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f), SCREEN_SCALE_Y(65.0f), sPrint);
|
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f), SCREEN_SCALE_Y(65.0f), sPrint);
|
||||||
|
@ -493,11 +495,11 @@ void CHud::Draw()
|
||||||
CFont::SetCentreOff();
|
CFont::SetCentreOff();
|
||||||
CFont::SetRightJustifyOn();
|
CFont::SetRightJustifyOn();
|
||||||
CFont::SetPropOn();
|
CFont::SetPropOn();
|
||||||
CFont::SetFontStyle(FONT_HEADING);
|
CFont::SetFontStyle(FONT_STANDARD);
|
||||||
CFont::SetDropShadowPosition(2); // TODO(Miami): Remove that, VC keeps that open above
|
CFont::SetDropShadowPosition(2); // TODO(Miami): Remove that, VC keeps that open above
|
||||||
CFont::SetDropColor(CRGBA(0,0,0,alpha)); // TODO(Miami): Remove that, VC keeps that open above
|
CFont::SetDropColor(CRGBA(0,0,0,alpha)); // TODO(Miami): Remove that, VC keeps that open above
|
||||||
|
|
||||||
AsciiToUnicode("]", sPrintIcon);
|
AsciiToUnicode(">", sPrintIcon);
|
||||||
|
|
||||||
for (int i = 0; i < 6; i++) {
|
for (int i = 0; i < 6; i++) {
|
||||||
if (FrontEndMenuManager.m_PrefsShowHud) {
|
if (FrontEndMenuManager.m_PrefsShowHud) {
|
||||||
|
@ -609,12 +611,14 @@ void CHud::Draw()
|
||||||
CFont::SetRightJustifyOn();
|
CFont::SetRightJustifyOn();
|
||||||
CFont::SetRightJustifyWrap(0.0f);
|
CFont::SetRightJustifyWrap(0.0f);
|
||||||
CFont::SetBackGroundOnlyTextOff();
|
CFont::SetBackGroundOnlyTextOff();
|
||||||
CFont::SetFontStyle(FONT_STANDARD);
|
CFont::SetDropShadowPosition(2);
|
||||||
CFont::SetColor(CRGBA(0, 0, 0, fZoneAlpha));
|
CFont::SetDropColor(CRGBA(0, 0, 0, fZoneAlpha));
|
||||||
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(32.0f) + SCREEN_SCALE_X(1.0f), SCREEN_SCALE_FROM_BOTTOM(128.0f) + SCREEN_SCALE_Y(1.0f), m_ZoneToPrint);
|
CFont::SetFontStyle(FONT_BANK);
|
||||||
|
//CFont::SetColor(CRGBA(0, 0, 0, fZoneAlpha));
|
||||||
|
//CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(32.0f) + SCREEN_SCALE_X(1.0f), SCREEN_SCALE_FROM_BOTTOM(128.0f) + SCREEN_SCALE_Y(1.0f), m_ZoneToPrint);
|
||||||
|
|
||||||
CFont::SetColor(CRGBA(ZONE_COLOR.r, ZONE_COLOR.g, ZONE_COLOR.b, fZoneAlpha));
|
CFont::SetColor(CRGBA(ZONE_COLOR.r, ZONE_COLOR.g, ZONE_COLOR.b, fZoneAlpha));
|
||||||
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(32.0f), SCREEN_SCALE_FROM_BOTTOM(128.0f), m_ZoneToPrint);
|
CFont::PrintStringFromBottom(SCREEN_SCALE_FROM_RIGHT(32.0f), SCREEN_SCALE_FROM_BOTTOM(128.0f), m_ZoneToPrint);
|
||||||
|
|
||||||
CFont::SetSlant(0.f);
|
CFont::SetSlant(0.f);
|
||||||
}
|
}
|
||||||
|
@ -708,12 +712,12 @@ void CHud::Draw()
|
||||||
CFont::SetRightJustifyOn();
|
CFont::SetRightJustifyOn();
|
||||||
CFont::SetRightJustifyWrap(0.0f);
|
CFont::SetRightJustifyWrap(0.0f);
|
||||||
CFont::SetBackGroundOnlyTextOff();
|
CFont::SetBackGroundOnlyTextOff();
|
||||||
CFont::SetFontStyle(FONT_STANDARD);
|
CFont::SetDropShadowPosition(2);
|
||||||
CFont::SetColor(CRGBA(0, 0, 0, fVehicleAlpha));
|
CFont::SetDropColor(CRGBA(0, 0, 0, fVehicleAlpha));
|
||||||
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(32.0f) + SCREEN_SCALE_X(1.0f), SCREEN_SCALE_FROM_BOTTOM(105.f) + SCREEN_SCALE_Y(1.0f), m_pVehicleNameToPrint);
|
CFont::SetFontStyle(FONT_BANK);
|
||||||
|
|
||||||
CFont::SetColor(CRGBA(VEHICLE_COLOR.r, VEHICLE_COLOR.g, VEHICLE_COLOR.b, fVehicleAlpha));
|
CFont::SetColor(CRGBA(VEHICLE_COLOR.r, VEHICLE_COLOR.g, VEHICLE_COLOR.b, fVehicleAlpha));
|
||||||
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(32.0f), SCREEN_SCALE_FROM_BOTTOM(105.0f), m_pVehicleNameToPrint);
|
CFont::PrintStringFromBottom(SCREEN_SCALE_FROM_RIGHT(32.0f), SCREEN_SCALE_FROM_BOTTOM(105.0f), m_pVehicleNameToPrint);
|
||||||
|
|
||||||
CFont::SetSlant(0.f);
|
CFont::SetSlant(0.f);
|
||||||
}
|
}
|
||||||
|
@ -734,6 +738,8 @@ void CHud::Draw()
|
||||||
CFont::SetBackgroundOff();
|
CFont::SetBackgroundOff();
|
||||||
CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
|
CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
|
||||||
CFont::SetBackGroundOnlyTextOff();
|
CFont::SetBackGroundOnlyTextOff();
|
||||||
|
CFont::SetDropShadowPosition(2);
|
||||||
|
CFont::SetDropColor(CRGBA(0, 0, 0, 255));
|
||||||
CFont::SetPropOff();
|
CFont::SetPropOff();
|
||||||
CFont::SetFontStyle(FONT_HEADING);
|
CFont::SetFontStyle(FONT_HEADING);
|
||||||
CFont::SetRightJustifyOn();
|
CFont::SetRightJustifyOn();
|
||||||
|
@ -744,7 +750,7 @@ void CHud::Draw()
|
||||||
|
|
||||||
CFont::SetColor(CRGBA(0, 0, 0, 255));
|
CFont::SetColor(CRGBA(0, 0, 0, 255));
|
||||||
|
|
||||||
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(111.0f) + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_Y(22.0f) + SCREEN_SCALE_Y(2.0f), sPrint);
|
//CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(111.0f) + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_Y(22.0f) + SCREEN_SCALE_Y(2.0f), sPrint);
|
||||||
|
|
||||||
CFont::SetColor(CLOCK_COLOR);
|
CFont::SetColor(CLOCK_COLOR);
|
||||||
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(111.0f), SCREEN_SCALE_Y(22.0f), sPrint);
|
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(111.0f), SCREEN_SCALE_Y(22.0f), sPrint);
|
||||||
|
@ -904,7 +910,7 @@ void CHud::Draw()
|
||||||
CFont::SetCentreOff();
|
CFont::SetCentreOff();
|
||||||
CFont::SetJustifyOff();
|
CFont::SetJustifyOff();
|
||||||
CFont::SetPropOff();
|
CFont::SetPropOff();
|
||||||
CFont::SetFontStyle(FONT_PAGER);
|
CFont::SetFontStyle(FONT_STANDARD);
|
||||||
CFont::PrintString(SCREEN_SCALE_X(52.0f - PagerXOffset), SCREEN_SCALE_Y(54.0f), m_PagerMessage);
|
CFont::PrintString(SCREEN_SCALE_X(52.0f - PagerXOffset), SCREEN_SCALE_Y(54.0f), m_PagerMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1407,7 +1413,7 @@ void CHud::DrawAfterFade()
|
||||||
CFont::SetPropOn();
|
CFont::SetPropOn();
|
||||||
CFont::SetRightJustifyWrap(SCREEN_SCALE_X(-500.0f));
|
CFont::SetRightJustifyWrap(SCREEN_SCALE_X(-500.0f));
|
||||||
CFont::SetRightJustifyOn();
|
CFont::SetRightJustifyOn();
|
||||||
CFont::SetFontStyle(FONT_HEADING);
|
CFont::SetFontStyle(FONT_BANK);
|
||||||
if (BigMessageX[1] >= SCREEN_SCALE_FROM_RIGHT(20.0f)) {
|
if (BigMessageX[1] >= SCREEN_SCALE_FROM_RIGHT(20.0f)) {
|
||||||
BigMessageInUse[1] += CTimer::GetTimeStep();
|
BigMessageInUse[1] += CTimer::GetTimeStep();
|
||||||
|
|
||||||
|
@ -1427,8 +1433,10 @@ void CHud::DrawAfterFade()
|
||||||
BigMessageAlpha[1] = 255.0f;
|
BigMessageAlpha[1] = 255.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
CFont::SetColor(CRGBA(40, 40, 40, BigMessageAlpha[1]));
|
CFont::SetDropShadowPosition(2);
|
||||||
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f) + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_FROM_BOTTOM(120.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[1]);
|
CFont::SetDropColor(CRGBA(40, 40, 40, BigMessageAlpha[1]));
|
||||||
|
//CFont::SetColor(CRGBA(40, 40, 40, BigMessageAlpha[1]));
|
||||||
|
//CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f) + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_FROM_BOTTOM(120.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[1]);
|
||||||
|
|
||||||
CFont::SetColor(CRGBA(MISSIONTITLE_COLOR.r, MISSIONTITLE_COLOR.g, MISSIONTITLE_COLOR.b, BigMessageAlpha[1]));
|
CFont::SetColor(CRGBA(MISSIONTITLE_COLOR.r, MISSIONTITLE_COLOR.g, MISSIONTITLE_COLOR.b, BigMessageAlpha[1]));
|
||||||
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(120.0f), m_BigMessage[1]);
|
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(120.0f), m_BigMessage[1]);
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
int32 TempBufferVerticesStored;
|
int32 TempBufferVerticesStored;
|
||||||
int32 TempBufferIndicesStored;
|
int32 TempBufferIndicesStored;
|
||||||
|
|
||||||
RwIm3DVertex TempBufferRenderVertices[TEMPBUFFERVERTSIZE];
|
RwIm2DVertex TempVertexBuffer[TEMPBUFFERVERTSIZE];
|
||||||
|
RwIm3DVertex *TempBufferRenderVertices = (RwIm3DVertex * )TempVertexBuffer;
|
||||||
RwImVertexIndex TempBufferRenderIndexList[TEMPBUFFERINDEXSIZE];
|
RwImVertexIndex TempBufferRenderIndexList[TEMPBUFFERINDEXSIZE];
|
||||||
|
|
||||||
int RenderBuffer::VerticesToBeStored;
|
int RenderBuffer::VerticesToBeStored;
|
||||||
|
|
|
@ -9,10 +9,11 @@ public:
|
||||||
static void RenderStuffInBuffer(void);
|
static void RenderStuffInBuffer(void);
|
||||||
};
|
};
|
||||||
|
|
||||||
#define TEMPBUFFERVERTSIZE 256
|
#define TEMPBUFFERVERTSIZE 512
|
||||||
#define TEMPBUFFERINDEXSIZE 1024
|
#define TEMPBUFFERINDEXSIZE 1024
|
||||||
|
|
||||||
extern int32 TempBufferVerticesStored;
|
extern int32 TempBufferVerticesStored;
|
||||||
extern int32 TempBufferIndicesStored;
|
extern int32 TempBufferIndicesStored;
|
||||||
extern RwIm3DVertex TempBufferRenderVertices[TEMPBUFFERVERTSIZE];
|
extern RwIm2DVertex TempVertexBuffer[TEMPBUFFERVERTSIZE];
|
||||||
|
extern RwIm3DVertex *TempBufferRenderVertices;
|
||||||
extern RwImVertexIndex TempBufferRenderIndexList[TEMPBUFFERINDEXSIZE];
|
extern RwImVertexIndex TempBufferRenderIndexList[TEMPBUFFERINDEXSIZE];
|
|
@ -5,13 +5,13 @@
|
||||||
#include "Camera.h"
|
#include "Camera.h"
|
||||||
#include "Sprite2d.h"
|
#include "Sprite2d.h"
|
||||||
#include "Font.h"
|
#include "Font.h"
|
||||||
|
#include "RenderBuffer.h"
|
||||||
|
|
||||||
RwIm2DVertex CSprite2d::maVertices[8];
|
|
||||||
float CSprite2d::RecipNearClip;
|
float CSprite2d::RecipNearClip;
|
||||||
int32 CSprite2d::mCurrentBank;
|
float CSprite2d::NearScreenZ;
|
||||||
int32 CSprite2d::mCurrentSprite[10];
|
int CSprite2d::nextBufferVertex;
|
||||||
int32 CSprite2d::mBankStart[10];
|
int CSprite2d::nextBufferIndex;
|
||||||
RwIm2DVertex CSprite2d::maBankVertices[500];
|
RwIm2DVertex CSprite2d::maVertices[8];
|
||||||
|
|
||||||
void
|
void
|
||||||
CSprite2d::SetRecipNearClip(void)
|
CSprite2d::SetRecipNearClip(void)
|
||||||
|
@ -22,52 +22,11 @@ CSprite2d::SetRecipNearClip(void)
|
||||||
void
|
void
|
||||||
CSprite2d::InitPerFrame(void)
|
CSprite2d::InitPerFrame(void)
|
||||||
{
|
{
|
||||||
int i;
|
nextBufferVertex = 0;
|
||||||
|
nextBufferIndex = 0;
|
||||||
RecipNearClip = 1.0f / RwCameraGetNearClipPlane(Scene.camera);
|
RecipNearClip = 1.0f / RwCameraGetNearClipPlane(Scene.camera);
|
||||||
mCurrentBank = 0;
|
NearScreenZ = RwIm2DGetNearScreenZ();
|
||||||
for(i = 0; i < 10; i++)
|
|
||||||
mCurrentSprite[i] = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int32
|
|
||||||
CSprite2d::GetBank(int32 n, RwTexture *tex)
|
|
||||||
{
|
|
||||||
mCurrentSprite[mCurrentBank] = 0;
|
|
||||||
mBankStart[mCurrentBank+1] = mBankStart[mCurrentBank] + n;
|
|
||||||
return mCurrentBank++;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
CSprite2d::AddSpriteToBank(int32 bank, const CRect &rect, const CRGBA &col,
|
|
||||||
float u0, float v0, float u1, float v1, float u3, float v3, float u2, float v2)
|
|
||||||
{
|
|
||||||
SetVertices(&maBankVertices[6 * (mCurrentSprite[bank] + mBankStart[bank])],
|
|
||||||
rect, col, col, col, col,
|
|
||||||
u0, v0, u1, v1, u2, v2, u3, v3);
|
|
||||||
mCurrentSprite[bank]++;
|
|
||||||
if(mCurrentSprite[bank] + mBankStart[bank] >= mBankStart[bank+1]){
|
|
||||||
DrawBank(bank);
|
|
||||||
mCurrentSprite[bank] = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
CSprite2d::DrawBank(int32 bank)
|
|
||||||
{
|
|
||||||
if(mCurrentSprite[bank] == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
// This is hacked III function to make it work with VC frontend.
|
|
||||||
CFont::Sprite[bank].SetRenderState();
|
|
||||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
|
|
||||||
RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
|
|
||||||
RwIm2DRenderPrimitive(rwPRIMTYPETRILIST, &maBankVertices[6*mBankStart[bank]], 6*mCurrentSprite[bank]);
|
|
||||||
mCurrentSprite[bank] = 0;
|
|
||||||
//RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
CSprite2d::Delete(void)
|
CSprite2d::Delete(void)
|
||||||
{
|
{
|
||||||
|
@ -163,7 +122,7 @@ CSprite2d::SetVertices(const CRect &r, const CRGBA &c0, const CRGBA &c1, const C
|
||||||
screenz = RwIm2DGetFarScreenZ();
|
screenz = RwIm2DGetFarScreenZ();
|
||||||
z = RwCameraGetFarClipPlane(Scene.camera);
|
z = RwCameraGetFarClipPlane(Scene.camera);
|
||||||
}else{
|
}else{
|
||||||
screenz = RwIm2DGetNearScreenZ();
|
screenz = NearScreenZ;
|
||||||
z = 1.0f/RecipNearClip;
|
z = 1.0f/RecipNearClip;
|
||||||
}
|
}
|
||||||
recipz = 1.0f/z;
|
recipz = 1.0f/z;
|
||||||
|
@ -215,7 +174,7 @@ CSprite2d::SetVertices(const CRect &r, const CRGBA &c0, const CRGBA &c1, const C
|
||||||
{
|
{
|
||||||
float screenz, z, recipz;
|
float screenz, z, recipz;
|
||||||
|
|
||||||
screenz = RwIm2DGetNearScreenZ();
|
screenz = NearScreenZ;
|
||||||
z = 1.0f/RecipNearClip;
|
z = 1.0f/RecipNearClip;
|
||||||
recipz = 1.0f/z;
|
recipz = 1.0f/z;
|
||||||
|
|
||||||
|
@ -267,7 +226,7 @@ CSprite2d::SetVertices(float x1, float y1, float x2, float y2, float x3, float y
|
||||||
float screenz, recipz;
|
float screenz, recipz;
|
||||||
float z = RwCameraGetNearClipPlane(Scene.camera); // not done by game
|
float z = RwCameraGetNearClipPlane(Scene.camera); // not done by game
|
||||||
|
|
||||||
screenz = RwIm2DGetNearScreenZ();
|
screenz = NearScreenZ;
|
||||||
recipz = RecipNearClip;
|
recipz = RecipNearClip;
|
||||||
|
|
||||||
RwIm2DVertexSetScreenX(&maVertices[0], x3);
|
RwIm2DVertexSetScreenX(&maVertices[0], x3);
|
||||||
|
@ -313,7 +272,7 @@ CSprite2d::SetVertices(int n, float *positions, float *uvs, const CRGBA &col)
|
||||||
int i;
|
int i;
|
||||||
float screenz, recipz, z;
|
float screenz, recipz, z;
|
||||||
|
|
||||||
screenz = RwIm2DGetNearScreenZ();
|
screenz = NearScreenZ;
|
||||||
recipz = RecipNearClip;
|
recipz = RecipNearClip;
|
||||||
z = RwCameraGetNearClipPlane(Scene.camera); // not done by game
|
z = RwCameraGetNearClipPlane(Scene.camera); // not done by game
|
||||||
|
|
||||||
|
@ -336,7 +295,7 @@ CSprite2d::SetMaskVertices(int n, float *positions)
|
||||||
int i;
|
int i;
|
||||||
float screenz, recipz, z;
|
float screenz, recipz, z;
|
||||||
|
|
||||||
screenz = RwIm2DGetNearScreenZ();
|
screenz = NearScreenZ;
|
||||||
recipz = RecipNearClip;
|
recipz = RecipNearClip;
|
||||||
z = RwCameraGetNearClipPlane(Scene.camera); // not done by game
|
z = RwCameraGetNearClipPlane(Scene.camera); // not done by game
|
||||||
|
|
||||||
|
@ -356,7 +315,7 @@ CSprite2d::SetVertices(RwIm2DVertex *verts, const CRect &r, const CRGBA &c0, con
|
||||||
{
|
{
|
||||||
float screenz, recipz, z;
|
float screenz, recipz, z;
|
||||||
|
|
||||||
screenz = RwIm2DGetNearScreenZ();
|
screenz = NearScreenZ;
|
||||||
recipz = RecipNearClip;
|
recipz = RecipNearClip;
|
||||||
z = RwCameraGetNearClipPlane(Scene.camera); // not done by game
|
z = RwCameraGetNearClipPlane(Scene.camera); // not done by game
|
||||||
|
|
||||||
|
@ -369,14 +328,14 @@ CSprite2d::SetVertices(RwIm2DVertex *verts, const CRect &r, const CRGBA &c0, con
|
||||||
RwIm2DVertexSetU(&verts[0], u0, recipz);
|
RwIm2DVertexSetU(&verts[0], u0, recipz);
|
||||||
RwIm2DVertexSetV(&verts[0], v0, recipz);
|
RwIm2DVertexSetV(&verts[0], v0, recipz);
|
||||||
|
|
||||||
RwIm2DVertexSetScreenX(&verts[1], r.left);
|
RwIm2DVertexSetScreenX(&verts[1], r.right);
|
||||||
RwIm2DVertexSetScreenY(&verts[1], r.bottom);
|
RwIm2DVertexSetScreenY(&verts[1], r.top);
|
||||||
RwIm2DVertexSetScreenZ(&verts[1], screenz);
|
RwIm2DVertexSetScreenZ(&verts[1], screenz);
|
||||||
RwIm2DVertexSetCameraZ(&verts[1], z);
|
RwIm2DVertexSetCameraZ(&verts[1], z);
|
||||||
RwIm2DVertexSetRecipCameraZ(&verts[1], recipz);
|
RwIm2DVertexSetRecipCameraZ(&verts[1], recipz);
|
||||||
RwIm2DVertexSetIntRGBA(&verts[1], c0.r, c0.g, c0.b, c0.a);
|
RwIm2DVertexSetIntRGBA(&verts[1], c3.r, c3.g, c3.b, c3.a);
|
||||||
RwIm2DVertexSetU(&verts[1], u2, recipz);
|
RwIm2DVertexSetU(&verts[1], u1, recipz);
|
||||||
RwIm2DVertexSetV(&verts[1], v2, recipz);
|
RwIm2DVertexSetV(&verts[1], v1, recipz);
|
||||||
|
|
||||||
RwIm2DVertexSetScreenX(&verts[2], r.right);
|
RwIm2DVertexSetScreenX(&verts[2], r.right);
|
||||||
RwIm2DVertexSetScreenY(&verts[2], r.bottom);
|
RwIm2DVertexSetScreenY(&verts[2], r.bottom);
|
||||||
|
@ -384,36 +343,17 @@ CSprite2d::SetVertices(RwIm2DVertex *verts, const CRect &r, const CRGBA &c0, con
|
||||||
RwIm2DVertexSetCameraZ(&verts[2], z);
|
RwIm2DVertexSetCameraZ(&verts[2], z);
|
||||||
RwIm2DVertexSetRecipCameraZ(&verts[2], recipz);
|
RwIm2DVertexSetRecipCameraZ(&verts[2], recipz);
|
||||||
RwIm2DVertexSetIntRGBA(&verts[2], c1.r, c1.g, c1.b, c1.a);
|
RwIm2DVertexSetIntRGBA(&verts[2], c1.r, c1.g, c1.b, c1.a);
|
||||||
RwIm2DVertexSetU(&verts[2], u3, recipz);
|
RwIm2DVertexSetU(&verts[2], u2, recipz);
|
||||||
RwIm2DVertexSetV(&verts[2], v3, recipz);
|
RwIm2DVertexSetV(&verts[2], v2, recipz);
|
||||||
|
|
||||||
RwIm2DVertexSetScreenX(&verts[3], r.left);
|
RwIm2DVertexSetScreenX(&verts[3], r.left);
|
||||||
RwIm2DVertexSetScreenY(&verts[3], r.top);
|
RwIm2DVertexSetScreenY(&verts[3], r.bottom);
|
||||||
RwIm2DVertexSetScreenZ(&verts[3], screenz);
|
RwIm2DVertexSetScreenZ(&verts[3], screenz);
|
||||||
RwIm2DVertexSetCameraZ(&verts[3], z);
|
RwIm2DVertexSetCameraZ(&verts[3], z);
|
||||||
RwIm2DVertexSetRecipCameraZ(&verts[3], recipz);
|
RwIm2DVertexSetRecipCameraZ(&verts[3], recipz);
|
||||||
RwIm2DVertexSetIntRGBA(&verts[3], c2.r, c2.g, c2.b, c2.a);
|
RwIm2DVertexSetIntRGBA(&verts[3], c0.r, c0.g, c0.b, c0.a);
|
||||||
RwIm2DVertexSetU(&verts[3], u0, recipz);
|
RwIm2DVertexSetU(&verts[3], u3, recipz);
|
||||||
RwIm2DVertexSetV(&verts[3], v0, recipz);
|
RwIm2DVertexSetV(&verts[3], v3, recipz);
|
||||||
|
|
||||||
RwIm2DVertexSetScreenX(&verts[4], r.right);
|
|
||||||
RwIm2DVertexSetScreenY(&verts[4], r.bottom);
|
|
||||||
RwIm2DVertexSetScreenZ(&verts[4], screenz);
|
|
||||||
RwIm2DVertexSetCameraZ(&verts[4], z);
|
|
||||||
RwIm2DVertexSetRecipCameraZ(&verts[4], recipz);
|
|
||||||
RwIm2DVertexSetIntRGBA(&verts[4], c1.r, c1.g, c1.b, c1.a);
|
|
||||||
RwIm2DVertexSetU(&verts[4], u3, recipz);
|
|
||||||
RwIm2DVertexSetV(&verts[4], v3, recipz);
|
|
||||||
|
|
||||||
RwIm2DVertexSetScreenX(&verts[5], r.right);
|
|
||||||
RwIm2DVertexSetScreenY(&verts[5], r.top);
|
|
||||||
RwIm2DVertexSetScreenZ(&verts[5], screenz);
|
|
||||||
RwIm2DVertexSetCameraZ(&verts[5], z);
|
|
||||||
RwIm2DVertexSetRecipCameraZ(&verts[5], recipz);
|
|
||||||
RwIm2DVertexSetIntRGBA(&verts[5], c3.r, c3.g, c3.b, c3.a);
|
|
||||||
RwIm2DVertexSetU(&verts[5], u1, recipz);
|
|
||||||
RwIm2DVertexSetV(&verts[5], v1, recipz);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -488,3 +428,37 @@ void CSprite2d::Draw2DPolygon(float x1, float y1, float x2, float y2, float x3,
|
||||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
|
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
|
||||||
RwRenderStateSet(rwRENDERSTATESHADEMODE, (void*)rwSHADEMODEGOURAUD);
|
RwRenderStateSet(rwRENDERSTATESHADEMODE, (void*)rwSHADEMODEGOURAUD);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
CSprite2d::AddToBuffer(const CRect &r, const CRGBA &c, float u0, float v0, float u1, float v1, float u3, float v3, float u2, float v2)
|
||||||
|
{
|
||||||
|
SetVertices(&TempVertexBuffer[nextBufferVertex], r, c, c, c, c, u0, v0, u1, v1, u3, v3, u2, v2);
|
||||||
|
RwImVertexIndex *pIndexList = &TempBufferRenderIndexList[nextBufferIndex];
|
||||||
|
pIndexList[0] = nextBufferVertex;
|
||||||
|
pIndexList[1] = nextBufferVertex + 1;
|
||||||
|
pIndexList[2] = nextBufferVertex + 2;
|
||||||
|
pIndexList[3] = nextBufferVertex + 3;
|
||||||
|
pIndexList[4] = nextBufferVertex;
|
||||||
|
pIndexList[5] = nextBufferVertex + 2;
|
||||||
|
nextBufferIndex += 6;
|
||||||
|
nextBufferVertex += 4;
|
||||||
|
if (IsVertexBufferFull())
|
||||||
|
RenderVertexBuffer();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
CSprite2d::IsVertexBufferFull()
|
||||||
|
{
|
||||||
|
return (nextBufferVertex > ARRAY_SIZE(TempVertexBuffer)-128-4 || nextBufferIndex > ARRAY_SIZE(TempBufferRenderIndexList)-6);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
CSprite2d::RenderVertexBuffer()
|
||||||
|
{
|
||||||
|
if (nextBufferVertex > 0) {
|
||||||
|
RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
|
||||||
|
RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, TempVertexBuffer, nextBufferVertex, TempBufferRenderIndexList, nextBufferIndex);
|
||||||
|
nextBufferVertex = 0;
|
||||||
|
nextBufferIndex = 0;
|
||||||
|
}
|
||||||
|
}
|
|
@ -3,21 +3,15 @@
|
||||||
class CSprite2d
|
class CSprite2d
|
||||||
{
|
{
|
||||||
static float RecipNearClip;
|
static float RecipNearClip;
|
||||||
static int32 mCurrentBank;
|
static float NearScreenZ;
|
||||||
static RwTexture *mpBankTextures[10];
|
static int nextBufferVertex;
|
||||||
static int32 mCurrentSprite[10];
|
static int nextBufferIndex;
|
||||||
static int32 mBankStart[10];
|
|
||||||
static RwIm2DVertex maBankVertices[500];
|
|
||||||
static RwIm2DVertex maVertices[8];
|
static RwIm2DVertex maVertices[8];
|
||||||
public:
|
public:
|
||||||
RwTexture *m_pTexture;
|
RwTexture *m_pTexture;
|
||||||
|
|
||||||
static void SetRecipNearClip(void);
|
static void SetRecipNearClip(void);
|
||||||
static void InitPerFrame(void);
|
static void InitPerFrame(void);
|
||||||
static int32 GetBank(int32 n, RwTexture *tex);
|
|
||||||
static void AddSpriteToBank(int32 bank, const CRect &rect, const CRGBA &col,
|
|
||||||
float u0, float v0, float u1, float v1, float u3, float v3, float u2, float v2);
|
|
||||||
static void DrawBank(int32 bank);
|
|
||||||
|
|
||||||
CSprite2d(void) : m_pTexture(nil) {};
|
CSprite2d(void) : m_pTexture(nil) {};
|
||||||
~CSprite2d(void) { Delete(); };
|
~CSprite2d(void) { Delete(); };
|
||||||
|
@ -52,4 +46,8 @@ public:
|
||||||
static void Draw2DPolygon(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, const CRGBA &color);
|
static void Draw2DPolygon(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, const CRGBA &color);
|
||||||
|
|
||||||
static RwIm2DVertex* GetVertices() { return maVertices; };
|
static RwIm2DVertex* GetVertices() { return maVertices; };
|
||||||
|
|
||||||
|
static bool IsVertexBufferFull();
|
||||||
|
static void AddToBuffer(const CRect &a1, const CRGBA &a2, float a3, float a4, float a5, float a6, float a7, float a8, float a9, float a10);
|
||||||
|
static void RenderVertexBuffer();
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue