Merge remote-tracking branch 'upstream/main'

assets/shaders/engine/editorBlurFast.frag

@@ -13,32 +13,16 @@ float uBrightness = 0.6;
 
 vec4 getColor(vec2 pos) {
 	vec2 ps = (pos);
-	if (ps.x < 0.0) ps.x = 0.0;
-	//else if (ps.x > 1.0 - (1.0 / iResolution.x)) ps.x = 1.0 - (1.0 / iResolution.x);
-	else if (ps.x > 1.0) return vec4(0.0);
-	if (ps.y < 0.0) ps.y = 0.0;
-	//else if (ps.y > 1.0 - (1.0 / iResolution.y)) return ps.y = 1.0 - (1.0 / iResolution.y);
-	else if (ps.y > 1.0) return vec4(0.0);
+	ps = clamp(ps, vec2(0.0), vec2(1.0));//1.0 - (1.0 / iResolution.xy));
 	return flixel_texture2D(bitmap, (ps));
 }
 
-
-vec2 fixvec2(float x, float y) { // makes an uv the same across sizes
-	vec2 val = vec2(x, y);
-	val.xy *= vec2(1280.0, 720.0);
-	val.xy /= iResolution.xy;
-	return val;
-}
-vec2 fixvec2(vec2 uv) { // makes an uv the same across sizes
-	vec2 val = uv;
-	val.xy *= vec2(1280.0, 720.0);
-	val.xy /= iResolution.xy;
-	return val;
-}
+uniform sampler2D noiseTexture;
+uniform vec2 noiseTextureSize;
 
 vec2 random(vec2 p) {
-	p = vec2(dot(p,vec2(127.1,311.7)),dot(p,vec2(269.5,183.3)));
-	return fract(sin(p)*4375.5);
+	p *= openfl_TextureSize;
+    return texture2D(noiseTexture, p/noiseTextureSize).rg;
 }
 
 void main() {
@@ -47,13 +31,11 @@ void main() {
 	if (camPos.x < 0.0 || camPos.x > 1.0 || camPos.y < 0.0 || camPos.y > 1.0)
 		return;
 
-	//vec4 color = getColor(camPos);
-
 	vec2 blur = vec2(uBlur) * vec2(1.0, iResolution.x / iResolution.y);
 
 	vec4 a = getColor(camPos+(random(camPos)*blur - blur / 2.0)) * uBrightness;
 	a += getColor(camPos+(random(camPos+0.1)*blur - blur / 2.0)) * uBrightness;
-	a += getColor(camPos+(random(camPos+0.2)*blur - blur / 2.0)) * uBrightness;
+	//a += getColor(camPos+(random(camPos+0.2)*blur - blur / 2.0)) * uBrightness;
 	//a += getColor(camPos+(random(camPos+0.3)*blur - blur / 2.0)) * uBrightness;
-	gl_FragColor = a / 3.0;
+	gl_FragColor = a / 2.0;
 }

source/funkin/editors/ui/UISubstateWindow.hx

@@ -1,5 +1,8 @@
 package funkin.editors.ui;
 
+import openfl.display.ShaderParameter;
+import openfl.display.ShaderInput;
+import openfl.filters.ShaderFilter;
 import flixel.tweens.FlxTween;
 import funkin.backend.shaders.CustomShader;
 import openfl.filters.ShaderFilter;
@@ -7,7 +10,17 @@ import openfl.filters.ShaderFilter;
 // TODO: make UIWarningSubstate extend this
 class UISubstateWindow extends MusicBeatSubstate {
 	var camShaders:Array<FlxCamera> = [];
-	var blurShader:CustomShader = new CustomShader(Options.intensiveBlur ? "engine/editorBlur" : "engine/editorBlurFast");
+	var blurShader:CustomShader = {
+		var _ = new CustomShader(Options.intensiveBlur ? "engine/editorBlur" : "engine/editorBlurFast");
+		if(!Options.intensiveBlur) {
+			var noiseTexture:ShaderInput<openfl.display.BitmapData> = _.data.noiseTexture;
+			noiseTexture.input = Assets.getBitmapData("assets/shaders/noise256.png");
+			noiseTexture.wrap = REPEAT;
+			var noiseTextureSize:ShaderParameter<Float> = _.data.noiseTextureSize;
+			noiseTextureSize.value = [noiseTexture.input.width, noiseTexture.input.height];
+		}
+		_;
+	};
 
 	var titleSpr:UIText;
 	var messageSpr:UIText;

source/funkin/editors/ui/UIWarningSubstate.hx

@@ -1,5 +1,8 @@
 package funkin.editors.ui;
 
+import openfl.display.ShaderParameter;
+import openfl.display.ShaderInput;
+import openfl.filters.ShaderFilter;
 import flixel.tweens.FlxEase;
 import flixel.tweens.FlxTween;
 import funkin.backend.shaders.CustomShader;
@@ -7,7 +10,17 @@ import openfl.filters.ShaderFilter;
 
 class UIWarningSubstate extends MusicBeatSubstate {
 	var camShaders:Array<FlxCamera> = [];
-	var blurShader:CustomShader = new CustomShader(Options.intensiveBlur ? "engine/editorBlur" : "engine/editorBlurFast");
+	var blurShader:CustomShader = {
+		var _ = new CustomShader(Options.intensiveBlur ? "engine/editorBlur" : "engine/editorBlurFast");
+		if(!Options.intensiveBlur) {
+			var noiseTexture:ShaderInput<openfl.display.BitmapData> = _.data.noiseTexture;
+			noiseTexture.input = Assets.getBitmapData("assets/shaders/noise256.png");
+			noiseTexture.wrap = REPEAT;
+			var noiseTextureSize:ShaderParameter<Float> = _.data.noiseTextureSize;
+			noiseTextureSize.value = [noiseTexture.input.width, noiseTexture.input.height];
+		}
+		_;
+	};
 
 	var title:String;
 	var message:String;

source/funkin/game/HealthIcon.hx

@@ -90,11 +90,9 @@ class HealthIcon extends FlxSprite
 		if (animation.curAnim != null) {
 			var i:Int = -1;
 			var oldKey:Int = -1;
-			for(k=>icon in healthSteps) {
-				if (k > oldKey && k < health * 100) {
-					oldKey = k;
-					i = icon;
-				}
+			for (k=>icon in healthSteps) if (k > oldKey && k <= health * 100) {
+				oldKey = k;
+				i = icon;
 			}
 			if (i >= 0 && curAnimState != i) {
 				var event = EventManager.get(funkin.backend.scripting.events.HealthIconChangeEvent).recycle(i, this);

source/funkin/menus/PauseSubState.hx

@@ -14,6 +14,7 @@ import funkin.editors.charter.Charter;
 import funkin.menus.StoryMenuState;
 import funkin.options.OptionsMenu;
 import funkin.options.keybinds.KeybindsOptions;
+import funkin.options.TreeMenu;
 
 class PauseSubState extends MusicBeatSubstate
 {
@@ -153,9 +154,10 @@ class PauseSubState extends MusicBeatSubstate
 				persistentDraw = false;
 				openSubState(new KeybindsOptions());
 			case "Change Options":
+				TreeMenu.lastState = PlayState;
 				FlxG.switchState(new OptionsMenu());
 			case "Exit to charter":
-				FlxG.switchState(new funkin.editors.charter.Charter(PlayState.SONG.meta.name, PlayState.difficulty, false));
+				FlxG.switchState(new Charter(PlayState.SONG.meta.name, PlayState.difficulty, false));
 			case "Exit to menu":
 				if (PlayState.chartingMode && Charter.undos.unsaved)
 					game.saveWarn(false);
@@ -206,4 +208,4 @@ class PauseSubState extends MusicBeatSubstate
 				item.alpha = 0.6;
 		}
 	}
-}
+}