libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-25 05:34:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LAB: Move text functions to DisplayMan, some renaming

Browse Source
This commit is contained in:
Strangerke 2015-12-07 07:48:54 +01:00 committed by Willem Jan Palenstijn
parent 895d29c1ae
commit 5636181b78
13 changed files with 150 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/lab/engine.cpp
View File

@ -32,7 +32,6 @@
#include "lab/labfun.h"
#include "lab/anim.h"
#include "lab/image.h"
#include "lab/text.h"
#include "lab/intro.h"
#include "lab/parsefun.h"
#include "lab/interface.h"
@ -1076,8 +1075,7 @@ void LabEngine::go() {
}
}
closeFont(_msgFont);
_graphics->closeFont(_msgFont);
_graphics->freePict();
freeScreens();

128
engines/lab/graphics.cpp
View File

@ -34,7 +34,6 @@
#include "lab/image.h"
#include "lab/labfun.h"
#include "lab/parsefun.h"
#include "lab/text.h"
#include "lab/resource.h"
#include "lab/graphics.h"
@ -208,7 +207,7 @@ static void getWord(char *wordBuffer, const char *mainBuffer, uint16 *wordWidth)
/* Gets a line of text for flowText; makes sure that its length is less than */
/* or equal to the maximum width. */
/******************************************************************************/
static void getLine(TextFont *tf, char *lineBuffer, const char **mainBuffer, uint16 lineWidth) {
void DisplayMan::getLine(TextFont *tf, char *lineBuffer, const char **mainBuffer, uint16 lineWidth) {
uint16 curWidth = 0, wordWidth;
char wordBuffer[100];
bool doit = true;
@ -1159,9 +1158,128 @@ void DisplayMan::fade(bool fadein, uint16 res) {
(0xF00 & fadeNumOut(0xF00 & FadePalette[palIdx], 0xF00 & res, i));
}
g_lab->_graphics->setAmigaPal(newpal, 16);
g_lab->waitTOF();
g_lab->_music->updateMusic();
setAmigaPal(newpal, 16);
_vm->waitTOF();
_vm->_music->updateMusic();
}
}
/*****************************************************************************/
/* Closes a font and frees all memory associated with it. */
/*****************************************************************************/
void DisplayMan::closeFont(TextFont *tf) {
if (tf) {
if (tf->_data && tf->_dataLength)
delete[] tf->_data;
delete tf;
}
}
/*****************************************************************************/
/* Returns the length of a text in the specified font. */
/*****************************************************************************/
uint16 DisplayMan::textLength(TextFont *tf, const char *text, uint16 numchars) {
uint16 length = 0;
if (tf) {
for (uint16 i = 0; i < numchars; i++) {
length += tf->_widths[(uint)*text];
text++;
}
}
return length;
}
/*****************************************************************************/
/* Returns the height of a specified font. */
/*****************************************************************************/
uint16 DisplayMan::textHeight(TextFont *tf) {
return (tf) ? tf->_height : 0;
}
/*****************************************************************************/
/* Draws the text to the screen. */
/*****************************************************************************/
void DisplayMan::text(TextFont *tf, uint16 x, uint16 y, uint16 color, const char *text, uint16 numchars) {
byte *VGATop, *VGACur, *VGATemp, *VGATempLine, *cdata;
uint32 RealOffset, SegmentOffset;
int32 templeft, LeftInSegment;
uint16 bwidth, mask, curpage, data;
VGATop = getCurrentDrawingBuffer();
for (uint16 i = 0; i < numchars; i++) {
RealOffset = (_screenWidth * y) + x;
curpage = RealOffset / _screenBytesPerPage;
SegmentOffset = RealOffset - (curpage * _screenBytesPerPage);
LeftInSegment = _screenBytesPerPage - SegmentOffset;
VGACur = VGATop + SegmentOffset;
if (tf->_widths[(uint)*text]) {
cdata = tf->_data + tf->_offsets[(uint)*text];
bwidth = *cdata++;
VGATemp = VGACur;
VGATempLine = VGACur;
for (uint16 rows = 0; rows < tf->_height; rows++) {
VGATemp = VGATempLine;
templeft = LeftInSegment;
for (uint16 cols = 0; cols < bwidth; cols++) {
data = *cdata++;
if (data && (templeft >= 8)) {
for (int j = 7; j >= 0; j--) {
if ((1 << j) & data)
*VGATemp = color;
VGATemp++;
}
templeft -= 8;
} else if (data) {
mask = 0x80;
templeft = LeftInSegment;
for (uint16 counterb = 0; counterb < 8; counterb++) {
if (templeft <= 0) {
curpage++;
VGATemp = (byte *)(VGATop - templeft);
/* Set up VGATempLine for next line */
VGATempLine -= _screenBytesPerPage;
/* Set up LeftInSegment for next line */
LeftInSegment += _screenBytesPerPage + templeft;
templeft += _screenBytesPerPage;
}
if (mask & data)
*VGATemp = color;
VGATemp++;
mask = mask >> 1;
templeft--;
}
} else {
templeft -= 8;
VGATemp += 8;
}
}
VGATempLine += _screenWidth;
LeftInSegment -= _screenWidth;
if (LeftInSegment <= 0) {
curpage++;
VGATempLine -= _screenBytesPerPage;
LeftInSegment += _screenBytesPerPage;
}
}
}
x += tf->_widths[(int)*text];
text++;
}
}
} // End of namespace Lab

