From 11d6c0bc882bf3913bd60352eac897202f51496d Mon Sep 17 00:00:00 2001 From: fabs Date: Wed, 12 Feb 2025 01:51:09 +0000 Subject: [PATCH 1/3] add web support to swappedImage --- source/funkin/graphics/shaders/TextureSwap.hx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/source/funkin/graphics/shaders/TextureSwap.hx b/source/funkin/graphics/shaders/TextureSwap.hx index 65de87ea3..ee2ca05d5 100644 --- a/source/funkin/graphics/shaders/TextureSwap.hx +++ b/source/funkin/graphics/shaders/TextureSwap.hx @@ -9,6 +9,17 @@ class TextureSwap extends FlxShader public var swappedImage(default, set):BitmapData; public var amount(default, set):Float; + public function loadSwapImage(path:String) + { + #if html5 + BitmapData.loadFromFile(path).onComplete(function(bmp:BitmapData) { + swappedImage = bmp; + }); + #else + swappedImage = BitmapData.fromFile(path); + #end + } + function set_swappedImage(_bitmapData:BitmapData):BitmapData { image.input = _bitmapData; From 9bc217d3f5357d84ba85289f40be677803993da2 Mon Sep 17 00:00:00 2001 From: fabs Date: Wed, 12 Feb 2025 01:51:19 +0000 Subject: [PATCH 2/3] add web support for altMaskImage --- source/funkin/graphics/shaders/DropShadowShader.hx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/source/funkin/graphics/shaders/DropShadowShader.hx b/source/funkin/graphics/shaders/DropShadowShader.hx index f6a21e757..63eebf583 100644 --- a/source/funkin/graphics/shaders/DropShadowShader.hx +++ b/source/funkin/graphics/shaders/DropShadowShader.hx @@ -167,6 +167,17 @@ class DropShadowShader extends FlxShader return spr; } + public function loadAltMask(path:String) + { + #if html5 + BitmapData.loadFromFile(path).onComplete(function(bmp:BitmapData) { + altMaskImage = bmp; + }); + #else + altMaskImage = BitmapData.fromFile(path); + #end + } + public function onAttachedFrame(name, frameNum, frameIndex) { if (attachedSprite != null) updateFrameInfo(attachedSprite.frame); From cbcf3e27546473bba938df463a6db3c377fe31ea Mon Sep 17 00:00:00 2001 From: fabs Date: Wed, 12 Feb 2025 01:51:46 +0000 Subject: [PATCH 3/3] assets submod --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 2a4790dc5..09eb769fe 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 2a4790dc532a6f5ffdf609a99aa1d96e0aecae37 +Subproject commit 09eb769fe3181a95d964eeb2ed02b358c164c609