[Scummvm-cvs-logs] SF.net SVN: scummvm:[35951] scummvm/trunk/graphics
dhewg at users.sourceforge.net
dhewg at users.sourceforge.net
Tue Jan 20 16:21:47 CET 2009
Revision: 35951
http://scummvm.svn.sourceforge.net/scummvm/?rev=35951&view=rev
Author: dhewg
Date: 2009-01-20 15:21:47 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
merge SurfaceKeyColored into Surface
Modified Paths:
--------------
scummvm/trunk/graphics/surface.cpp
scummvm/trunk/graphics/surface.h
Removed Paths:
-------------
scummvm/trunk/graphics/surface-keycolored.cpp
scummvm/trunk/graphics/surface-keycolored.h
Deleted: scummvm/trunk/graphics/surface-keycolored.cpp
===================================================================
--- scummvm/trunk/graphics/surface-keycolored.cpp 2009-01-20 12:47:39 UTC (rev 35950)
+++ scummvm/trunk/graphics/surface-keycolored.cpp 2009-01-20 15:21:47 UTC (rev 35951)
@@ -1,67 +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.
- *
- * $URL$
- * $Id$
- */
-#include "graphics/surface-keycolored.h"
-
-namespace Graphics {
-
-void SurfaceKeyColored::blit(Surface *surf_src, int16 x, int16 y, OverlayColor transparent) {
-
- if (bytesPerPixel != sizeof(OverlayColor) || surf_src->bytesPerPixel != sizeof(OverlayColor)) return ;
-
- const OverlayColor *src = (const OverlayColor*)surf_src->pixels;
- int blitW = surf_src->w;
- int blitH = surf_src->h;
-
- // clip co-ordinates
- if (x < 0) {
- blitW += x;
- src -= x;
- x = 0;
- }
- if (y < 0) {
- blitH += y;
- src -= y * surf_src->w;
- y = 0;
- }
- if (blitW > w - x) blitW = w - x;
- if (blitH > h - y) blitH = h - y;
- if (blitW <= 0 || blitH <= 0)
- return;
-
- OverlayColor *dst = (OverlayColor*) getBasePtr(x, y);
- int dstAdd = w - blitW;
- int srcAdd = surf_src->w - blitW;
-
- for (int i = 0; i < blitH; ++i) {
- for (int j = 0; j < blitW; ++j, ++dst, ++src) {
- OverlayColor col = *src;
- if (col != transparent)
- *dst = col;
- }
- dst += dstAdd;
- src += srcAdd;
- }
-}
-
-} // end of namespace Graphics
Deleted: scummvm/trunk/graphics/surface-keycolored.h
===================================================================
--- scummvm/trunk/graphics/surface-keycolored.h 2009-01-20 12:47:39 UTC (rev 35950)
+++ scummvm/trunk/graphics/surface-keycolored.h 2009-01-20 15:21:47 UTC (rev 35951)
@@ -1,40 +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.
- *
- * $URL$
- * $Id$
- */
-
-#ifndef GRAPHICS_SURFACE_KEYCOLORED_H
-#define GRAPHICS_SURFACE_KEYCOLORED_H
-
-#include "graphics/surface.h"
-
-namespace Graphics {
-
-struct SurfaceKeyColored : Surface {
-
- void blit(Surface *surf_src, int16 x, int16 y, OverlayColor transparent);
-};
-
-
-} // end of namespace Graphics
-
-#endif
Modified: scummvm/trunk/graphics/surface.cpp
===================================================================
--- scummvm/trunk/graphics/surface.cpp 2009-01-20 12:47:39 UTC (rev 35950)
+++ scummvm/trunk/graphics/surface.cpp 2009-01-20 15:21:47 UTC (rev 35951)
@@ -225,4 +225,42 @@
}
}
+void Surface::blit(Surface *surf_src, int16 x, int16 y, OverlayColor transparent) {
+ if (bytesPerPixel != sizeof(OverlayColor) || surf_src->bytesPerPixel != sizeof(OverlayColor)) return ;
+
+ const OverlayColor *src = (const OverlayColor*)surf_src->pixels;
+ int blitW = surf_src->w;
+ int blitH = surf_src->h;
+
+ // clip co-ordinates
+ if (x < 0) {
+ blitW += x;
+ src -= x;
+ x = 0;
+ }
+ if (y < 0) {
+ blitH += y;
+ src -= y * surf_src->w;
+ y = 0;
+ }
+ if (blitW > w - x) blitW = w - x;
+ if (blitH > h - y) blitH = h - y;
+ if (blitW <= 0 || blitH <= 0)
+ return;
+
+ OverlayColor *dst = (OverlayColor*) getBasePtr(x, y);
+ int dstAdd = w - blitW;
+ int srcAdd = surf_src->w - blitW;
+
+ for (int i = 0; i < blitH; ++i) {
+ for (int j = 0; j < blitW; ++j, ++dst, ++src) {
+ OverlayColor col = *src;
+ if (col != transparent)
+ *dst = col;
+ }
+ dst += dstAdd;
+ src += srcAdd;
+ }
+}
+
} // End of namespace Graphics
Modified: scummvm/trunk/graphics/surface.h
===================================================================
--- scummvm/trunk/graphics/surface.h 2009-01-20 12:47:39 UTC (rev 35950)
+++ scummvm/trunk/graphics/surface.h 2009-01-20 15:21:47 UTC (rev 35951)
@@ -78,6 +78,8 @@
void frameRect(const Common::Rect &r, uint32 color);
// See comment in graphics/surface.cpp about it
void move(int dx, int dy, int height);
+
+ void blit(Surface *surf_src, int16 x, int16 y, OverlayColor transparent);
};
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list