From 7c091445c252095a1196daaff91e640b844d1d28 Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Mon, 20 Mar 2023 17:59:42 +0100 Subject: [PATCH] =?UTF-8?q?=E2=80=8B=E2=80=8B=E2=80=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/funkin/shaders/FunkinShader.hx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/source/funkin/shaders/FunkinShader.hx b/source/funkin/shaders/FunkinShader.hx index ae23e63a..e78bc22a 100644 --- a/source/funkin/shaders/FunkinShader.hx +++ b/source/funkin/shaders/FunkinShader.hx @@ -343,7 +343,7 @@ class FunkinShader extends FlxShader implements IHScriptCustomBehaviour { var cl = Std.string(Type.getClass(field)); // cant do "field is ShaderInput" for some reason - if (field is ShaderParameter) { + if (cl.startsWith("openfl.display.ShaderParameter")) { var sp = cast(field, ShaderParameter); @:privateAccess return (sp.__length > 1) ? sp.value : sp.value[0]; @@ -368,14 +368,7 @@ class FunkinShader extends FlxShader implements IHScriptCustomBehaviour { var cl = Std.string(Type.getClass(field)); // cant do "field is ShaderInput" for some reason - if (cl.startsWith("openfl.display.ShaderInput")) { - // shader input!! - if (!(val is BitmapData)) { - throw new ShaderTypeException(v, Type.getClass(val), BitmapData); - return null; - } - field.input = cast val; - } else if (cl.startsWith("openfl.display.ShaderParameter")) { + if (cl.startsWith("openfl.display.ShaderParameter")) { @:privateAccess if (field.__length <= 1) { // that means we wait for a single number, instead of an array @@ -402,6 +395,13 @@ class FunkinShader extends FlxShader implements IHScriptCustomBehaviour { } return field.value = val; } + } else if (cl.startsWith("openfl.display.ShaderInput")) { + // shader input!! + if (!(val is BitmapData)) { + throw new ShaderTypeException(v, Type.getClass(val), BitmapData); + return null; + } + field.input = cast val; } }