X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fgfx.cc;h=45c918befc4602d9300e797b76777ebbf4b5aed8;hb=d114b136897ca569d819da5f9b75bd08f9cbe2c0;hp=226d26954369b37c945bfe69dd6494bcb0b4a1d2;hpb=094e53b80e5576db6c86bb7dc6141b0cff7fa665;p=winnie

diff --git a/src/gfx.cc b/src/gfx.cc
index 226d269..45c918b 100644
--- a/src/gfx.cc
+++ b/src/gfx.cc
@@ -92,6 +92,14 @@ void clear_screen(int r, int g, int b)
 
 void fill_rect(const Rect &rect, int r, int g, int b)
 {
+	if(rect.x < 0) {
+		rect.x = 0;
+	}
+
+	if(rect.y < 0) {
+		rect.y = 0;
+	}
+
 	unsigned char *fb = framebuffer + (rect.x + screen_rect.width * rect.y) * 4;
 	for(int i=0; i<rect.height; i++) {
 		for(int j=0; j<rect.width; j++) {
@@ -113,17 +121,97 @@ void set_cursor_visibility(bool visible)
 	}
 }
 
-void blit(unsigned char *src_img, const Rect &src_rect, unsigned char* dest_img, int dest_x, int dest_y)
+void blit(unsigned char *src_img, const Rect &src_rect, unsigned char* dest_img,
+		const Rect &dest_rect, int dest_x, int dest_y)
 {
-	Rect dest_rect;
+	int width = src_rect.width;
+	int height = src_rect.height;
+
+	int xoffs = dest_x - dest_rect.x;
+	if(xoffs < 0) {
+		dest_x = dest_rect.x;
+		width += xoffs;
+	}
+
+	int yoffs = dest_y - dest_rect.y;
+	if(yoffs < 0) {
+		dest_y = dest_rect.y;
+		height += yoffs;
+	}
 
-	if(dest_x < screen_rect.x) {
-		dest_rect.x = screen_rect.x;
+	int xend = dest_x + width;
+	if(xend >= dest_rect.width) {
+		width -= xend - dest_rect.width;
 	}
 
-	if(dest_y < screen_rect.y) {
-		dest_rect.y = screen_rect.y;
+	int yend = dest_y + height;
+	if(yend >= dest_rect.height) {
+		height -= yend - dest_rect.height;
 	}
 
-	//TODO :p zzz
+	if(width <= 0 || height <= 0) {
+		return;
+	}
+
+	unsigned char *sptr = src_img + (src_rect.y * src_rect.width + src_rect.x) * 4;
+	unsigned char *dptr = dest_img + (dest_y * dest_rect.width + dest_x) * 4;
+
+	for(int i=0; i<height; i++) {
+		memcpy(dptr, sptr, width * 4);
+		sptr += src_rect.width * 4;
+		dptr += dest_rect.width * 4;
+	}
+}
+
+void blit_key(unsigned char *src_img, const Rect &src_rect, unsigned char* dest_img,
+		const Rect &dest_rect, int dest_x, int dest_y, int key_r, int key_g, int key_b)
+{
+	int width = src_rect.width;
+	int height = src_rect.height;
+
+	int xoffs = dest_x - dest_rect.x;
+	if(xoffs < 0) {
+		dest_x = dest_rect.x;
+		width += xoffs;
+	}
+
+	int yoffs = dest_y - dest_rect.y;
+	if(yoffs < 0) {
+		dest_y = dest_rect.y;
+		height += yoffs;
+	}
+
+	int xend = dest_x + width;
+	if(xend >= dest_rect.width) {
+		width -= xend - dest_rect.width;
+	}
+
+	int yend = dest_y + height;
+	if(yend >= dest_rect.height) {
+		height -= yend - dest_rect.height;
+	}
+
+	if(width <= 0 || height <= 0) {
+		return;
+	}
+
+	unsigned char *sptr = src_img + (src_rect.y * src_rect.width + src_rect.x) * 4;
+	unsigned char *dptr = dest_img + (dest_y * dest_rect.width + dest_x) * 4;
+
+	for(int i=0; i<height; i++) {
+		for(int j=0; j<width; j++) {
+			int r = sptr[j * 4];
+			int g = sptr[j * 4 + 1];
+			int b = sptr[j * 4 + 2];
+
+			if(r != key_r || g != key_g || b != key_b) {
+				dptr[j * 4] = r;
+				dptr[j * 4 + 1] = g;
+				dptr[j * 4 + 2] = b;
+			}
+		}
+
+		sptr += src_rect.width * 4;
+		dptr += dest_rect.width * 4;
+	}
 }