Fixed a few bugs and added in .CopySurface

README.md

@@ -1,4 +1,4 @@
-# Canvas v1.1.2
+# Canvas v1.1.3
 A surface that you can modify & keep the contents, even when the surface should've had been lost, for GameMaker Studio 2.3+!
 
 Join my Discord for any questions! https://discord.gg/ThW5exp6r4

objects/obj_test/Draw_0.gml

@@ -1,5 +1,4 @@
 draw_surface(surf.GetSurfaceID(), 0, 0);
-
 var _string = @"Cache Canvas: Space
 Update Surface: Control
 Resize Surface: W

objects/obj_test_manual_write/Create_0.gml

@@ -0,0 +1,8 @@
+show_debug_overlay(true);
+background = layer_background_get_id("Background");
+surf = new Canvas(512, 512).WriteToCache(false);
+surf.Start();
+draw_rectangle_colour(32, 32,surf.GetWidth(),surf.GetHeight(), c_red, c_green, c_blue, c_yellow, false);
+surf.Finish();
+__prevStatus = 0;
+myBuffer = -1;

objects/obj_test_manual_write/Draw_0.gml

@@ -0,0 +1,9 @@
+draw_surface(surf.GetSurfaceID(), 0, 0);
+var _string = @"Cache Canvas: Space
+Update Surface: Control
+Resize Surface: W
+Get Surface Cache Contents: E (Space for Cached)
+Set Surface Cache Contents: Q
+Copy Application Surface: V"
+
+draw_text(8,8, _string);

objects/obj_test_manual_write/Draw_64.gml

@@ -0,0 +1 @@
+draw_text(8,8, "Canvas Status: " + string(__prevStatus));

objects/obj_test_manual_write/Step_0.gml

@@ -0,0 +1,39 @@
+if (keyboard_check_released(vk_space)) {
+	surf.Cache();	
+}
+
+if (keyboard_check(vk_control)) {
+	surf.Start();
+	var _offset = (current_time / 1000);
+	draw_rectangle_colour(32,32,412,412, make_colour_hsv(_offset  mod 256, 255, 255), make_colour_hsv(_offset * 20  mod 256, 255, 255), make_colour_hsv(_offset * 30  mod 256, 255, 255), make_colour_hsv(_offset * 40  mod 256, 255, 255), false);
+}
+
+if (keyboard_check_released(ord("E"))) {
+	if (keyboard_check(vk_space)) {
+		surf.Cache();	
+	}
+	if (buffer_exists(myBuffer)) {
+		buffer_delete(myBuffer);
+	}
+	myBuffer = surf.GetBufferContents();
+}
+
+if (keyboard_check_released(ord("W"))) {
+	surf.Resize(1024, 1024);	
+	surf.Start();
+	draw_rectangle_colour(32,32,surf.GetWidth(),surf.GetHeight(), c_red, c_green, c_blue, c_yellow, false);
+	surf.Finish();
+}
+
+if (keyboard_check_released(ord("Q"))) {
+	surf.SetBufferContents(myBuffer);
+}
+
+if (keyboard_check_released(ord("V"))) {
+	surf.CopySurface(application_surface, 0, 0, true);	
+}
+
+__prevStatus = surf.GetStatus();
+if (surf.GetStatus() == CanvasStatus.IN_USE) {
+	surf.Finish();	
+}

objects/obj_test_manual_write/Step_2.gml

@@ -0,0 +1 @@
+layer_background_blend(background, make_color_hsv(current_time / 100, 255, 255));

scripts/Canvas/Canvas.gml

@@ -1,5 +1,5 @@
 #macro __CANVAS_CREDITS "@TabularElf - https://tabelf.link/"
-#macro __CANVAS_VERSION "1.1.2"
+#macro __CANVAS_VERSION "1.1.3"
 show_debug_message("Canvas " + __CANVAS_VERSION + " initalized! Created by " + __CANVAS_CREDITS);
 
 #macro __CANVAS_HEADER_SIZE 5
@@ -42,13 +42,14 @@ function Canvas(_width, _height) constructor {
 
 		static Finish = function() {
 			surface_reset_target();
-			if !(buffer_exists(__buffer)) {
-				__init();
-			}
+			__init();
 
 			if (__writeToCache) {
 				__UpdateCache();
 			}
+
+			__status = CanvasStatus.HAS_DATA;	
+
 			return self;
 		}
 
@@ -63,6 +64,28 @@ function Canvas(_width, _height) constructor {
 			}
 		}
 
+		static CopySurface = function(_surfID, _x, _y, _updateCache = __writeToCache) {
+			if (!surface_exists(_surfID)) {
+				show_error("Canvas: Surface " + string(_surfID) + " doesn't exist!", true);	
+			}
+
+			var _width = surface_get_width(_surfID);
+			var _height = surface_get_height(_surfID);
+
+			if (__width != _width) || (__height != _height) {
+				Resize(_width, _height);	
+			}
+
+			__init();
+			CheckSurface();
+
+			surface_copy(__surface, _x, _y, _surfID);
+			if (_updateCache) {
+				__UpdateCache();
+			}
+			return self;
+		}
+
 		static Free = function() {
 			if (buffer_exists(__buffer)) {
 				buffer_delete(__buffer);	
@@ -97,7 +120,10 @@ function Canvas(_width, _height) constructor {
 			}
 		}
 
-		static Resize = function(_width, _height) {
+		static Resize = function(_width, _height, _keepData = false) {
+
+			if (__width == _width) && (__height == _height) return self;
+
 			if (buffer_exists(__buffer)) {
 				buffer_delete(__buffer);
 			}
@@ -112,6 +138,7 @@ function Canvas(_width, _height) constructor {
 
 			__width = _width;
 			__height = _height;
+
 			__status = CanvasStatus.NO_DATA;
 
 			return self;
@@ -265,6 +292,7 @@ function Canvas(_width, _height) constructor {
 					__UpdateCache();
 				break;
 				case CanvasStatus.NO_DATA:
+					__init();
 				case CanvasStatus.HAS_DATA:
 					__UpdateCache();
 				break;