thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASYLUM: Properly clip coordinates and adjust drawing width/height

Browse source 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@618 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
This commit is contained in:
Julien Templier 2010-12-02 02:34:00 +00:00 • committed by Eugene Sandulenko
parent e75170cc14
commit fde7a99ece
No known key found for this signature in database
GPG key ID: 014D387312D34F08
1 changed files with 38 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

55
engines/asylum/system/screen.cpp
View file

@ -43,7 +43,7 @@ Screen::Screen(AsylumEngine *vm) : _vm(vm) ,
_backBuffer.create(640, 480, 1); _backBuffer.create(640, 480, 1);
_flag = 0xFF; _flag = 0xFF;
//_clipRect = Common::Rect(0, 0, 639, 479); _clipRect = Common::Rect(0, 0, 639, 479);
} }
Screen::~Screen() { Screen::~Screen() {
@ -100,7 +100,7 @@ void Screen::draw(ResourceId resourceId, uint32 frameIndex, int32 sourceX, int32
source.right = frame->getWidth(); source.right = frame->getWidth();
source.bottom = frame->getHeight(); source.bottom = frame->getHeight();
//clip(&source, &destination, flags); clip(&source, &destination, flags);
bool masked = false; bool masked = false;
if (resourceIdDestination) { if (resourceIdDestination) {
@ -160,20 +160,20 @@ void Screen::clip(Common::Rect *source, Common::Rect *destination, int32 flags)
source->left += diffLeft; source->left += diffLeft;
} }
int32 diffRightTop = destination->right - _clipRect.top - 1; int32 diffRight = destination->right - _clipRect.right - 1;
if (diffRightTop > 0) { if (diffRight > 0) {
destination->right -= diffRightTop; destination->right -= diffRight;
if (flags & 2) if (flags & 2)
source->left += diffRightTop; source->left += diffRight;
else else
source->right -= diffRightTop; source->right -= diffRight;
} }
int32 diffRightTop2 = _clipRect.right - destination->top; int32 diffTop = _clipRect.top - destination->top;
if (diffRightTop2 > 0) { if (diffTop > 0) {
destination->top = _clipRect.right; destination->top = _clipRect.top;
source->top += diffRightTop2; source->top += diffTop;
} }
int32 diffBottom = destination->bottom - _clipRect.bottom - 1; int32 diffBottom = destination->bottom - _clipRect.bottom - 1;
@ -281,7 +281,7 @@ void Screen::selectTransTable(uint32 index) {
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// Graphic queue // Graphic queue
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
void Screen::addGraphicToQueue(ResourceId resourceId, uint32 frameIndex, Common::Point point, int32 flags, int32 destX, int32 priority) { void Screen::addGraphicToQueue(ResourceId resourceId, uint32 frameIndex, Common::Point point, int32 flags, int32 transTableNum, int32 priority) {
GraphicQueueItem item; GraphicQueueItem item;
item.priority = priority; item.priority = priority;
@ -290,7 +290,7 @@ void Screen::addGraphicToQueue(ResourceId resourceId, uint32 frameIndex, Common:
item.resourceId = resourceId; item.resourceId = resourceId;
item.frameIndex = frameIndex; item.frameIndex = frameIndex;
item.flags = flags; item.flags = flags;
item.destination.x = destX; item.transTableNum = transTableNum;
_queueItems.push_back(item); _queueItems.push_back(item);
} }
@ -386,18 +386,39 @@ void Screen::blit(GraphicFrame *frame, Common::Rect *source, Common::Rect *desti
} }
void Screen::blt(Common::Rect *dest, GraphicFrame* frame, Common::Rect *source, int32 flags, bool useColorKey) { void Screen::blt(Common::Rect *dest, GraphicFrame* frame, Common::Rect *source, int32 flags, bool useColorKey) {
// TODO adjust destination rect
if (useColorKey) { if (useColorKey) {
copyToBackBufferWithTransparency((byte *)frame->surface.pixels, frame->surface.pitch, dest->left, dest->top, frame->surface.w, frame->surface.h); copyToBackBufferWithTransparency((byte *)frame->surface.pixels - (source->top * frame->surface.w + source->left),
frame->surface.w,
dest->left,
dest->top,
source->width(),
source->height());
} else { } else {
copyToBackBuffer((byte *)frame->surface.pixels, frame->surface.pitch, dest->left, dest->top, frame->surface.w, frame->surface.h); copyToBackBuffer((byte *)frame->surface.pixels - (source->top * frame->surface.w + source->left),
frame->surface.w,
dest->left,
dest->top,
source->width(),
source->height());
} }
} }
void Screen::bltFast(int32 dX, int32 dY, GraphicFrame* frame, Common::Rect *source, bool useColorKey) { void Screen::bltFast(int32 dX, int32 dY, GraphicFrame* frame, Common::Rect *source, bool useColorKey) {
if (useColorKey) { if (useColorKey) {
copyToBackBufferWithTransparency((byte *)frame->surface.pixels, frame->surface.pitch, dX, dY, frame->surface.w, frame->surface.h); copyToBackBufferWithTransparency((byte *)frame->surface.pixels - (source->top * frame->surface.w + source->left),
frame->surface.w,
dX,
dY,
source->width(),
source->height());
} else { } else {
copyToBackBuffer((byte *)frame->surface.pixels, frame->surface.pitch, dX, dY, frame->surface.w, frame->surface.h); copyToBackBuffer((byte *)frame->surface.pixels - (source->top * frame->surface.w + source->left),
frame->surface.w,
dX,
dY,
source->width(),
source->height());
} }
} }