Buncho Demo fixes I forgot to merge/push (#357)

* fix grain shader

* collision and grouping size fix

* pixelperfect polish

* added sounds+music to FlxFSM demo

Author: ninjamuffin99

Effects/Filters/source/filters/Grain.hx

@@ -32,11 +32,10 @@ class Grain extends FlxShader
 		float width = openfl_TextureSize.x;
 		float height = openfl_TextureSize.y;
 
-		const float grainamount = 0.05; //grain amount
+		const float grainamount = 0.1; //grain amount
 		bool colored = false; //colored noise?
 		float coloramount = 0.6;
-		float grainsize = 1.6; //grain particle size (1.5 - 2.5)
-		float lumamount = 1.0; //
+		float grainsize = 2.0; //grain particle size (1.5 - 2.5)
 
 		//a random texture generator, but you can also use a pre-computed perturbation texture
 		vec4 rnm(in vec2 tc)
@@ -130,15 +129,6 @@ class Grain extends FlxShader
 			}
 
 			vec3 col = texture2D(bitmap, openfl_TextureCoordv).rgb;
-
-			//noisiness response curve based on scene luminance
-			vec3 lumcoeff = vec3(0.299,0.587,0.114);
-			float luminance = mix(0.0,dot(col, lumcoeff),lumamount);
-			float lum = smoothstep(0.2,0.0,luminance);
-			lum += luminance;
-
-
-			noise = mix(noise,vec3(0.0),pow(lum,4.0));
 			col = col+noise*grainamount;
 
 			gl_FragColor =  vec4(col,1.0);

Features/CollisionAndGrouping/Project.xml

@@ -16,7 +16,7 @@
 	<!-- ____________________________ Window Settings ___________________________ -->
 
 	<!--These window settings apply to all targets-->
-	<window width="400" height="300" fps="60" background="#000000" hardware="true" vsync="false" />
+	<window width="800" height="600" fps="60" background="#000000" hardware="true" vsync="false" />
 
 	<!--HTML5-specific-->
 	<window if="html5" resizable="true" />

Features/FlxFSM/assets/groundpound.ogg

@@ -30,6 +30,12 @@ class PlayState extends FlxState
 		bgColor = 0xff661166;
 		super.create();
 
+		// Music by 8-BITek
+		// Licensed under CC BY-NC-ND 3.0
+		// https://www.newgrounds.com/audio/listen/1341678
+		FlxG.sound.playMusic("assets/happynewyear.ogg", 0);
+		FlxG.sound.music.fadeIn(2, 0, 0.2);
+
 		final J = 99;
 		final G = 100;
 		final columns = 20;
@@ -86,12 +92,14 @@ class PlayState extends FlxState
 
 		FlxG.overlap(_slime, _superJump, function (_, _)
 		{
+			FlxG.sound.play("assets/powerup.ogg");
 			_slime.addSuperJump();
 			_superJump.kill();
 		});
 
 		FlxG.overlap(_slime, _groundPound, function (_, _)
 		{
+			FlxG.sound.play("assets/powerup.ogg");
 			_slime.addGroundPound();
 			_groundPound.kill();
 			startGroundPoundInfoTween();