From 33e4c5e8c27afbcc148b2ab29923a5462b313816 Mon Sep 17 00:00:00 2001 From: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com> Date: Fri, 4 Aug 2023 16:43:20 +0300 Subject: [PATCH] Fixed `lime.utils.Log.throwErrors = false;` Letting users to chose where own way to load shaders --- flixel/addons/display/FlxRuntimeShader.hx | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/flixel/addons/display/FlxRuntimeShader.hx b/flixel/addons/display/FlxRuntimeShader.hx index 016665e6..dae67f79 100644 --- a/flixel/addons/display/FlxRuntimeShader.hx +++ b/flixel/addons/display/FlxRuntimeShader.hx @@ -9,7 +9,6 @@ import openfl.display.BitmapData; import openfl.display.ShaderInput; import openfl.display.ShaderParameter; import openfl.display.ShaderParameterType; -import openfl.utils.Assets; using StringTools; @@ -168,19 +167,15 @@ class FlxRuntimeShader extends FlxGraphicsShader */ public function new(?fragmentSource:String, ?vertexSource:String):Void { - try - { - glFragmentSource = Assets.getText(fragmentSource); - } - catch (e:Dynamic) - glFragmentSource = (fragmentSource != null && fragmentSource.length > 0) ? fragmentSource : BASE_FRAGMENT_SOURCE; + if (fragmentSource != null && fragmentSource.length > 0) + glFragmentSource = fragmentSource; + else + glFragmentSource = BASE_FRAGMENT_SOURCE; - try - { - glVertexSource = Assets.getText(vertexSource); - } - catch (e:Dynamic) - glVertexSource = (vertexSource != null && vertexSource.length > 0) ? vertexSource : BASE_VERTEX_SOURCE; + if (vertexSource != null && vertexSource.length > 0) + glVertexSource = vertexSource; + else + glVertexSource = BASE_VERTEX_SOURCE; super(); }