Release 1.4

Grisgram · Sep 6, 2022 · f669f78 · f669f78
1 parent ed4a436
commit f669f78
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 9 deletions.
diff --git a/gml-outline-shader-drawer.yyp b/gml-outline-shader-drawer.yyp
@@ -6,6 +6,7 @@
     {"id":{"name":"OutlineObject","path":"objects/OutlineObject/OutlineObject.yy",},"order":2,},
     {"id":{"name":"sprSingleCoin","path":"sprites/sprSingleCoin/sprSingleCoin.yy",},"order":0,},
     {"id":{"name":"DemoPotion","path":"objects/DemoPotion/DemoPotion.yy",},"order":6,},
+    {"id":{"name":"_OUTLINE_SHADER_DRAWER_VERSION_","path":"scripts/_OUTLINE_SHADER_DRAWER_VERSION_/_OUTLINE_SHADER_DRAWER_VERSION_.yy",},"order":3,},
     {"id":{"name":"sprHellToHeaven","path":"sprites/sprHellToHeaven/sprHellToHeaven.yy",},"order":4,},
     {"id":{"name":"outline_drawer","path":"scripts/outline_drawer/outline_drawer.yy",},"order":0,},
     {"id":{"name":"RotatingCoin","path":"objects/RotatingCoin/RotatingCoin.yy",},"order":1,},
@@ -51,7 +52,7 @@
   ],
   "IncludedFiles": [],
   "MetaData": {
-    "IDEVersion": "2022.3.0.625",
+    "IDEVersion": "2022.6.1.26",
   },
   "resourceVersion": "1.5",
   "name": "gml-outline-shader-drawer",

diff --git a/objects/DemoMace/DemoMace.yy b/objects/DemoMace/DemoMace.yy
@@ -5,6 +5,7 @@
   },
   "solid": false,
   "visible": true,
+  "managed": true,
   "spriteMaskId": null,
   "persistent": false,
   "parentObjectId": {

diff --git a/objects/DemoPotion/DemoPotion.yy b/objects/DemoPotion/DemoPotion.yy
@@ -5,6 +5,7 @@
   },
   "solid": false,
   "visible": true,
+  "managed": true,
   "spriteMaskId": null,
   "persistent": false,
   "parentObjectId": {

diff --git a/objects/OutlineLogo/OutlineLogo.yy b/objects/OutlineLogo/OutlineLogo.yy
@@ -5,6 +5,7 @@
   },
   "solid": false,
   "visible": true,
+  "managed": true,
   "spriteMaskId": null,
   "persistent": false,
   "parentObjectId": {

diff --git a/rooms/rmDemo/rmDemo.yy b/rooms/rmDemo/rmDemo.yy
@@ -19,7 +19,7 @@
             {"propertyId":{"name":"outline_color","path":"objects/OutlineObject/OutlineObject.yy",},"objectId":{"name":"OutlineObject","path":"objects/OutlineObject/OutlineObject.yy",},"value":"$FF00FFFF","resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMOverriddenProperty",},
           ],"isDnd":false,"objectId":{"name":"RotatingCoin","path":"objects/RotatingCoin/RotatingCoin.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":672.0,"y":352.0,"resourceVersion":"1.0","name":"inst_1ECA171D","tags":[],"resourceType":"GMRInstance",},
         {"properties":[],"isDnd":false,"objectId":{"name":"DemoPotion","path":"objects/DemoPotion/DemoPotion.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":928.0,"y":352.0,"resourceVersion":"1.0","name":"inst_49A75E2D","tags":[],"resourceType":"GMRInstance",},
-        {"properties":[],"isDnd":false,"objectId":{"name":"DemoMace","path":"objects/DemoMace/DemoMace.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":-36.5670662,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":320.0,"y":416.0,"resourceVersion":"1.0","name":"inst_36AD6CD4","tags":[],"resourceType":"GMRInstance",},
+        {"properties":[],"isDnd":false,"objectId":{"name":"DemoMace","path":"objects/DemoMace/DemoMace.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":-36.567066,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":320.0,"y":416.0,"resourceVersion":"1.0","name":"inst_36AD6CD4","tags":[],"resourceType":"GMRInstance",},
         {"properties":[],"isDnd":false,"objectId":{"name":"OutlineLogo","path":"objects/OutlineLogo/OutlineLogo.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":768.0,"y":640.0,"resourceVersion":"1.0","name":"inst_5E6AE3A6","tags":[],"resourceType":"GMRInstance",},
       ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],"resourceVersion":"1.0","name":"Instances","tags":[],"resourceType":"GMRInstanceLayer",},
     {"spriteId":{"name":"sprHellToHeaven","path":"sprites/sprHellToHeaven/sprHellToHeaven.yy",},"colour":4294967295,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":true,"animationFPS":0.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],"resourceVersion":"1.0","name":"Background","tags":[],"resourceType":"GMRBackgroundLayer",},

diff --git a/scripts/_outline_shader_drawer_version_/_outline_shader_drawer_version_.gml b/scripts/_outline_shader_drawer_version_/_outline_shader_drawer_version_.gml
@@ -0,0 +1,8 @@
+#macro OUTLINE_SHADER_VERSION	"1.4"
+#macro OUTLINE_SHADER_NAME		"outline-shader-drawer "
+#macro OUTLINE_SHADER_COPYRIGHT	"(c)2022* indievidualgames, @Grisgram (github)"
+
+var cpyrght = (current_year == 2022) ?
+	string_replace(OUTLINE_SHADER_COPYRIGHT, "*", "") :
+	string_replace(OUTLINE_SHADER_COPYRIGHT, "*", "-" + string(current_year));
+show_debug_message(OUTLINE_SHADER_NAME + OUTLINE_SHADER_VERSION + " loaded. " + cpyrght);
diff --git a/scripts/_outline_shader_drawer_version_/_outline_shader_drawer_version_.yy b/scripts/_outline_shader_drawer_version_/_outline_shader_drawer_version_.yy
@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "outline-shader-drawer",
+    "path": "folders/outline-shader-drawer.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "_OUTLINE_SHADER_DRAWER_VERSION_",
+  "tags": [],
+  "resourceType": "GMScript",
+}
diff --git a/scripts/outline_drawer/outline_drawer.gml b/scripts/outline_drawer/outline_drawer.gml
@@ -161,14 +161,8 @@ function outline_drawer(_viewport = 0, _outline_color = c_white, _outline_alpha
 
 	}
 
-	static draw_object_outline = function(object_to_draw) {
+	static draw_object_outline = function(object_to_draw = other) {
 		with (object_to_draw) {
-			if (is_child_of(self, OutlineObject)) {
-				object_to_draw.outline_color	= make_color_rgb(color_get_red(outline_color),color_get_green(outline_color),color_get_blue(outline_color));
-				object_to_draw.outline_alpha	= outline_alpha;
-				object_to_draw.outline_strength	= outline_strength;
-				object_to_draw.alpha_fading		= outline_alpha_fading;
-			}
 			other.draw_sprite_outline(self, image_index, x, y, image_xscale, image_yscale, image_angle, image_blend, image_alpha);
 		}
 	}