[Scummvm-git-logs] scummvm master -> 2e48529fa1f1d865299db81bc99cb7537656b19f
stevenhoefel
stevenhoefel at hotmail.com
Sun Jan 15 08:42:57 CET 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2e48529fa1 DIRECTOR: Utilise MacText class to provide Text Wrapping.
Commit: 2e48529fa1f1d865299db81bc99cb7537656b19f
https://github.com/scummvm/scummvm/commit/2e48529fa1f1d865299db81bc99cb7537656b19f
Author: stevenhoefel (stevenhoefel at hotmail.com)
Date: 2017-01-15T18:42:50+11:00
Commit Message:
DIRECTOR: Utilise MacText class to provide Text Wrapping.
Changed paths:
engines/director/frame.cpp
engines/director/frame.h
graphics/font.cpp
graphics/macgui/mactext.cpp
graphics/macgui/mactext.h
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 7e7180b..47cf0b4 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -24,6 +24,7 @@
#include "graphics/font.h"
#include "graphics/macgui/macfontmanager.h"
#include "graphics/macgui/macwindowmanager.h"
+#include "graphics/macgui/mactext.h"
#include "graphics/primitives.h"
#include "image/bmp.h"
@@ -615,33 +616,8 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
Common::Rect drawRect(x, y, x + width, y + height);
+ inkBasedBlit(surface, *img->getSurface(), i, drawRect);
addDrawRect(i, drawRect);
-
- switch (_sprites[i]->_ink) {
- case kInkTypeCopy:
- surface.blitFrom(*img->getSurface(), Common::Point(x, y));
- break;
- case kInkTypeTransparent:
- // FIXME: is it always white (last entry in pallette)?
- surface.transBlitFrom(*img->getSurface(), Common::Point(x, y), _vm->getPaletteColorCount() - 1);
- break;
- case kInkTypeBackgndTrans:
- drawBackgndTransSprite(surface, *img->getSurface(), drawRect);
- break;
- case kInkTypeMatte:
- drawMatteSprite(surface, *img->getSurface(), drawRect);
- break;
- case kInkTypeGhost:
- drawGhostSprite(surface, *img->getSurface(), drawRect);
- break;
- case kInkTypeReverse:
- drawReverseSprite(surface, *img->getSurface(), drawRect);
- break;
- default:
- warning("Unhandled ink type %d", _sprites[i]->_ink);
- surface.blitFrom(*img->getSurface(), Common::Point(x, y));
- break;
- }
}
}
}
@@ -679,32 +655,7 @@ void Frame::renderShape(Graphics::ManagedSurface &surface, uint16 spriteId) {
tmpSurface.frameRect(Common::Rect(rr, rr, shapeRect.width() - (rr * 2), shapeRect.height() - (rr * 2)), 0);
}
- switch (_sprites[spriteId]->_ink) {
- case kInkTypeCopy:
- surface.blitFrom(tmpSurface, Common::Point(_sprites[spriteId]->_startPoint.x, _sprites[spriteId]->_startPoint.y));
- break;
- case kInkTypeTransparent:
- // FIXME: is it always white (last entry in pallette)?
- surface.transBlitFrom(tmpSurface, Common::Point(_sprites[spriteId]->_startPoint.x, _sprites[spriteId]->_startPoint.y), _vm->getPaletteColorCount() - 1);
- break;
- case kInkTypeBackgndTrans:
- drawBackgndTransSprite(surface, tmpSurface, shapeRect);
- break;
- case kInkTypeMatte:
- drawMatteSprite(surface, tmpSurface, shapeRect);
- break;
- case kInkTypeGhost:
- drawGhostSprite(surface, tmpSurface, shapeRect);
- break;
- case kInkTypeReverse:
- drawReverseSprite(surface, tmpSurface, shapeRect);
- break;
- default:
- warning("Unhandled ink type %d", _sprites[spriteId]->_ink);
- surface.blitFrom(tmpSurface, Common::Point(_sprites[spriteId]->_startPoint.x, _sprites[spriteId]->_startPoint.y));
- break;
- }
-
+ inkBasedBlit(surface, tmpSurface, spriteId, shapeRect);
addDrawRect(spriteId, shapeRect);
}
@@ -809,6 +760,33 @@ Image::ImageDecoder *Frame::getImageFrom(uint16 spriteId) {
return img;
}
+void Frame::inkBasedBlit(Graphics::ManagedSurface &targetSurface, const Graphics::Surface &spriteSurface, uint16 spriteId, Common::Rect drawRect) {
+ switch (_sprites[spriteId]->_ink) {
+ case kInkTypeCopy:
+ targetSurface.blitFrom(spriteSurface, Common::Point(drawRect.left, drawRect.top));
+ break;
+ case kInkTypeTransparent:
+ // FIXME: is it always white (last entry in pallette)?
+ targetSurface.transBlitFrom(spriteSurface, Common::Point(drawRect.left, drawRect.top), _vm->getPaletteColorCount() - 1);
+ break;
+ case kInkTypeBackgndTrans:
+ drawBackgndTransSprite(targetSurface, spriteSurface, drawRect);
+ break;
+ case kInkTypeMatte:
+ drawMatteSprite(targetSurface, spriteSurface, drawRect);
+ break;
+ case kInkTypeGhost:
+ drawGhostSprite(targetSurface, spriteSurface, drawRect);
+ break;
+ case kInkTypeReverse:
+ drawReverseSprite(targetSurface, spriteSurface, drawRect);
+ break;
+ default:
+ warning("Unhandled ink type %d", _sprites[spriteId]->_ink);
+ targetSurface.blitFrom(spriteSurface, Common::Point(drawRect.left, drawRect.top));
+ break;
+ }
+}
void Frame::renderText(Graphics::ManagedSurface &surface, uint16 spriteId, uint16 castId) {
Common::SeekableSubReadStreamEndian *textStream = NULL;
@@ -917,21 +895,22 @@ void Frame::renderText(Graphics::ManagedSurface &surface, uint16 spriteId, Commo
width += padding * 2;
height += padding;
- if (textCast->textAlign == kTextAlignLeft) textX += padding;
- else if (textCast->textAlign == kTextAlignRight) textX -= padding;
+ if (textCast->textAlign == kTextAlignLeft)
+ textX += padding;
+ else if (textCast->textAlign == kTextAlignRight)
+ textX -= padding;
//TODO: alignment issue with odd-size-width center-aligned text
- //else if (textCast->textAlign == kTextAlignCenter && ((borderSize + padding) % 2 == 1)) textX--;
+ //else if (textCast->textAlign == kTextAlignCenter && ((borderSize + padding) % 2 == 1))
+ // textX--;
+
textY += padding / 2;
}
if (textCast->textAlign == kTextAlignRight) textX -= 1;
if (textShadow > 0) {
- if (borderSize == 0 && _vm->getVersion() > 3)
+ if (borderSize == 0 && _vm->getVersion() > 3)
textX += 1;
-
- font->drawString(&surface, text, textX + textShadow, textY + textShadow,
- width, (_sprites[spriteId]->_ink == kInkTypeReverse ? 255 : 0), (Graphics::TextAlign)alignment);
if (_vm->getVersion() > 3)
height -= (textShadow - 1);
}
@@ -939,37 +918,41 @@ void Frame::renderText(Graphics::ManagedSurface &surface, uint16 spriteId, Commo
textY += 2;
}
- //TODO: the colour is wrong here... need to determine the correct colour for all versions!
- font->drawString(&surface, text, textX, textY,
- width, (_sprites[spriteId]->_ink == kInkTypeReverse ? 255 : 0), (Graphics::TextAlign)alignment);
-
- if (isButtonLabel)
- return;
-
- uint16 borderX = x + borderSize - 1, borderY = y + borderSize - 1, borderHeight = height, borderWidth = width;
- if (borderSize != kSizeNone) {
- while (borderSize) {
- borderWidth += 2;
- borderHeight += 2;
- surface.frameRect(Common::Rect(borderX, borderY, borderX + borderWidth, borderY + borderHeight), 0);
- borderSize--;
- borderX--;
- borderY--;
+ Graphics::MacText mt(text, font, 0x00, 0xff, width);
+ mt.render();
+ Graphics::ManagedSurface *textSurface = mt.getSurface();
+
+ if (isButtonLabel) {
+ uint16 borderX = x + borderSize - 1, borderY = y + borderSize - 1, borderHeight = height, borderWidth = width;
+ if (borderSize != kSizeNone) {
+ while (borderSize) {
+ borderWidth += 2;
+ borderHeight += 2;
+ textSurface->frameRect(Common::Rect(borderX, borderY, borderX + borderWidth, borderY + borderHeight), 0);
+ borderSize--;
+ borderX--;
+ borderY--;
+ }
}
- }
- if (boxShadow > 0) {
- borderSize = (uint16)textCast->borderSize;
- uint baseOffsetX = x + boxShadow;
- uint baseOffsetY = y + height + (borderSize * 2);
- uint sideOffsetX = x + borderWidth;
- uint sideOffsetY = y + boxShadow;
- while (boxShadow) {
- surface.drawLine(baseOffsetX, baseOffsetY + (boxShadow - 1), baseOffsetX + borderWidth - 1, baseOffsetY + (boxShadow - 1), 0);
- surface.drawLine(sideOffsetX + (boxShadow - 1), sideOffsetY, sideOffsetX + (boxShadow - 1), sideOffsetY + borderHeight - 1, 0);
- boxShadow--;
+ if (boxShadow > 0) {
+ borderSize = (uint16)textCast->borderSize;
+ uint baseOffsetX = x + boxShadow;
+ uint baseOffsetY = y + height + (borderSize * 2);
+ uint sideOffsetX = x + borderWidth;
+ uint sideOffsetY = y + boxShadow;
+ while (boxShadow) {
+ textSurface->drawLine(baseOffsetX, baseOffsetY + (boxShadow - 1), baseOffsetX + borderWidth - 1, baseOffsetY + (boxShadow - 1), 0);
+ textSurface->drawLine(sideOffsetX + (boxShadow - 1), sideOffsetY, sideOffsetX + (boxShadow - 1), sideOffsetY + borderHeight - 1, 0);
+ boxShadow--;
+ }
}
}
+
+ if (textShadow > 0)
+ inkBasedBlit(surface, *textSurface, spriteId, Common::Rect(textX + textShadow, textY + textShadow, textX + textShadow + width, textY + textShadow + height));
+
+ inkBasedBlit(surface, *textSurface, spriteId, Common::Rect(textX, textY, textX + width, textY + height));
}
void Frame::drawBackgndTransSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect) {
diff --git a/engines/director/frame.h b/engines/director/frame.h
index f21e3a7..b41ee83 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -136,6 +136,7 @@ private:
void drawMatteSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect);
void drawGhostSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect);
void drawReverseSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect);
+ void inkBasedBlit(Graphics::ManagedSurface &targetSurface, const Graphics::Surface &spriteSurface, uint16 spriteId, Common::Rect drawRect);
void addDrawRect(uint16 entityId, Common::Rect &rect);
public:
diff --git a/graphics/font.cpp b/graphics/font.cpp
index 7768b73..4f53dfe 100644
--- a/graphics/font.cpp
+++ b/graphics/font.cpp
@@ -227,7 +227,7 @@ int wordWrapTextImpl(const Font &font, const StringType &str, int maxWidth, Comm
if (lineWidth > 0) {
wrapper.add(line, lineWidth);
}
- return wrapper.actualMaxLineWidth;
+ return MAX(wrapper.actualMaxLineWidth, maxWidth);
}
} // End of anonymous namespace
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index abf1e4f..4d671e8 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -24,7 +24,7 @@
namespace Graphics {
-MacText::MacText(Common::String s, Graphics::Font *font, int fgcolor, int bgcolor, int maxWidth) {
+MacText::MacText(Common::String s, const Graphics::Font *font, int fgcolor, int bgcolor, int maxWidth) {
_str = s;
_font = font;
_fgcolor = fgcolor;
@@ -53,6 +53,8 @@ void MacText::splitString(Common::String &str) {
while (*s) {
if (*s == '\n' && prevCR) { // trean \r\n as one
prevCR = false;
+
+ s++;
continue;
}
@@ -64,10 +66,12 @@ void MacText::splitString(Common::String &str) {
tmp.clear();
+ s++;
continue;
}
tmp += *s;
+ s++;
}
if (tmp.size())
@@ -77,7 +81,9 @@ void MacText::splitString(Common::String &str) {
void MacText::reallocSurface() {
int lineH = _font->getFontHeight() + _interLinear;
// round to closest 10
- int requiredH = (_text.size() + (_text.size() * 10 + 9) / 10) * lineH;
+ //TODO: work out why this rounding doesn't correctly fill the entire width
+ //int requiredH = (_text.size() + (_text.size() * 10 + 9) / 10) * lineH
+ int requiredH = _text.size() * lineH;
int surfW = _maxWidth == -1 ? _textMaxWidth : _maxWidth;
if (!_surface) {
@@ -117,7 +123,8 @@ void MacText::render(int from, int to) {
_surface->fillRect(Common::Rect(0, y, _surface->w, to * lineH), _bgcolor);
for (int i = from; i < to; i++) {
- _font->drawString(_surface, _text[i], 0, y, _textMaxWidth, _fgcolor);
+ //TODO: _textMaxWidth, when -1, was not rendering ANY text.
+ _font->drawString(_surface, _text[i], 0, y, _maxWidth, _fgcolor);
y += _font->getFontHeight() + _interLinear;
}
diff --git a/graphics/macgui/mactext.h b/graphics/macgui/mactext.h
index e035eb1..21c063f 100644
--- a/graphics/macgui/mactext.h
+++ b/graphics/macgui/mactext.h
@@ -30,7 +30,7 @@ namespace Graphics {
class MacText {
public:
- MacText(Common::String s, Graphics::Font *font, int fgcolor, int bgcolor, int maxWidth = -1);
+ MacText(Common::String s, const Graphics::Font *font, int fgcolor, int bgcolor, int maxWidth = -1);
void setInterLinear(int interLinear) { _interLinear = interLinear; }
@@ -38,16 +38,18 @@ public:
void appendText(Common::String str);
void replaceLastLine(Common::String str);
+ void render();
+ Graphics::ManagedSurface *getSurface() { return _surface; }
+
private:
void splitString(Common::String &s);
- void render();
void render(int from, int to);
void calcMaxWidth();
void reallocSurface();
private:
Common::String _str;
- Graphics::Font *_font;
+ const Graphics::Font *_font;
int _fgcolor, _bgcolor;
int _maxWidth;
More information about the Scummvm-git-logs
mailing list