diff --git a/assets b/assets index c354795f7..200fa60df 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit c354795f7f560fa096b855c6e6bca745f77fa414 +Subproject commit 200fa60dfb116bda6c438b0bb3e9ad541b2180ea diff --git a/source/funkin/graphics/framebuffer/GrabbableCamera.hx b/source/funkin/graphics/framebuffer/GrabbableCamera.hx index 266420e5f..0fa372123 100644 --- a/source/funkin/graphics/framebuffer/GrabbableCamera.hx +++ b/source/funkin/graphics/framebuffer/GrabbableCamera.hx @@ -7,7 +7,7 @@ import flixel.graphics.frames.FlxFrame; import flixel.math.FlxMatrix; import flixel.math.FlxRect; import flixel.system.FlxAssets.FlxShader; -import funkin.shaderslmfao.RuntimeCustomBlendShader; +import funkin.graphics.shaders.RuntimeCustomBlendShader; import openfl.Lib; import openfl.display.BitmapData; import openfl.display.BlendMode; diff --git a/source/funkin/graphics/shaders/PuddleShader.hx b/source/funkin/graphics/shaders/PuddleShader.hx index 8e04c6453..352568737 100644 --- a/source/funkin/graphics/shaders/PuddleShader.hx +++ b/source/funkin/graphics/shaders/PuddleShader.hx @@ -1,4 +1,4 @@ -package funkin.shaderslmfao; +package funkin.graphics.shaders; import flixel.addons.display.FlxRuntimeShader; import openfl.Assets; diff --git a/source/funkin/graphics/shaders/RuntimeCustomBlendShader.hx b/source/funkin/graphics/shaders/RuntimeCustomBlendShader.hx index 627df46ff..a07124d23 100644 --- a/source/funkin/graphics/shaders/RuntimeCustomBlendShader.hx +++ b/source/funkin/graphics/shaders/RuntimeCustomBlendShader.hx @@ -1,4 +1,4 @@ -package funkin.shaderslmfao; +package funkin.graphics.shaders; import openfl.display.BitmapData; import openfl.display.BlendMode; @@ -6,24 +6,24 @@ import openfl.utils.Assets; class RuntimeCustomBlendShader extends RuntimePostEffectShader { - public var source(default, set):BitmapData; + public var source(default, set):BitmapData; - function set_source(value:BitmapData):BitmapData - { - this.setBitmapData("source", value); - return source = value; - } + function set_source(value:BitmapData):BitmapData + { + this.setBitmapData("source", value); + return source = value; + } - public var blend(default, set):BlendMode; + public var blend(default, set):BlendMode; - function set_blend(value:BlendMode):BlendMode - { - this.setInt("blendMode", cast value); - return blend = value; - } + function set_blend(value:BlendMode):BlendMode + { + this.setInt("blendMode", cast value); + return blend = value; + } - public function new() - { - super(Assets.getText("assets/shaders/customBlend.frag")); - } + public function new() + { + super(Assets.getText("assets/shaders/customBlend.frag")); + } } diff --git a/source/funkin/graphics/shaders/RuntimePostEffectShader.hx b/source/funkin/graphics/shaders/RuntimePostEffectShader.hx index 7488d086f..9f49da075 100644 --- a/source/funkin/graphics/shaders/RuntimePostEffectShader.hx +++ b/source/funkin/graphics/shaders/RuntimePostEffectShader.hx @@ -1,4 +1,4 @@ -package funkin.shaderslmfao; +package funkin.graphics.shaders; import flixel.FlxCamera; import flixel.FlxG; diff --git a/source/funkin/graphics/shaders/RuntimeRainShader.hx b/source/funkin/graphics/shaders/RuntimeRainShader.hx index dc35a7bb7..05bc68f72 100644 --- a/source/funkin/graphics/shaders/RuntimeRainShader.hx +++ b/source/funkin/graphics/shaders/RuntimeRainShader.hx @@ -1,4 +1,4 @@ -package funkin.shaderslmfao; +package funkin.graphics.shaders; import flixel.system.FlxAssets.FlxShader; import openfl.display.BitmapData;