From 759024d51ad11002ef1c9a2f98b7982602cb39f0 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Fri, 22 Jun 2012 14:13:18 +0200 Subject: WINTERMUTE: Remove FontGlyphCache. --- engines/wintermute/Base/BFontTT.cpp | 5 -- engines/wintermute/Base/BFontTT.h | 7 -- engines/wintermute/FontGlyphCache.cpp | 102 --------------------------- engines/wintermute/FontGlyphCache.h | 125 ---------------------------------- engines/wintermute/module.mk | 1 - 5 files changed, 240 deletions(-) delete mode 100644 engines/wintermute/FontGlyphCache.cpp delete mode 100644 engines/wintermute/FontGlyphCache.h diff --git a/engines/wintermute/Base/BFontTT.cpp b/engines/wintermute/Base/BFontTT.cpp index 9f0e9e3b36..0d2f39f730 100644 --- a/engines/wintermute/Base/BFontTT.cpp +++ b/engines/wintermute/Base/BFontTT.cpp @@ -29,7 +29,6 @@ #include "engines/wintermute/dcgf.h" #include "engines/wintermute/Base/file/BFile.h" #include "engines/wintermute/Base/BFontTT.h" -#include "engines/wintermute/FontGlyphCache.h" #include "engines/wintermute/utils/PathUtil.h" #include "engines/wintermute/utils/StringUtil.h" #include "engines/wintermute/math/MathUtil.h" @@ -64,7 +63,6 @@ CBFontTT::CBFontTT(CBGame *inGame): CBFont(inGame) { _fTFace = NULL; _fTStream = NULL; #endif - _glyphCache = NULL; _ascender = _descender = _lineHeight = _pointSize = _underlinePos = 0; _horDpi = _vertDpi = 0; @@ -86,8 +84,6 @@ CBFontTT::~CBFontTT(void) { delete _deletableFont; _font = NULL; - delete _glyphCache; - _glyphCache = NULL; #if 0 if (_fTFace) { FT_Done_Face(_fTFace); @@ -625,7 +621,6 @@ HRESULT CBFontTT::Persist(CBPersistMgr *persistMgr) { if (!persistMgr->_saving) { for (int i = 0; i < NUM_CACHED_TEXTS; i++) _cachedTexts[i] = NULL; - _glyphCache = NULL; _fallbackFont = _font = _deletableFont = NULL; } diff --git a/engines/wintermute/Base/BFontTT.h b/engines/wintermute/Base/BFontTT.h index 127c727922..418efb3e9b 100644 --- a/engines/wintermute/Base/BFontTT.h +++ b/engines/wintermute/Base/BFontTT.h @@ -40,8 +40,6 @@ namespace WinterMute { -class FontGlyphCache; - class CBFontTT : public CBFont { private: ////////////////////////////////////////////////////////////////////////// @@ -128,10 +126,6 @@ public: HRESULT LoadBuffer(byte *buffer); HRESULT LoadFile(const char *filename); - FontGlyphCache *GetGlyphCache() { - return _glyphCache; - } - float GetLineHeight() const { return _lineHeight; } @@ -156,7 +150,6 @@ private: Graphics::Font *_deletableFont; const Graphics::Font *_font; const Graphics::Font *_fallbackFont; - FontGlyphCache *_glyphCache; float _ascender; float _descender; diff --git a/engines/wintermute/FontGlyphCache.cpp b/engines/wintermute/FontGlyphCache.cpp deleted file mode 100644 index 73dc3d2ff1..0000000000 --- a/engines/wintermute/FontGlyphCache.cpp +++ /dev/null @@ -1,102 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -/* - * This file is based on WME Lite. - * http://dead-code.org/redir.php?target=wmelite - * Copyright (c) 2011 Jan Nedoma - */ - -#include "FontGlyphCache.h" - -namespace WinterMute { -#if 0 -////////////////////////////////////////////////////////////////////////// -FontGlyphCache::FontGlyphCache() { -} - -////////////////////////////////////////////////////////////////////////// -FontGlyphCache::~FontGlyphCache() { - GlyphInfoMap::iterator it; - - for (it = _glyphs.begin(); it != _glyphs.end(); ++it) { - delete it->_value; - it->_value = NULL; - } -} - -////////////////////////////////////////////////////////////////////////// -bool FontGlyphCache::HasGlyph(wchar_t ch) { - return (_glyphs.find(ch) != _glyphs.end()); -} - -////////////////////////////////////////////////////////////////////////// -void FontGlyphCache::Initialize() { -} - -////////////////////////////////////////////////////////////////////////// -GlyphInfo *FontGlyphCache::GetGlyph(wchar_t ch) { - GlyphInfoMap::const_iterator it; - it = _glyphs.find(ch); - if (it == _glyphs.end()) return NULL; - - return it->_value; -} -/* -////////////////////////////////////////////////////////////////////////// -void FontGlyphCache::AddGlyph(wchar_t ch, int glyphIndex, FT_GlyphSlot glyphSlot, size_t width, size_t height, byte *pixels, size_t stride) { - if (stride == 0) stride = width; - - _glyphs[ch] = new GlyphInfo(glyphIndex); - _glyphs[ch]->SetGlyphInfo(glyphSlot->advance.x / 64.f, glyphSlot->advance.y / 64.f, glyphSlot->bitmap_left, glyphSlot->bitmap_top); - _glyphs[ch]->SetGlyphImage(width, height, stride, pixels); -} -*/ - -////////////////////////////////////////////////////////////////////////// -void GlyphInfo::SetGlyphImage(size_t width, size_t height, size_t stride, byte *pixels) { - warning("GlyphInfo::SetGlyphImage - Not ported yet"); -#if 0 - if (_image) SDL_FreeSurface(_image); - - _image = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 32, 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000); - SDL_LockSurface(_image); - - Uint8 *buf = (Uint8 *)_image->pixels; - - for (int y = 0; y < height; y++) { - Uint32 *buf32 = (Uint32 *)buf; - - for (int x = 0; x < width; x++) { - byte alpha = pixels[y * stride + x]; - Uint32 color = SDL_MapRGBA(_image->format, 255, 255, 255, alpha); - buf32[x] = color; - } - - buf += _image->pitch; - } - - SDL_UnlockSurface(_image); -#endif -} -#endif -} // end of namespace WinterMute diff --git a/engines/wintermute/FontGlyphCache.h b/engines/wintermute/FontGlyphCache.h deleted file mode 100644 index bb36c0d864..0000000000 --- a/engines/wintermute/FontGlyphCache.h +++ /dev/null @@ -1,125 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -/* - * This file is based on WME Lite. - * http://dead-code.org/redir.php?target=wmelite - * Copyright (c) 2011 Jan Nedoma - */ - -#ifndef WINTERMUTE_FONTGLYPHCACHE_H -#define WINTERMUTE_FONTGLYPHCACHE_H - - -#include "engines/wintermute/Base/BFontStorage.h" -#include "graphics/surface.h" - -namespace WinterMute { -#if 0 -////////////////////////////////////////////////////////////////////////// -class GlyphInfo { -public: - GlyphInfo(int glyphIndex) { - _glyphIndex = glyphIndex; - _advanceX = _advanceY = 0; - _bearingX = _bearingY = 0; - - _width = _height = 0; - - _image = NULL; - } - - ~GlyphInfo() { - // TODO - //if (_image) SDL_FreeSurface(_image); - } - - void SetGlyphInfo(float AdvanceX, float AdvanceY, int BearingX, int BearingY) { - _advanceX = AdvanceX; - _advanceY = AdvanceY; - _bearingX = BearingX; - _bearingY = BearingY; - } - - void SetGlyphImage(size_t width, size_t height, size_t stride, byte *pixels); - - int GetGlyphIndex() { - return _glyphIndex; - } - int GetWidth() { - return _width; - } - int GetHeight() { - return _height; - } - float GetAdvanceX() { - return _advanceX; - } - float GetAdvanceY() { - return _advanceY; - } - int GetBearingX() { - return _bearingX; - } - int GetBearingY() { - return _bearingY; - } - Graphics::Surface *GetImage() { - return _image; - } - -private: - int _glyphIndex; - - float _advanceX; - float _advanceY; - int _bearingX; - int _bearingY; - - int _width; - int _height; - - Graphics::Surface *_image; -}; - - - -////////////////////////////////////////////////////////////////////////// -class FontGlyphCache { -public: - FontGlyphCache(); - virtual ~FontGlyphCache(); - - void Initialize(); - bool HasGlyph(wchar_t ch); - GlyphInfo *GetGlyph(wchar_t ch); - //void AddGlyph(wchar_t ch, int glyphIndex, FT_GlyphSlot glyphSlot, size_t width, size_t height, byte *pixels, size_t stride = 0); - -private: - //typedef Common::HashMap GlyphInfoMap; - typedef Common::HashMap GlyphInfoMap; // TODO - GlyphInfoMap _glyphs; -}; -#endif -} // end of namespace WinterMute - -#endif // WINTERMUTE_FONTGLYPHCACHE_H diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk index 64c334d0eb..6c263ede22 100644 --- a/engines/wintermute/module.mk +++ b/engines/wintermute/module.mk @@ -88,7 +88,6 @@ MODULE_OBJS := \ Base/PartEmitter.o \ Base/PartForce.o \ detection.o \ - FontGlyphCache.o \ graphics/transparentSurface.o \ graphics/tga.o \ math/MathUtil.o \ -- cgit v1.2.3