Merge dynsprite_experiment into main

Author: Grisgram

gml-outline-shader-drawer.resource_order

@@ -14,6 +14,7 @@
     {"name":"CanvasIsCanvas","order":4,"path":"scripts/CanvasIsCanvas/CanvasIsCanvas.yy",},
     {"name":"sprite_to_canvas","order":5,"path":"scripts/sprite_to_canvas/sprite_to_canvas.yy",},
     {"name":"DemoPotion","order":6,"path":"objects/DemoPotion/DemoPotion.yy",},
+    {"name":"sprRedPotionAnim","order":9,"path":"sprites/sprRedPotionAnim/sprRedPotionAnim.yy",},
     {"name":"sprHellToHeaven","order":4,"path":"sprites/sprHellToHeaven/sprHellToHeaven.yy",},
     {"name":"__CanvasCleanupQueue","order":1,"path":"scripts/__CanvasCleanupQueue/__CanvasCleanupQueue.yy",},
     {"name":"__CanvasTrace","order":6,"path":"scripts/__CanvasTrace/__CanvasTrace.yy",},

gml-outline-shader-drawer.yyp

@@ -1,15 +1,23 @@
 /// @description bake on first draw
 event_inherited();
-canvas = undefined;
+canvas		= undefined;
+dynsprite	= undefined;
+origsprite	= sprite_index;
+
+__browser_flip = (os_browser != browser_not_a_browser) ? -1 : 1;
 
 __free = function() {
 	if (canvas != undefined)
 		canvas.free();
+		
+	if (dynsprite != undefined) 
+		sprite_delete(dynsprite);
 }
 
 /// @function bake()
 bake = function() {
-	if (canvas != undefined) canvas.free();
+	__free();
+	origsprite = sprite_index;
 	show_debug_message("Pre-Baking sprite '{0}' with {1} frames", sprite_get_name(sprite_index), image_number);
 	var begintime = current_time;
 	var shader				= shd_outline;
@@ -19,7 +27,7 @@ bake = function() {
 	var u_thickness			= shader_get_uniform(shader, "u_vThickness");
 	var u_vPulse			= shader_get_uniform(shader, "u_vPulse");
 
-	canvas = sprite_to_canvas(sprite_index, -1, outline_strength + TEXTURE_PAGE_BORDER_SIZE);
+	canvas = sprite_to_canvas(sprite_index, -1, outliner.outline_strength + TEXTURE_PAGE_BORDER_SIZE);
 	// now bake it with the outliner
 	var target = new Canvas(canvas.canvas.GetWidth(), canvas.canvas.GetHeight(), true);
 	target.Start();
@@ -42,16 +50,26 @@ bake = function() {
 	canvas.canvas.Free();
 	// ...and inject the pre-baked
 	canvas.canvas = target;
+	
+	dynsprite = canvas.create_sprite();
+	sprite_set_bbox_mode(dynsprite, bboxmode_manual); 
+	sprite_set_bbox(dynsprite,
+		sprite_get_bbox_left  (sprite_index) + __browser_flip * (2 * outliner.outline_strength + TEXTURE_PAGE_BORDER_SIZE / 2),
+		sprite_get_bbox_top   (sprite_index) + __browser_flip * (2 * outliner.outline_strength + TEXTURE_PAGE_BORDER_SIZE / 2),
+		sprite_get_bbox_right (sprite_index) + __browser_flip * (2 * outliner.outline_strength + TEXTURE_PAGE_BORDER_SIZE / 2),
+		sprite_get_bbox_bottom(sprite_index) + __browser_flip * (2 * outliner.outline_strength + TEXTURE_PAGE_BORDER_SIZE / 2));
+	
 	show_debug_message("Pre-Baking took {0}ms", current_time - begintime);
 }
 
 __draw = function() {
 	if (canvas == undefined) bake();
+	var before = sprite_index;
+	sprite_index = (outline_always || (outline_on_mouse_over && mouse_is_over)) ? dynsprite : origsprite;
+	if (sprite_index != before && (os_browser != browser_not_a_browser)) image_yscale *= __browser_flip;
 	image_index = canvas.get_image_index(delta_time, image_speed);
-	if (outline_always || (outline_on_mouse_over && mouse_is_over))
-		canvas.draw_frame_ext(image_index, x, y, depth,	image_xscale, image_yscale, image_angle, image_blend, image_alpha);
-	else
-		draw_self();
+
+	draw_self();
 }
 
 if (sprite_index != -1) bake();

objects/DemoPotion/DemoPotion.yy

@@ -71,13 +71,14 @@ function CanvasSprite(_canvas, _image_count, _fps, _xoffset, _yoffset, _bordersi
 		__matrix = matrix_build(xp, yp, draw_depth, 0, 0, rot * __browser_flip, xscale, yscale * __browser_flip, 1);
 		matrix_set(matrix_world, __matrix);
 		//_left, _top, _width, _height, _x, _y, _xscale, _yscale, _rot, _col1, _col2, _col3, _col4, _alpha
-		canvas.DrawGeneral(subimages[@ frame], 0, image_width, image_height, 
+		canvas.DrawGeneral(subimages[@ frame], 0, 
+			image_width, image_height, 
 			-xoffset - bordersize, -yoffset - bordersize + __render_y,
 			1, 1, 0, col, col, col, col, alpha);
 		matrix_set(matrix_world, matrix_build_identity());
 	}
 
-	/// @function		get_image_index = function(_elapsed, _image_speed)
+	/// @function		get_image_index(_elapsed, _image_speed)
 	/// @description	Should be called every STEP to ensure continuous correct animation
 	///					when you draw this sprite manually.
 	///					Example (STEP event): 
@@ -94,7 +95,16 @@ function CanvasSprite(_canvas, _image_count, _fps, _xoffset, _yoffset, _bordersi
 
 		return sub_idx;
 	}
-		
+	
+	/// @function		create_sprite()
+	/// @description	Creates a dynamic sprite out of the frames of this canvas surface
+	static create_sprite = function() {
+		var rv = sprite_create_from_surface(canvas.GetSurfaceID(),0,0,image_width,image_height,false,false,xoffset+bordersize,yoffset+bordersize);
+		for (var i = 1, len = array_length(subimages); i < len; i++) 
+			sprite_add_from_surface(rv,canvas.GetSurfaceID(),subimages[@i],0,image_width,image_height,false,false);
+		return rv;
+	}
+	
 	/// @function		free()
 	/// @description	Release the underlying canvas
 	static free = function() {