[Scummvm-cvs-logs] SF.net SVN: scummvm:[42231] scummvm/trunk
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Tue Jul 7 20:17:31 CEST 2009
Revision: 42231
http://scummvm.svn.sourceforge.net/scummvm/?rev=42231&view=rev
Author: lordhoto
Date: 2009-07-07 18:17:30 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
- Rename FontSJIS::enableShadow to enableOutline.
- Initialize outline to false by default in FontTowns.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/screen.cpp
scummvm/trunk/graphics/sjis.cpp
scummvm/trunk/graphics/sjis.h
Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp 2009-07-07 18:10:35 UTC (rev 42230)
+++ scummvm/trunk/engines/kyra/screen.cpp 2009-07-07 18:17:30 UTC (rev 42231)
@@ -115,7 +115,7 @@
}*/
}
- _sjisFont->enableShadow(!_use16ColorMode);
+ _sjisFont->enableOutline(!_use16ColorMode);
}
}
@@ -3021,7 +3021,7 @@
color2 = _textColorsMap[0];
if (color2 == _sjisInvisibleColor)
- _sjisFont->enableShadow(false);
+ _sjisFont->enableOutline(false);
}
if (_curPage == 0 || _curPage == 1)
@@ -3040,7 +3040,7 @@
_sjisFont->drawChar(destPage, c, 640, 1, color1, color2);
- _sjisFont->enableShadow(!_use16ColorMode);
+ _sjisFont->enableOutline(!_use16ColorMode);
}
#pragma mark -
Modified: scummvm/trunk/graphics/sjis.cpp
===================================================================
--- scummvm/trunk/graphics/sjis.cpp 2009-07-07 18:10:35 UTC (rev 42230)
+++ scummvm/trunk/graphics/sjis.cpp 2009-07-07 18:17:30 UTC (rev 42231)
@@ -35,7 +35,7 @@
}
template<typename Color>
-void FontTowns::drawCharInternShadow(const uint16 *glyph, uint8 *dst, int pitch, Color c1, Color c2) const {
+void FontTowns::drawCharInternOutline(const uint16 *glyph, uint8 *dst, int pitch, Color c1, Color c2) const {
uint32 outlineGlyph[18];
memset(outlineGlyph, 0, sizeof(outlineGlyph));
@@ -90,15 +90,15 @@
const uint16 *glyphSource = _fontData + sjisToChunk(ch & 0xFF, ch >> 8) * 16;
if (bpp == 1) {
- if (!_shadowEnabled)
+ if (!_outlineEnabled)
drawCharIntern<uint8>(glyphSource, (uint8 *)dst, pitch, c1);
else
- drawCharInternShadow<uint8>(glyphSource, (uint8 *)dst, pitch, c1, c2);
+ drawCharInternOutline<uint8>(glyphSource, (uint8 *)dst, pitch, c1, c2);
} else if (bpp == 2) {
- if (!_shadowEnabled)
+ if (!_outlineEnabled)
drawCharIntern<uint16>(glyphSource, (uint8 *)dst, pitch, c1);
else
- drawCharInternShadow<uint16>(glyphSource, (uint8 *)dst, pitch, c1, c2);
+ drawCharInternOutline<uint16>(glyphSource, (uint8 *)dst, pitch, c1, c2);
} else {
error("FontTowns::drawChar: unsupported bpp: %d", bpp);
}
Modified: scummvm/trunk/graphics/sjis.h
===================================================================
--- scummvm/trunk/graphics/sjis.h 2009-07-07 18:10:35 UTC (rev 42230)
+++ scummvm/trunk/graphics/sjis.h 2009-07-07 18:17:30 UTC (rev 42231)
@@ -42,12 +42,12 @@
virtual ~FontSJIS() {}
/**
- * Enable shadow drawing.
+ * Enable outline drawing.
*
- * After changing shadow state, getFontHeight and getFontWidth might return
+ * After changing outline state, getFontHeight and getFontWidth might return
* different values!
*/
- virtual void enableShadow(bool enable) {}
+ virtual void enableOutline(bool enable) {}
/**
* Returns the height of the font.
@@ -74,7 +74,7 @@
* @param pitch pitch of the destination buffer (size in *bytes*)
* @param bpp bytes per pixel of the destination buffer
* @param c1 forground color
- * @param c2 shadow/outline color
+ * @param c2 outline color
*/
virtual void drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1, uint32 c2) const = 0;
};
@@ -86,21 +86,23 @@
*/
class FontTowns : public FontSJIS {
public:
+ FontTowns() : _outlineEnabled(false) {}
+
/**
* Loads the ROM data from the given read stream.
*/
bool loadFromStream(Common::ReadStream &stream);
- void enableShadow(bool enable) { _shadowEnabled = enable; }
+ void enableOutline(bool enable) { _outlineEnabled = enable; }
- uint getFontHeight() const { return _shadowEnabled ? 18 : 16; }
- uint getFontWidth() const { return _shadowEnabled ? 18 : 16; }
+ uint getFontHeight() const { return _outlineEnabled ? 18 : 16; }
+ uint getFontWidth() const { return _outlineEnabled ? 18 : 16; }
void drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1, uint32 c2) const;
private:
template<typename Color>
- void drawCharInternShadow(const uint16 *glyph, uint8 *dst, int pitch, Color c1, Color c2) const;
+ void drawCharInternOutline(const uint16 *glyph, uint8 *dst, int pitch, Color c1, Color c2) const;
template<typename Color>
void drawCharIntern(const uint16 *glyph, uint8 *dst, int pitch, Color c1) const;
@@ -109,7 +111,7 @@
kFontRomSize = 262144
};
- bool _shadowEnabled;
+ bool _outlineEnabled;
uint16 _fontData[kFontRomSize / 2];
static uint sjisToChunk(uint8 low, uint8 high);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list