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

* Added Sprite::getPixel() (takes into account whether a sprite is mirrored or scaled)

Browse Source 
* Made the Text class internally store a Common::String instead of a byte *

svn-id: r42835
This commit is contained in:
Denis Kasak 2009-07-27 04:14:59 +00:00
parent ddf8f1cbb5
commit fa59e4b16b
2 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
engines/draci/sprite.cpp
View File

@ -126,6 +126,28 @@ void Sprite::setMirrorOff() {
_mirror = false;
}
int Sprite::getPixel(int x, int y) const {
Common::Rect rect = getRect();
int dy = y - rect.top;
int dx = x - rect.left;
// Calculate scaling factors
double scaleX = double(_scaledWidth) / _width;
double scaleY = double(_scaledHeight) / _height;
int sy = lround(dy * scaleY);
int sx = lround(dx * scaleX);
if (_mirror)
return _data[sy * _width + (_width - sx)];
else
return _data[sy * _width + sx];
}
void Sprite::drawScaled(Surface *surface, bool markDirty) const {
Common::Rect sourceRect(0, 0, _width, _height);
@ -269,6 +291,7 @@ void Sprite::draw(Surface *surface, bool markDirty) const {
surface->markDirtyRect(destRect);
}
}
Common::Rect Sprite::getRect(bool scaled) const {
if (scaled)
@ -279,15 +302,11 @@ Common::Rect Sprite::getRect(bool scaled) const {
Text::Text(const Common::String &str, Font *font, byte fontColour,
int x, int y, uint spacing) {
uint len = str.size();
_length = len;
_x = x;
_y = y;
_delay = 0;
_text = new byte[len];
memcpy(_text, str.c_str(), len);
_text = str;
_spacing = spacing;
_colour = fontColour;
@ -295,27 +314,17 @@ Text::Text(const Common::String &str, Font *font, byte fontColour,
_font = font;
_width = _font->getStringWidth(str, _spacing);
_height = _font->getFontHeight();
_height = _font->getStringHeight(str);
_scaledWidth = _width;
_scaledHeight = _height;
}
Text::~Text() {
delete[] _text;
}
void Text::setText(const Common::String &str) {
delete[] _text;
uint len = str.size();
_length = len;
_width = _font->getStringWidth(str, _spacing);
_height = _font->getFontHeight();
_height = _font->getStringHeight(str);
_text = new byte[len];
memcpy(_text, str.c_str(), len);
_text = str;
}
void Text::setColour(byte fontColour) {
@ -328,7 +337,8 @@ void Text::setSpacing(uint spacing) {
void Text::draw(Surface *surface, bool markDirty) const {
_font->setColour(_colour);
_font->drawString(surface, _text, _length, _x, _y, _spacing);
_font->drawString(surface, _text, _x, _y, _spacing);
}
// TODO: Handle scaled parameter properly by implementing Text scaling

13
engines/draci/sprite.h
View File

@ -31,6 +31,8 @@
namespace Draci {
enum DrawableType { kDrawableText, kDrawableSprite };
class Drawable {
public:
@ -60,6 +62,8 @@ public:
int getDelay() const { return _delay; }
virtual Common::Rect getRect(bool scaled = true) const = 0;
virtual DrawableType getType() const = 0;
protected:
uint _width; //!< Width of the sprite
@ -105,6 +109,9 @@ public:
Common::Rect getRect(bool scaled = true) const;
const byte *getBuffer() const { return _data; }
int getPixel(int x, int y) const;
DrawableType getType() const { return kDrawableSprite; }
private:
byte *_data; //!< Pointer to a buffer containing raw sprite data (row-wise)
@ -116,7 +123,7 @@ class Text : public Drawable {
public:
Text(const Common::String &str, Font *font, byte fontColour,
int x, int y, uint spacing = 0);
~Text();
~Text() {};
void setText(const Common::String &str);
void setColour(byte fontColour);
@ -130,8 +137,10 @@ public:
void drawScaled(Surface *surface, bool markDirty = true) const { draw(surface, markDirty); }
Common::Rect getRect(bool) const;
DrawableType getType() const { return kDrawableText; }
private:
byte *_text;
Common::String _text;
uint _length;
uint8 _colour;
uint _spacing;