1 files changed, 60 insertions, 1 deletions

diff --git a/scene/resources/bit_map.cpp b/scene/resources/bit_map.cpp
index d2e4d28b44..a9d85be0dc 100644
--- a/scene/resources/bit_map.cpp
+++ b/scene/resources/bit_map.cpp
@@ -96,7 +96,7 @@ int BitMap::get_true_bit_count() const {
 	const uint8_t *d = bitmask.ptr();
 	int c = 0;
 
-	//fast, almot branchless version
+	//fast, almost branchless version
 
 	for (int i = 0; i < ds; i++) {
 
@@ -106,6 +106,7 @@ int BitMap::get_true_bit_count() const {
 		c += (d[i] & (1 << 4)) >> 4;
 		c += (d[i] & (1 << 3)) >> 3;
 		c += (d[i] & (1 << 2)) >> 2;
+		c += (d[i] & (1 << 1)) >> 1;
 		c += d[i] & 1;
 	}
 
@@ -594,6 +595,64 @@ Array BitMap::_opaque_to_polygons_bind(const Rect2 &p_rect, float p_epsilon) con
 	return result_array;
 }
 
+void BitMap::resize(const Size2& p_new_size) {
+
+	Ref<BitMap> new_bitmap;
+	new_bitmap.instance();
+	new_bitmap->create(p_new_size);
+	int lw = MIN(width,p_new_size.width);
+	int lh = MIN(height,p_new_size.height);
+	for(int x=0;x<lw;x++) {
+		for(int y=0;y<lh;y++) {
+			new_bitmap->set_bit(Vector2(x,y),get_bit(Vector2(x,y)));
+		}
+	}
+
+	width = new_bitmap->width;
+	height = new_bitmap->height;
+	bitmask = new_bitmap->bitmask;
+}
+
+Ref<Image> BitMap::convert_to_image() const {
+
+	Ref<Image> image;
+	image.instance();
+	image->create(width,height,false,Image::FORMAT_L8);
+	image->lock();
+	for(int i=0;i<width;i++) {
+		for(int j=0;j<height;j++) {
+			image->set_pixel( i,j,get_bit(Point2(i,j)) ? Color(1,1,1) : Color(0,0,0));
+		}
+	}
+
+	image->unlock();
+
+	return image;
+}
+void BitMap::blit(const Vector2& p_pos,const Ref<BitMap>& p_bitmap) {
+
+	int x = p_pos.x;
+	int y = p_pos.y;
+	int w = p_bitmap->get_size().width;
+	int h = p_bitmap->get_size().height;
+
+	for(int i=0;i<w;i++) {
+		for (int j=0;j<h;j++) {
+			int px = x+i;
+			int py = y+j;
+			if (px<0 || px>=width)
+				continue;
+			if (py<0 || py>=height)
+				continue;
+			if (p_bitmap->get_bit(Vector2(i,j))) {
+				set_bit(Vector2(x,y),true);
+			}
+		}
+	}
+
+}
+
+
 void BitMap::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("create", "size"), &BitMap::create);