13
engines/lab/graphics.h
View File

@ -37,6 +37,14 @@ namespace Lab {
class LabEngine;
struct TextFont {
uint32 _dataLength;
uint16 _height;
byte _widths[256];
uint16 _offsets[256];
byte *_data;
};
class DisplayMan {
private:
LabEngine *_vm;
@ -129,6 +137,11 @@ public:
void scrollDisplayX(int16 dx, uint16 x1, uint16 y1, uint16 x2, uint16 y2);
void scrollDisplayY(int16 dy, uint16 x1, uint16 y1, uint16 x2, uint16 y2);
void fade(bool fadein, uint16 res);
void closeFont(TextFont *tf);
uint16 textLength(TextFont *tf, const char *text, uint16 numchars);
uint16 textHeight(TextFont *tf);
void text(TextFont *tf, uint16 x, uint16 y, uint16 color, const char *text, uint16 numchars);
void getLine(TextFont *tf, char *lineBuffer, const char **mainBuffer, uint16 lineWidth);
bool _longWinInFront;
bool _lastMessageLong;

2
engines/lab/intro.cpp
View File

@ -444,7 +444,7 @@ void Intro::introSequence() {
_vm->_anim->_doBlack = true;
}
closeFont(msgFont);
_vm->_graphics->closeFont(msgFont);
}
} // End of namespace Lab

1
engines/lab/intro.h
View File

