aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Kagerer2010-11-05 20:36:13 +0000
committerFlorian Kagerer2010-11-05 20:36:13 +0000
commite4da5e3af48a71b36b8d927151aa08aa498bdcc9 (patch)
tree8c887a0b45b0b4b14dbbdb11fefe6954f62f7b09
parent49b3635181c50220b54d8dd2f2e4aa467ea45cb8 (diff)
downloadscummvm-rg350-e4da5e3af48a71b36b8d927151aa08aa498bdcc9.tar.gz
scummvm-rg350-e4da5e3af48a71b36b8d927151aa08aa498bdcc9.tar.bz2
scummvm-rg350-e4da5e3af48a71b36b8d927151aa08aa498bdcc9.zip
GRAPHICS/SJIS: cleanup
svn-id: r54099
-rw-r--r--graphics/sjis.cpp39
-rw-r--r--graphics/sjis.h2
2 files changed, 22 insertions, 19 deletions
diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp
index f4724e0feb..06712a9226 100644
--- a/graphics/sjis.cpp
+++ b/graphics/sjis.cpp
@@ -53,7 +53,7 @@ FontSJIS *FontSJIS::createFont(const Common::Platform platform) {
}
template<typename Color>
-void FontSJISBase::blitCharacter(const uint8 *glyph, const int w, const int h, uint8 *dst, int pitch, Color c1, Color c2, bool shadowClipRight, bool shadowClipBottom) const {
+void FontSJISBase::blitCharacter(const uint8 *glyph, const int w, const int h, uint8 *dst, int pitch, Color c) const {
for (int y = 0; y < h; ++y) {
Color *d = (Color *)dst;
dst += pitch;
@@ -63,17 +63,9 @@ void FontSJISBase::blitCharacter(const uint8 *glyph, const int w, const int h, u
if (!(x % 8))
mask = *glyph++;
- if (mask & 0x80) {
- *d = c1;
- if (_drawMode == kShadowMode || _drawMode == kFMTownsShadowMode) {
- if (!(shadowClipRight && (x == w - 1)))
- d[1] = c2;
- if (!(shadowClipBottom && (y == h - 1)))
- d[pitch] = c2;
- }
- if (_drawMode == kShadowMode && !(shadowClipRight && (x == w - 1)) && !(shadowClipBottom && (y == h - 1)))
- d[pitch + 1] = c2;
- }
+ if (mask & 0x80)
+ *d = c;
+
++d;
mask <<= 1;
}
@@ -147,7 +139,6 @@ void FontSJISBase::drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1,
int width = 0, height = 0;
int outlineExtraWidth = 2, outlineExtraHeight = 2;
int outlineXOffset = 0, outlineYOffset = 0;
- bool shadowClipRight = false, shadowClipBottom = false;
if (is8x16(ch)) {
glyphSource = getCharData8x16(ch);
@@ -163,14 +154,12 @@ void FontSJISBase::drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1,
width = maxW;
outlineExtraWidth = 0;
outlineXOffset = 1;
- shadowClipRight = true;
}
if (maxH != -1 && maxH < height) {
height = maxH;
outlineExtraHeight = 0;
outlineYOffset = 1;
- shadowClipBottom = true;
}
if (width <= 0 || height <= 0)
@@ -196,15 +185,29 @@ void FontSJISBase::drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1,
if (_drawMode == kOutlineMode) {
blitCharacter<uint8>(outline, width + outlineExtraWidth, height + outlineExtraHeight, (uint8 *)dst, pitch, c2);
blitCharacter<uint8>(glyphSource, width - outlineXOffset, height - outlineYOffset, (uint8 *)dst + pitch + 1, pitch, c1);
- } else {
- blitCharacter<uint8>(glyphSource, width, height, (uint8 *)dst, pitch, c1, c2, shadowClipRight, shadowClipBottom);
+ } else {
+ if (_drawMode != kDefaultMode) {
+ blitCharacter<uint8>(glyphSource, width - outlineXOffset, height, ((uint8*)dst) + 1, 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);
+ }
+
+ blitCharacter<uint8>(glyphSource, width, height, (uint8 *)dst, pitch, c1);
}
} else if (bpp == 2) {
if (_drawMode == kOutlineMode) {
blitCharacter<uint16>(outline, width + outlineExtraWidth, height + outlineExtraHeight, (uint8 *)dst, pitch, c2);
blitCharacter<uint16>(glyphSource, width - outlineXOffset, height - outlineYOffset, (uint8 *)dst + pitch + 2, pitch, c1);
} else {
- blitCharacter<uint16>(glyphSource, width, height, (uint8 *)dst, pitch, c1, c2, shadowClipRight, shadowClipBottom);
+ if (_drawMode != kDefaultMode) {
+ blitCharacter<uint16>(glyphSource, width - outlineXOffset, height, ((uint8*)dst) + 2, 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);
+ }
+
+ blitCharacter<uint16>(glyphSource, width, height, (uint8 *)dst, pitch, c1);
}
} else {
error("FontSJISBase::drawChar: unsupported bpp: %d", bpp);
diff --git a/graphics/sjis.h b/graphics/sjis.h
index 6ac2033a48..365e63e470 100644
--- a/graphics/sjis.h
+++ b/graphics/sjis.h
@@ -155,7 +155,7 @@ public:
void drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1, uint32 c2, int maxW = -1, int maxH = -1) const;
private:
template<typename Color>
- void blitCharacter(const uint8 *glyph, const int w, const int h, uint8 *dst, int pitch, Color c1, Color c2 = 0, bool clipShadowRight = false, bool clipShadowBottom = false) const;
+ void blitCharacter(const uint8 *glyph, const int w, const int h, uint8 *dst, int pitch, Color c) const;
void createOutline(uint8 *outline, const uint8 *glyph, const int w, const int h) const;
#ifndef DISABLE_FLIPPED_MODE