libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-02 06:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply offset by 1px to our provided PSP fonts

Browse Source
This commit is contained in:
raven02 2013-10-26 14:35:32 +08:00
parent 4cc6171cf9
commit 92042e6b55
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/Font/PGF.cpp
View File

@ -453,7 +453,7 @@ bool PGF::GetCharGlyph(int charCode, int glyphType, Glyph &glyph) {
return true; return true;
} }
void PGF::DrawCharacter(const GlyphImage *image, int clipX, int clipY, int clipWidth, int clipHeight, int charCode, int altCharCode, int glyphType) { void PGF::DrawCharacter(const GlyphImage *image, int clipX, int clipY, int clipWidth, int clipHeight, int charCode, int altCharCode, int glyphType, bool original) {
Glyph glyph; Glyph glyph;
if (!GetCharGlyph(charCode, glyphType, glyph)) { if (!GetCharGlyph(charCode, glyphType, glyph)) {
// No Glyph available for this charCode, try to use the alternate char. // No Glyph available for this charCode, try to use the alternate char.
@ -511,6 +511,11 @@ void PGF::DrawCharacter(const GlyphImage *image, int clipX, int clipY, int clipW
int pixelX = x + xx; int pixelX = x + xx;
int pixelY = y + yy; int pixelY = y + yy;
// Apply offset by 1px for non-original PSP fonts
if (!original)
pixelX += 1;
if (pixelX >= clipX && pixelX < clipX + clipWidth && pixelY >= clipY && pixelY < clipY + clipHeight) { if (pixelX >= clipX && pixelX < clipX + clipWidth && pixelY >= clipY && pixelY < clipY + clipHeight) {
// 4-bit color value // 4-bit color value
int pixelColor = value; int pixelColor = value;

2
Core/Font/PGF.h
View File

@ -262,7 +262,7 @@ public:
bool GetCharInfo(int charCode, PGFCharInfo *ci); bool GetCharInfo(int charCode, PGFCharInfo *ci);
void GetFontInfo(PGFFontInfo *fi); void GetFontInfo(PGFFontInfo *fi);
void DrawCharacter(const GlyphImage *image, int clipX, int clipY, int clipWidth, int clipHeight, int charCode, int altCharCode, int glyphType); void DrawCharacter(const GlyphImage *image, int clipX, int clipY, int clipWidth, int clipHeight, int charCode, int altCharCode, int glyphType, bool original = true);
void DoState(PointerWrap &p); void DoState(PointerWrap &p);

10
Core/HLE/sceFont.cpp
View File

@ -104,6 +104,7 @@ class LoadedFont;
class FontLib; class FontLib;
class Font; class Font;
int GetInternalFontIndex(Font *font); int GetInternalFontIndex(Font *font);
bool original;
// These should not need to be state saved. // These should not need to be state saved.
static std::vector<Font *> internalFonts; static std::vector<Font *> internalFonts;
@ -503,7 +504,12 @@ void __LoadInternalFonts() {
ERROR_LOG(SCEFONT, "Failed opening font"); ERROR_LOG(SCEFONT, "Failed opening font");
delete [] buffer; delete [] buffer;
continue; continue;
}
// Our provided font of jpn0.pgf has size 4367080 bytes
if (entry.fileName == "jpn0.pgf" && (int)info.size == 4367080) {
original = false;
} }
pspFileSystem.ReadFile(handle, buffer, info.size); pspFileSystem.ReadFile(handle, buffer, info.size);
pspFileSystem.CloseFile(handle); pspFileSystem.CloseFile(handle);
@ -867,7 +873,7 @@ int sceFontGetCharGlyphImage(u32 fontHandle, u32 charCode, u32 glyphImagePtr) {
DEBUG_LOG(SCEFONT, "sceFontGetCharGlyphImage(%x, %x, %x)", fontHandle, charCode, glyphImagePtr); DEBUG_LOG(SCEFONT, "sceFontGetCharGlyphImage(%x, %x, %x)", fontHandle, charCode, glyphImagePtr);
auto glyph = Memory::GetStruct<const GlyphImage>(glyphImagePtr); auto glyph = Memory::GetStruct<const GlyphImage>(glyphImagePtr);
int altCharCode = font->GetFontLib()->GetAltCharCode(); int altCharCode = font->GetFontLib()->GetAltCharCode();
font->GetPGF()->DrawCharacter(glyph, 0, 0, 8192, 8192, charCode, altCharCode, FONT_PGF_CHARGLYPH); font->GetPGF()->DrawCharacter(glyph, 0, 0, 8192, 8192, charCode, altCharCode, FONT_PGF_CHARGLYPH, original);
return 0; return 0;
} }
@ -885,7 +891,7 @@ int sceFontGetCharGlyphImage_Clip(u32 fontHandle, u32 charCode, u32 glyphImagePt
INFO_LOG(SCEFONT, "sceFontGetCharGlyphImage_Clip(%08x, %i, %08x, %i, %i, %i, %i)", fontHandle, charCode, glyphImagePtr, clipXPos, clipYPos, clipWidth, clipHeight); INFO_LOG(SCEFONT, "sceFontGetCharGlyphImage_Clip(%08x, %i, %08x, %i, %i, %i, %i)", fontHandle, charCode, glyphImagePtr, clipXPos, clipYPos, clipWidth, clipHeight);
auto glyph = Memory::GetStruct<const GlyphImage>(glyphImagePtr); auto glyph = Memory::GetStruct<const GlyphImage>(glyphImagePtr);
int altCharCode = font->GetFontLib()->GetAltCharCode(); int altCharCode = font->GetFontLib()->GetAltCharCode();
font->GetPGF()->DrawCharacter(glyph, clipXPos, clipYPos, clipXPos + clipWidth, clipYPos + clipHeight, charCode, altCharCode, FONT_PGF_CHARGLYPH); font->GetPGF()->DrawCharacter(glyph, clipXPos, clipYPos, clipXPos + clipWidth, clipYPos + clipHeight, charCode, altCharCode, FONT_PGF_CHARGLYPH, original);
return 0; return 0;
} }