@ -32,7 +32,6 @@
#define LAB_INTRO_H
#include "lab/intro.h"
#include "lab/text.h"
namespace Lab {

2
engines/lab/map.cpp
View File

@ -32,12 +32,10 @@
#include "lab/labfun.h"
#include "lab/anim.h"
#include "lab/image.h"
#include "lab/text.h"
#include "lab/parsefun.h"
#include "lab/parsetypes.h"
#include "lab/resource.h"
#include "lab/interface.h"
#include "lab/text.h"
namespace Lab {

1
engines/lab/module.mk
View File

@ -17,7 +17,6 @@ MODULE_OBJS := \
resource.o \
savegame.o \
special.o \
text.o \
tilepuzzle.o \
timing.o

13
engines/lab/resource.cpp
View File

@ -29,7 +29,6 @@
*/
#include "lab/lab.h"
#include "lab/text.h"
#include "lab/resource.h"
namespace Lab {
@ -58,14 +57,14 @@ TextFont *Resource::getFont(const char *fileName) {
_vm->_music->updateMusic();
TextFont *textfont = new TextFont();
textfont->DataLength = fileSize - headerSize;
textfont->Height = dataFile->readUint16LE();
dataFile->read(textfont->Widths, 256);
textfont->_dataLength = fileSize - headerSize;
textfont->_height = dataFile->readUint16LE();
dataFile->read(textfont->_widths, 256);
for (int i = 0; i < 256; i++)
textfont->Offsets[i] = dataFile->readUint16LE();
textfont->_offsets[i] = dataFile->readUint16LE();
dataFile->skip(4);
textfont->data = new byte[textfont->DataLength + 4];
dataFile->read(textfont->data, textfont->DataLength);
textfont->_data = new byte[textfont->_dataLength + 4];
dataFile->read(textfont->_data, textfont->_dataLength);
return textfont;
}

1
engines/lab/resource.h
View File

@ -32,7 +32,6 @@
#define LAB_RESOURCE_H
#include "lab/labfun.h"
#include "lab/text.h"
namespace Lab {

13
engines/lab/special.cpp
View File

@ -39,7 +39,6 @@
#include "lab/parsefun.h"
#include "lab/interface.h"
#include "lab/anim.h"
#include "lab/text.h"
#include "lab/parsetypes.h"
#include "lab/resource.h"
@ -105,7 +104,7 @@ void LabEngine::doNotes() {
g_lab->_graphics->flowText(noteFont, -2 + g_lab->_graphics->SVGACord(1), 0, 0, false, false, true, true, g_lab->_graphics->VGAScaleX(25) + g_lab->_graphics->SVGACord(15), g_lab->_graphics->VGAScaleY(50), g_lab->_graphics->VGAScaleX(295) - g_lab->_graphics->SVGACord(15), g_lab->_graphics->VGAScaleY(148), ntext);
g_lab->_graphics->setPalette(g_lab->_anim->_diffPalette, 256);
closeFont(noteFont);
g_lab->_graphics->closeFont(noteFont);
delete[] ntext;
}
@ -123,7 +122,7 @@ void LabEngine::doWestPaper() {
paperFont = g_lab->_resource->getFont("P:News22.fon");
ntext = g_lab->_resource->getText("Lab:Rooms/Date");
g_lab->_graphics->flowText(paperFont, 0, 0, 0, false, true, false, true, g_lab->_graphics->VGAScaleX(57), g_lab->_graphics->VGAScaleY(77) + g_lab->_graphics->SVGACord(2), g_lab->_graphics->VGAScaleX(262), g_lab->_graphics->VGAScaleY(91), ntext);
closeFont(paperFont);
g_lab->_graphics->closeFont(paperFont);
delete[] ntext;
paperFont = g_lab->_resource->getFont("P:News32.fon");
@ -135,7 +134,7 @@ void LabEngine::doWestPaper() {
g_lab->_graphics->flowText(paperFont, -8 - g_lab->_graphics->SVGACord(1), 0, 0, false, true, false, true, g_lab->_graphics->VGAScaleX(57), g_lab->_graphics->VGAScaleY(86) - g_lab->_graphics->SVGACord(2), g_lab->_graphics->VGAScaleX(262), g_lab->_graphics->VGAScaleY(132), ntext);
} else
y = 115 - g_lab->_graphics->SVGACord(5);
closeFont(paperFont);
g_lab->_graphics->closeFont(paperFont);
delete[] ntext;
paperFont = g_lab->_resource->getFont("P:Note.fon");
@ -145,7 +144,7 @@ void LabEngine::doWestPaper() {
ntext = g_lab->_resource->getText("Lab:Rooms/Col2");
CharsPrinted = g_lab->_graphics->flowTextScaled(paperFont, -4, 0, 0, false, false, false, true, 162, y, 275, 148, ntext);
delete[] ntext;
closeFont(paperFont);
g_lab->_graphics->closeFont(paperFont);
g_lab->_graphics->setPalette(g_lab->_anim->_diffPalette, 256);
}
@ -470,7 +469,7 @@ void LabEngine::drawMonText(char *text, TextFont *monitorFont, uint16 x1, uint16
numlines += (*text - '0');
text += 2;
fheight = textHeight(monitorFont);
fheight = g_lab->_graphics->textHeight(monitorFont);
x1 = MonButton->_width + _graphics->VGAScaleX(3);
MonGadHeight = MonButton->_height + _graphics->VGAScaleY(3);
@ -645,7 +644,7 @@ void LabEngine::doMonitor(char *background, char *textfile, bool isinteractive,
_graphics->fade(false, 0);
_event->mouseHide();
delete[] ntext;
closeFont(monitorFont);
g_lab->_graphics->closeFont(monitorFont);
_graphics->setAPen(0);
_graphics->rectFill(0, 0, _graphics->_screenWidth - 1, _graphics->_screenHeight - 1);

156
engines/lab/text.cpp
View File

@ -1,156 +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 code is based on Labyrinth of Time code with assistance of
*
* Copyright (c) 1993 Terra Nova Development
* Copyright (c) 2004 The Wyrmkeep Entertainment Co.
*
*/
#include "lab/lab.h"
#include "lab/labfun.h"
#include "lab/text.h"
namespace Lab {
/*****************************************************************************/
/* Closes a font and frees all memory associated with it. */
/*****************************************************************************/
void closeFont(TextFont *tf) {
if (tf) {
if (tf->data && tf->DataLength)
delete[] tf->data;
delete tf;
}
}
/*****************************************************************************/
/* Returns the length of a text in the specified font. */
/*****************************************************************************/
uint16 textLength(TextFont *tf, const char *text, uint16 numchars) {
uint16 length = 0;
if (tf) {
for (uint16 i = 0; i < numchars; i++) {
length += tf->Widths[(uint)*text];
text++;
}
}
return length;
}
/*****************************************************************************/
/* Returns the height of a specified font. */
/*****************************************************************************/
uint16 textHeight(TextFont *tf) {
return (tf) ? tf->Height : 0;
}
/*****************************************************************************/
/* Draws the text to the screen. */
/*****************************************************************************/
void text(TextFont *tf, uint16 x, uint16 y, uint16 color, const char *text, uint16 numchars) {
byte *VGATop, *VGACur, *VGATemp, *VGATempLine, *cdata;
uint32 RealOffset, SegmentOffset;
int32 templeft, LeftInSegment;
uint16 bwidth, mask, curpage, data;
VGATop = g_lab->_graphics->getCurrentDrawingBuffer();
for (uint16 i = 0; i < numchars; i++) {
RealOffset = (g_lab->_graphics->_screenWidth * y) + x;
curpage = RealOffset / g_lab->_graphics->_screenBytesPerPage;
SegmentOffset = RealOffset - (curpage * g_lab->_graphics->_screenBytesPerPage);
LeftInSegment = g_lab->_graphics->_screenBytesPerPage - SegmentOffset;
VGACur = VGATop + SegmentOffset;
if (tf->Widths[(uint)*text]) {
cdata = tf->data + tf->Offsets[(uint)*text];
bwidth = *cdata++;
VGATemp = VGACur;
VGATempLine = VGACur;
for (uint16 rows = 0; rows < tf->Height; rows++) {
VGATemp = VGATempLine;
templeft = LeftInSegment;
for (uint16 cols = 0; cols < bwidth; cols++) {
data = *cdata++;
if (data && (templeft >= 8)) {
for (int j = 7; j >= 0; j--) {
if ((1 << j) & data)
*VGATemp = color;
VGATemp++;
}
templeft -= 8;
} else if (data) {
mask = 0x80;
templeft = LeftInSegment;
for (uint16 counterb = 0; counterb < 8; counterb++) {
if (templeft <= 0) {
curpage++;
VGATemp = (byte *)(VGATop - templeft);
/* Set up VGATempLine for next line */
VGATempLine -= g_lab->_graphics->_screenBytesPerPage;
/* Set up LeftInSegment for next line */
LeftInSegment += g_lab->_graphics->_screenBytesPerPage + templeft;
templeft += g_lab->_graphics->_screenBytesPerPage;
}
if (mask & data)
*VGATemp = color;
VGATemp++;
mask = mask >> 1;
templeft--;
}
} else {
templeft -= 8;
VGATemp += 8;
}
}
VGATempLine += g_lab->_graphics->_screenWidth;
LeftInSegment -= g_lab->_graphics->_screenWidth;
if (LeftInSegment <= 0) {
curpage++;
VGATempLine -= g_lab->_graphics->_screenBytesPerPage;
LeftInSegment += g_lab->_graphics->_screenBytesPerPage;
}
}
}
x += tf->Widths[(int)*text];
text++;
}
}
} // End of namespace Lab

59
engines/lab/text.h
View File

@ -1,59 +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 code is based on Labyrinth of Time code with assistance of
*
* Copyright (c) 1993 Terra Nova Development
* Copyright (c) 2004 The Wyrmkeep Entertainment Co.
*
*/
#ifndef LAB_TEXT_H
#define LAB_TEXT_H
namespace Lab {
#if defined(WIN32)
#pragma pack(push, 1)
#endif
struct TextFont {
uint32 DataLength;
uint16 Height;
byte Widths[256];
uint16 Offsets[256];
byte *data;
};
#if defined(WIN32)
#pragma pack(pop)
#endif
void closeFont(TextFont *tf);
uint16 textLength(TextFont *tf, const char *text, uint16 numchars);
uint16 textHeight(TextFont *tf);
void text(TextFont *tf, uint16 x, uint16 y, uint16 color, const char *text, uint16 numchars);
} // End of namespace Lab
#endif /* LAB_TEXT_H */

33
engines/lab/vga.cpp
View File

@ -1,33 +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 code is based on Labyrinth of Time code with assistance of
*
* Copyright (c) 1993 Terra Nova Development
* Copyright (c) 2004 The Wyrmkeep Entertainment Co.
*
*/
namespace Lab {
} // End of namespace Lab