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

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/source/PlayState.hx

@@ -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();

Features/FlxFSM/source/Slime.hx

@@ -1,5 +1,6 @@
 package;
 
+import flixel.sound.FlxSound;
 import flixel.FlxG;
 import flixel.FlxSprite;
 import flixel.addons.util.FlxFSM;
@@ -95,8 +96,11 @@ class Conditions
 
 class Idle extends FlxFSMState<Slime>
 {
+	var walkSnd:FlxSound;
+
 	override function enter(owner:Slime, fsm:FlxFSM<Slime>):Void
 	{
+		walkSnd = FlxG.sound.load("assets/walk.ogg", 0.4);
 		owner.animation.play("standing");
 	}
 
@@ -105,6 +109,7 @@ class Idle extends FlxFSMState<Slime>
 		owner.acceleration.x = 0;
 		if (FlxG.keys.pressed.LEFT || FlxG.keys.pressed.RIGHT)
 		{
+			walkSnd.play();
 			owner.facing = FlxG.keys.pressed.LEFT ? LEFT : RIGHT;
 			owner.animation.play("walking");
 			owner.acceleration.x = FlxG.keys.pressed.LEFT ? -300 : 300;
@@ -115,12 +120,18 @@ class Idle extends FlxFSMState<Slime>
 			owner.velocity.x *= 0.9;
 		}
 	}
+
+	override function exit(owner:Slime) {
+		walkSnd.stop();
+		super.exit(owner);
+	}
 }
 
 class Jump extends FlxFSMState<Slime>
 {
 	override function enter(owner:Slime, fsm:FlxFSM<Slime>):Void
 	{
+		FlxG.sound.play("assets/jump.ogg", FlxG.random.float(0.9, 1.0));
 		owner.animation.play("jumping");
 		owner.velocity.y = -200;
 	}
@@ -139,6 +150,7 @@ class SuperJump extends Jump
 {
 	override function enter(owner:Slime, fsm:FlxFSM<Slime>):Void
 	{
+		FlxG.sound.play("assets/superjump.ogg", FlxG.random.float(0.9, 1.0));
 		owner.animation.play("jumping");
 		owner.velocity.y = -300;
 	}
@@ -150,6 +162,7 @@ class GroundPound extends FlxFSMState<Slime>
 
 	override function enter(owner:Slime, fsm:FlxFSM<Slime>):Void
 	{
+		FlxG.sound.play("assets/groundpound.ogg");
 		owner.animation.play("pound");
 		owner.velocity.x = 0;
 		owner.acceleration.x = 0;
@@ -174,6 +187,7 @@ class GroundPoundFinish extends FlxFSMState<Slime>
 {
 	override function enter(owner:Slime, fsm:FlxFSM<Slime>):Void
 	{
+		FlxG.sound.play("assets/groundpoundfinish.ogg");
 		owner.animation.play("landing");
 		FlxG.camera.shake(0.025, 0.25);
 		owner.velocity.x = 0;

Performance/PixelPerfectCollision/source/PlayState.hx

@@ -88,6 +88,9 @@ class PlayState extends FlxState
 		updateSpriteAngles();
 		updateSpriteScales();
 
+		FlxG.camera.update(FlxG.elapsed);
+
+
 		// add objects for more interstellar fun!
 		for (i in 1...NUM_ALIENS)
 			addAlien();