libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-19 08:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: implement left sided shadowing for SJIS font

Browse Source 
The current shadow mode draws a shadow on the right side of the character. This allows drawing one on the left.
Adapt LOOM/PCE accordingly.
This commit is contained in:
athrxx 2019-11-26 23:08:35 +01:00
parent 33cce35baa
commit 1f42999a7c
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/scumm/charset.cpp
View File

@ -68,7 +68,7 @@ void ScummEngine::loadCJKFont() {
if (!_cjkFont)
error("SCUMM::Font: Could not open file 'pce.cdbios'");
_cjkFont->setDrawingMode(Graphics::FontSJIS::kShadowMode);
_cjkFont->setDrawingMode(Graphics::FontSJIS::kShadowRightMode);
_2byteWidth = _2byteHeight = 12;
_useCJKMode = true;
#endif

17
graphics/sjis.cpp
View File

@ -276,11 +276,14 @@ void FontSJISBase::drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1,
if (_flippedMode)
glyphSource = flipCharacter(glyphSource, width);
#endif
int shadowOffset = bpp;
uint8 outline[18 * 18];
if (_drawMode == kOutlineMode) {
memset(outline, 0, sizeof(outline));
createOutline(outline, glyphSource, width, height);
} else if (_drawMode == kShadowLeftMode) {
shadowOffset = -shadowOffset;
}
if (bpp == 1) {
@ -289,10 +292,10 @@ void FontSJISBase::drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1,
blitCharacter<uint8>(glyphSource, width - outlineXOffset, height - outlineYOffset, (uint8 *)dst + pitch + 1, pitch, c1);
} else {
if (_drawMode != kDefaultMode) {
blitCharacter<uint8>(glyphSource, width - outlineXOffset, height, ((uint8 *)dst) + 1, pitch, c2);
blitCharacter<uint8>(glyphSource, width - outlineXOffset, height, ((uint8 *)dst) + shadowOffset, pitch, c2);
blitCharacter<uint8>(glyphSource, width, height - outlineYOffset, ((uint8 *)dst) + pitch, pitch, c2);
if (_drawMode == kShadowMode)
blitCharacter<uint8>(glyphSource, width - outlineXOffset, height - outlineYOffset, ((uint8 *)dst) + pitch + 1, pitch, c2);
if (_drawMode != kFMTownsShadowMode)
blitCharacter<uint8>(glyphSource, width - outlineXOffset, height - outlineYOffset, ((uint8 *)dst) + pitch + shadowOffset, pitch, c2);
}
blitCharacter<uint8>(glyphSource, width, height, (uint8 *)dst, pitch, c1);
@ -303,10 +306,10 @@ void FontSJISBase::drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1,
blitCharacter<uint16>(glyphSource, width - outlineXOffset, height - outlineYOffset, (uint8 *)dst + pitch + 2, pitch, c1);
} else {
if (_drawMode != kDefaultMode) {
blitCharacter<uint16>(glyphSource, width - outlineXOffset, height, ((uint8 *)dst) + 2, pitch, c2);
blitCharacter<uint16>(glyphSource, width - outlineXOffset, height, ((uint8 *)dst) + shadowOffset, pitch, c2);
blitCharacter<uint16>(glyphSource, width, height - outlineYOffset, ((uint8 *)dst) + pitch, pitch, c2);
if (_drawMode == kShadowMode)
blitCharacter<uint16>(glyphSource, width - outlineXOffset, height - outlineYOffset, ((uint8 *)dst) + pitch + 2, pitch, c2);
if (_drawMode != kFMTownsShadowMode)
blitCharacter<uint16>(glyphSource, width - outlineXOffset, height - outlineYOffset, ((uint8 *)dst) + pitch + shadowOffset, pitch, c2);
}
blitCharacter<uint16>(glyphSource, width, height, (uint8 *)dst, pitch, c1);

3
graphics/sjis.h
View File

@ -84,7 +84,8 @@ public:
enum DrawingMode {
kDefaultMode,
kOutlineMode,
kShadowMode,
kShadowRightMode,
kShadowLeftMode,
kFMTownsShadowMode
};