Skip to content

Commit 58033f8

Browse files
committed
Release 3.2
1 parent 8944189 commit 58033f8

File tree

9 files changed

+29
-9
lines changed

9 files changed

+29
-9
lines changed

gml-outline-shader-drawer.yyp

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

objects/OutlineObjectBaked/Create_0.gml

+10-2
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,19 @@ bake = function() {
8888
show_debug_message("Pre-Baking took {0}ms", current_time - begintime);
8989
}
9090

91+
__flicker_saver = 0;
9192
__draw = function() {
9293
if (canvas == undefined) bake();
9394
var before = sprite_index;
94-
sprite_index = (outline_always || (outline_on_mouse_over && mouse_is_over)) ? dynsprite : origsprite;
95-
if (sprite_index != before && (os_browser != browser_not_a_browser)) image_yscale *= __browser_flip;
95+
var after = (outline_always || (outline_on_mouse_over && mouse_is_over)) ? dynsprite : origsprite;
96+
var changed = after != before;
97+
if (__flicker_saver == 0 && changed) {
98+
__flicker_saver++;
99+
sprite_index = after;
100+
} else {
101+
if (!changed)
102+
__flicker_saver = max(0, __flicker_saver - 1);
103+
}
96104

97105
draw_self();
98106
}
+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/// @description mouse_is_over = true;
2+
if (__flicker_saver == 0)
3+
event_inherited();
+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/// @description mouse_is_over = false;
2+
if (__flicker_saver == 0)
3+
event_inherited();

objects/OutlineObjectBaked/OutlineObjectBaked.yy

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/_outline_shader_drawer_version_/_outline_shader_drawer_version_.gml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#macro OUTLINE_SHADER_VERSION "3.1"
1+
#macro OUTLINE_SHADER_VERSION "3.2"
22
#macro OUTLINE_SHADER_NAME "outline-shader-drawer "
33
#macro OUTLINE_SHADER_COPYRIGHT "(c)2022* coldrock.games, @Grisgram (github)"
44

scripts/sprite_to_canvas/sprite_to_canvas.gml

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,22 @@
88
/// @returns A new CanvasSprite object holding the sprite, frame sizes, animation speed, etc
99
function sprite_to_canvas(_sprite, _frame = -1, _bordersize = 0) {
1010
_bordersize += 2; // 1 pixel on each side as "reserve" to avoid low-alpha pre-rendering overlaps
11+
12+
var __browser_flip = (os_browser != browser_not_a_browser) ? -1 : 1;
1113
var __double_border = 2 * _bordersize;
1214
var __subimage_count = _frame == -1 ? sprite_get_number(_sprite) : 1;
1315
var __subimage_width = sprite_get_width(_sprite) + __double_border;
1416
var __subimage_height = sprite_get_height(_sprite) + __double_border;
1517
var __xoffset = sprite_get_xoffset(_sprite);
1618
var __yoffset = sprite_get_yoffset(_sprite);
19+
var __render_y = (__browser_flip > 0 ? 0 : -__subimage_height + 2 * __yoffset + 2 * _bordersize); // THANKS HTML! **$%&#"$§#@"§#@@**
1720

1821
var canvas = new Canvas(__subimage_width * __subimage_count, __subimage_height);
1922

2023
canvas.Start();
2124

2225
var f = max(0, _frame); repeat(__subimage_count) {
23-
draw_sprite(_sprite, f, f * __subimage_width + __xoffset + _bordersize, __yoffset + _bordersize);
26+
draw_sprite_ext(_sprite, f, f * __subimage_width + __xoffset + _bordersize, __yoffset + _bordersize - __render_y, 1, __browser_flip, 0, c_white, 1);
2427
f++;
2528
}
2629

@@ -52,6 +55,7 @@ function CanvasSprite(_canvas, _image_count, _fps, _xoffset, _yoffset, _bordersi
5255
time_step = 1000000 / animation_fps;
5356

5457
__matrix = undefined;
58+
5559
__browser_flip = (os_browser != browser_not_a_browser) ? -1 : 1;
5660
__render_y = (__browser_flip > 0 ? 0 : -image_height + 2 * yoffset + 2 * bordersize); // THANKS HTML! **$%&#"$§#@"§#@@**
5761

sprites/sprMace/sprMace.yy

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sprites/sprRedPotionAnim/sprRedPotionAnim.yy

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)