Release 2.0 - PreBaking

Author: Grisgram

gml-outline-shader-drawer.resource_order

@@ -1,18 +1,34 @@
 {
-  "FolderOrderSettings": [],
+  "FolderOrderSettings": [
+    {"name":"outline-shader-drawer","order":4,"path":"folders/outline-shader-drawer.yy",},
+    {"name":"_third_party_packages_","order":3,"path":"folders/_third_party_packages_.yy",},
+    {"name":"Canvas","order":1,"path":"folders/_third_party_packages_/Canvas.yy",},
+    {"name":"System","order":1,"path":"folders/_third_party_packages_/Canvas/System.yy",},
+  ],
   "ResourceOrderSettings": [
+    {"name":"__CanvasSurfFormat","order":4,"path":"scripts/__CanvasSurfFormat/__CanvasSurfFormat.yy",},
     {"name":"DemoMace","order":1,"path":"objects/DemoMace/DemoMace.yy",},
+    {"name":"CanvasIsCanvas","order":4,"path":"scripts/CanvasIsCanvas/CanvasIsCanvas.yy",},
+    {"name":"__CanvasTrace","order":6,"path":"scripts/__CanvasTrace/__CanvasTrace.yy",},
+    {"name":"OutlineObject","order":2,"path":"objects/OutlineObject/OutlineObject.yy",},
     {"name":"seqRotatingLoop","order":2,"path":"sequences/seqRotatingLoop/seqRotatingLoop.yy",},
     {"name":"OutlineLogo","order":8,"path":"objects/OutlineLogo/OutlineLogo.yy",},
-    {"name":"OutlineObject","order":2,"path":"objects/OutlineObject/OutlineObject.yy",},
+    {"name":"sprite_to_canvas","order":5,"path":"scripts/sprite_to_canvas/sprite_to_canvas.yy",},
+    {"name":"Canvas","order":2,"path":"scripts/Canvas/Canvas.yy",},
+    {"name":"__CanvasSystem","order":5,"path":"scripts/__CanvasSystem/__CanvasSystem.yy",},
+    {"name":"__CanvasCleanupQueue","order":1,"path":"scripts/__CanvasCleanupQueue/__CanvasCleanupQueue.yy",},
     {"name":"DemoPotion","order":6,"path":"objects/DemoPotion/DemoPotion.yy",},
-    {"name":"_OUTLINE_SHADER_DRAWER_VERSION_","order":3,"path":"scripts/_OUTLINE_SHADER_DRAWER_VERSION_/_OUTLINE_SHADER_DRAWER_VERSION_.yy",},
     {"name":"sprHellToHeaven","order":4,"path":"sprites/sprHellToHeaven/sprHellToHeaven.yy",},
+    {"name":"__CanvasGC","order":3,"path":"scripts/__CanvasGC/__CanvasGC.yy",},
+    {"name":"CanvasGetAppSurf","order":3,"path":"scripts/CanvasGetAppSurf/CanvasGetAppSurf.yy",},
     {"name":"RotatingCoin","order":1,"path":"objects/RotatingCoin/RotatingCoin.yy",},
     {"name":"DemoTextDrawer","order":3,"path":"objects/DemoTextDrawer/DemoTextDrawer.yy",},
     {"name":"sprMace","order":3,"path":"sprites/sprMace/sprMace.yy",},
     {"name":"sprRedPotion","order":4,"path":"sprites/sprRedPotion/sprRedPotion.yy",},
     {"name":"sprOutlineTitle","order":7,"path":"sprites/sprOutlineTitle/sprOutlineTitle.yy",},
-    {"name":"shd_outline","order":1,"path":"shaders/shd_outline/shd_outline.yy",},
+    {"name":"__CanvasError","order":2,"path":"scripts/__CanvasError/__CanvasError.yy",},
+    {"name":"shd_outline","order":4,"path":"shaders/shd_outline/shd_outline.yy",},
+    {"name":"OutlineObjectBaked","order":3,"path":"objects/OutlineObjectBaked/OutlineObjectBaked.yy",},
+    {"name":"outline_drawer","order":1,"path":"scripts/outline_drawer/outline_drawer.yy",},
   ],
 }

gml-outline-shader-drawer.yyp

@@ -6,7 +6,15 @@ outliner = new outline_drawer(
 	outline_color, 
 	outline_alpha, 
 	outline_strength, 
-	outline_alpha_fading
+	outline_alpha_fading,
+	use_bbox_of_sprite
 );
 
 mouse_is_over = false;
+
+__draw = function() {
+	if (outline_always || (outline_on_mouse_over && mouse_is_over))
+		outliner.draw_object_outline();
+	else
+		draw_self();
+}

objects/OutlineObject/Create_0.gml

@@ -1,8 +1,3 @@
 /// @description draw outline if mouse is over
-if (sprite_index == -1) exit;
-
-if (outline_on_mouse_over && mouse_is_over)
-	outliner.draw_object_outline();
-else
-	draw_self();
-	
+if (sprite_index == -1 || draw_on_gui) exit;
+__draw();

objects/OutlineObject/Draw_0.gml

@@ -0,0 +1,3 @@
+/// @description draw outline if mouse is over
+if (sprite_index == -1 || !draw_on_gui) exit;
+__draw();

objects/OutlineObject/Draw_64.gml

@@ -0,0 +1,2 @@
+/// @description release canvas
+__free();

objects/OutlineObject/OutlineObject.yy

@@ -0,0 +1,53 @@
+/// @description bake on first draw
+event_inherited();
+canvas = undefined;
+
+__free = function() {
+	if (canvas != undefined)
+		canvas.free();
+}
+
+/// @function bake()
+bake = function() {
+	if (canvas != undefined) canvas.free();
+	log("Pre-Baking sprite '{0}' with {1} frames", sprite_get_name(sprite_index), image_number);
+	var begintime = current_time;
+	var shader				= shd_outline;
+	var u_texel				= shader_get_uniform(shader, "u_vTexel");
+	var u_outline_color		= shader_get_uniform(shader, "u_vOutlineColour");
+	var u_thickness			= shader_get_uniform(shader, "u_vThickness");
+
+	canvas = sprite_to_canvas(sprite_index, -1, 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();
+
+	shader_set(shader);
+	var _texture = canvas.canvas.GetTexture();
+	texture_set_stage(shader_get_sampler_index(shader, "u_sSpriteSurface"), _texture);
+	shader_set_uniform_f(u_texel		, texture_get_texel_width(_texture), texture_get_texel_height(_texture));
+	shader_set_uniform_f(u_outline_color, outliner.outline_color, outliner.outline_alpha); //colour, alpha
+	shader_set_uniform_f(u_thickness	, outliner.outline_strength, outliner.alpha_fading ? 1 : 0); // thickness x, y
+
+	draw_surface(canvas.canvas.GetSurfaceID(),outliner.outline_strength,outliner.outline_strength);
+
+	shader_reset();
+	target.Finish();			
+	
+	// Free the original canvas...
+	canvas.canvas.Free();
+	// ...and inject the pre-baked
+	canvas.canvas = target;
+	log("Pre-Baking took {0}ms", current_time - begintime);
+}
+
+__draw = function() {
+	if (canvas == undefined) bake();
+	image_index = canvas.get_image_index(delta_time, image_speed);
+	if (outline_always || (outline_on_mouse_over && mouse_is_over))
+		canvas.draw_frame(image_index, x - outline_strength - TEXTURE_PAGE_BORDER_SIZE, y - outline_strength - TEXTURE_PAGE_BORDER_SIZE);
+	else
+		draw_self();
+}
+
+if (sprite_index != -1) bake();