From e52c817aeffc287a1cafb036627825844ee497bb Mon Sep 17 00:00:00 2001 From: Ne_Eo Date: Wed, 18 Sep 2024 21:52:02 +0200 Subject: [PATCH 1/2] :sob: --- source/funkin/backend/shaders/FunkinShader.hx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/funkin/backend/shaders/FunkinShader.hx b/source/funkin/backend/shaders/FunkinShader.hx index b9ef4658..f8d66fae 100644 --- a/source/funkin/backend/shaders/FunkinShader.hx +++ b/source/funkin/backend/shaders/FunkinShader.hx @@ -438,11 +438,6 @@ uniform sampler2D bitmap; uniform bool hasTransform; uniform bool hasColorTransform; -vec4 flixel_texture2D(sampler2D bitmap, vec2 coord) { - vec4 color = texture2D(bitmap, coord); - return applyFlixelEffects(color); -} - vec4 applyFlixelEffects(vec4 color) { if (!hasTransform) { return color; @@ -465,6 +460,11 @@ vec4 applyFlixelEffects(vec4 color) { return vec4(0.0, 0.0, 0.0, 0.0); } +vec4 flixel_texture2D(sampler2D bitmap, vec2 coord) { + vec4 color = texture2D(bitmap, coord); + return applyFlixelEffects(color); +} + uniform vec4 _camSize; float map(float value, float min1, float max1, float min2, float max2) { From ec0bdcd494b0e2fdf1a068aa8258b45b8e30bbdb Mon Sep 17 00:00:00 2001 From: Ne_Eo Date: Thu, 19 Sep 2024 18:25:08 +0200 Subject: [PATCH 2/2] Why did i make this flipped --- source/funkin/backend/scripting/HScript.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/backend/scripting/HScript.hx b/source/funkin/backend/scripting/HScript.hx index 5c8d66d7..5ecb6299 100644 --- a/source/funkin/backend/scripting/HScript.hx +++ b/source/funkin/backend/scripting/HScript.hx @@ -64,7 +64,7 @@ class HScript extends Script { } private function importFailedCallback(cl:Array):Bool { - if(_importFailedCallback(cl, "") || _importFailedCallback(cl, "source/")) { + if(_importFailedCallback(cl, "source/") || _importFailedCallback(cl, "")) { return true; } return false;