From 89993e128fe15efd16fdf89696682f0e24cb8593 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 24 Aug 2014 23:59:37 -0400 Subject: ACCESS: Split font code into a separate file --- engines/access/font.h | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 engines/access/font.h (limited to 'engines/access/font.h') diff --git a/engines/access/font.h b/engines/access/font.h new file mode 100644 index 0000000000..2c9ffd0f34 --- /dev/null +++ b/engines/access/font.h @@ -0,0 +1,104 @@ +/* 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. + * + */ + +#ifndef ACCESS_FONT_H +#define ACCESS_FONT_H + +#include "common/scummsys.h" +#include "common/array.h" +#include "common/rect.h" +#include "access/asurface.h" +#include "access/data.h" + +namespace Access { + +struct FontVal { +public: + int _lo, _hi; + + FontVal() { _lo = _hi = 0; } +}; + +class Font { +private: + int _bitWidth; + int _height; + Common::Array _chars; +public: + static byte _fontColors[4]; +public: + Font(); + + ~Font(); + + /** + * Load the given font data + */ + void load(const int *fontIndex, const byte *fontData); + + /** + * Get the width of a given character + */ + int charWidth(char c); + + /** + * Get the width of a given string + */ + int stringWidth(const Common::String &msg); + + /** + * Get a partial string that will fit in a given width + * @param s Source string. Modified to remove line + * @param maxWidth Maximum width allowed + * @param line Output line + * @param width Calculated width of returned line + * @returns True if last line + */ + bool getLine(Common::String &s, int maxWidth, Common::String &line, int &width); + + /** + * Draw a string on a given surface + */ + void drawString(Graphics::Surface *s, const Common::String &msg, const Common::Point &pt); + + /** + * Draw a character on a given surface + */ + int drawChar(Graphics::Surface *s, char c, Common::Point &pt); +}; + +class FontManager { +public: + FontVal _charSet; + FontVal _charFor; + Common::Point _printOrg; + Common::Point _printStart; + int _printMaxX; + Font _font1; + Font _font2; +public: + FontManager(); +}; + +} // End of namespace Access + +#endif /* ACCESS_FONT_H */ -- cgit v1.2.3 From 707a01cb38eb671f2fad29016f11268f8fab9084 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 25 Aug 2014 00:01:18 -0400 Subject: ACCESS: Change font method parameter types --- engines/access/font.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/access/font.h') diff --git a/engines/access/font.h b/engines/access/font.h index 2c9ffd0f34..a32dd6b695 100644 --- a/engines/access/font.h +++ b/engines/access/font.h @@ -78,12 +78,12 @@ public: /** * Draw a string on a given surface */ - void drawString(Graphics::Surface *s, const Common::String &msg, const Common::Point &pt); + void drawString(ASurface *s, const Common::String &msg, const Common::Point &pt); /** * Draw a character on a given surface */ - int drawChar(Graphics::Surface *s, char c, Common::Point &pt); + int drawChar(ASurface *s, char c, Common::Point &pt); }; class FontManager { -- cgit v1.2.3 From 33cdeb7a4005408b92366ae34a29589e3b0fa0cb Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 25 Aug 2014 00:18:32 -0400 Subject: ACCESS: Stub for printText method --- engines/access/font.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'engines/access/font.h') diff --git a/engines/access/font.h b/engines/access/font.h index a32dd6b695..9285d323d1 100644 --- a/engines/access/font.h +++ b/engines/access/font.h @@ -84,14 +84,17 @@ public: * Draw a character on a given surface */ int drawChar(ASurface *s, char c, Common::Point &pt); + + /** + * Draw a string on a given surface and update text positioning + */ + void printText(ASurface *s, const Common::String &msg); }; class FontManager { public: FontVal _charSet; FontVal _charFor; - Common::Point _printOrg; - Common::Point _printStart; int _printMaxX; Font _font1; Font _font2; -- cgit v1.2.3 From 9d3460e9f707b1d53534e45c19e15bbb247eba70 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 31 Aug 2014 02:18:02 +0200 Subject: ACCESS: Implement printText() --- engines/access/font.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'engines/access/font.h') diff --git a/engines/access/font.h b/engines/access/font.h index 9285d323d1..d8517e3720 100644 --- a/engines/access/font.h +++ b/engines/access/font.h @@ -85,10 +85,6 @@ public: */ int drawChar(ASurface *s, char c, Common::Point &pt); - /** - * Draw a string on a given surface and update text positioning - */ - void printText(ASurface *s, const Common::String &msg); }; class FontManager { -- cgit v1.2.3 From 492d974550924522774181cbcfa559c4b7e7b3a1 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 17 Dec 2014 18:27:47 +0100 Subject: ACCESS: Some more polishing in the file headers --- engines/access/font.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/access/font.h') diff --git a/engines/access/font.h b/engines/access/font.h index d8517e3720..6a812051ca 100644 --- a/engines/access/font.h +++ b/engines/access/font.h @@ -8,12 +8,12 @@ * 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. -- cgit v1.2.3