Patches from tests

- GL functional
- DX still does not render anything when bloom enabled

Author: SimonDarksideJ

NeonShooter/NeonShooter.Core/Content/Shaders/BloomCombine.fx

@@ -11,18 +11,18 @@
 	#define PS_SHADERMODEL ps_4_0_level_9_1
 #endif
 
-texture BloomTexture;
-texture BaseTexture;
+Texture2D BloomTexture;
+Texture2D BaseTexture;
 
-sampler2D BloomSampler = sampler_state
+SamplerState BloomSampler = sampler_state
 {
     Texture = <BloomTexture>;
     Filter = Linear;
     AddressU = clamp;
     AddressV = clamp;
 };
 
-sampler2D BaseSampler = sampler_state
+SamplerState BaseSampler = sampler_state
 {
     Texture = <BaseTexture>;
     Filter = Linear;
@@ -56,8 +56,8 @@ float4 AdjustSaturation(float4 color, float saturation)
 float4 PixelShaderFunction(VS_OUTPUT input) : SV_TARGET0
 {
     // Look up the bloom and original base image colors.
-    float4 bloom = tex2D(BloomSampler, input.TexCoord);
-    float4 base = tex2D(BaseSampler, input.TexCoord);
+    float4 bloom = BaseTexture.Sample(BloomSampler, input.TexCoord);
+    float4 base = BaseTexture.Sample(BaseSampler, input.TexCoord);
 
     // Adjust color saturation and intensity.
     bloom = AdjustSaturation(bloom, BloomSaturation) * BloomIntensity;

NeonShooter/NeonShooter.Core/Game/BlackHole.cs

@@ -96,7 +96,7 @@ public void WasShot()
 				NeonShooterGame.ParticleManager.CreateParticle(Art.LineParticle, pos, color, 90, 1.5f, state);
 			}
 
-			Sound.Explosion.Play(0.5f, rand.NextFloat(-0.2f, 0.2f), 0);
+			Sound.Explosion.Play(0.5f * NeonShooterGame.GameVolumeMultiplier, rand.NextFloat(-0.2f, 0.2f), 0);
 		}
 
 		public void Kill()

NeonShooter/NeonShooter.Core/Game/BloomComponent.cs

@@ -12,6 +12,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
+using NeonShooter;
 #endregion
 
 namespace BloomPostprocess
@@ -184,7 +185,15 @@ public override void Draw(GameTime gameTime)
             parameters["BaseIntensity"].SetValue(Settings.BaseIntensity);
             parameters["BloomSaturation"].SetValue(Settings.BloomSaturation);
             parameters["BaseSaturation"].SetValue(Settings.BaseSaturation);
-            parameters["BaseTexture"].SetValue(sceneRenderTarget);
+
+            if (NeonShooterGame.IsDesktopGLBuild)
+            {
+                parameters["BaseSampler+BaseTexture"].SetValue(sceneRenderTarget);
+            }
+            else
+            {
+                parameters["BaseTexture"].SetValue(sceneRenderTarget);
+            }
 
             Viewport viewport = GraphicsDevice.Viewport;
 
@@ -311,6 +320,6 @@ float ComputeGaussian(float n)
         }
 
 
-        #endregion
+#endregion
     }
 }

NeonShooter/NeonShooter.Core/Game/Enemy.cs

@@ -118,7 +118,7 @@ public void WasShot()
 				NeonShooterGame.ParticleManager.CreateParticle(Art.LineParticle, Position, color, 190, 1.5f, state);
 			}
 
-			Sound.Explosion.Play(0.5f, rand.NextFloat(-0.2f, 0.2f), 0);
+			Sound.Explosion.Play(0.5f * NeonShooterGame.GameVolumeMultiplier, rand.NextFloat(-0.2f, 0.2f), 0);
 		}
 
 		#region Behaviours

NeonShooter/NeonShooter.Core/Game/GameRoot.cs

@@ -58,6 +58,9 @@ protected override void Initialize()
 			if (!OperatingSystem.IsIOS())
 			{
 				MediaPlayer.IsRepeating = true;
+#if DEBUG
+				MediaPlayer.Volume = 0f;
+#endif
 				MediaPlayer.Play(Sound.Music);
 			}
 		}

NeonShooter/NeonShooter.Core/Game/PlayerShip.cs

@@ -71,7 +71,7 @@ public override void Update()
 				offset = Vector2.Transform(new Vector2(35, 8), aimQuat);
 				EntityManager.Add(new Bullet(Position + offset, vel));
 
-				Sound.Shot.Play(0.2f, rand.NextFloat(-0.2f, 0.2f), 0);
+				Sound.Shot.Play(0.2f * NeonShooterGame.GameVolumeMultiplier, rand.NextFloat(-0.2f, 0.2f), 0);
 			}
 
 			if (cooldowmRemaining > 0)

NeonShooter/NeonShooter.Core/NeonShooterGame.cs

@@ -20,7 +20,15 @@ public class NeonShooterGame: Microsoft.Xna.Framework.Game
 		public static ParticleManager<ParticleState> ParticleManager { get; private set; }
 		public static Grid Grid { get; private set; }
 
-		GraphicsDeviceManager graphics;
+#if DEBUG
+        public static float GameVolumeMultiplier = 0.1f;
+#else
+        public static float GameVolumeMultiplier = 1f;
+#endif
+
+        public static bool IsDesktopGLBuild = false;
+
+        GraphicsDeviceManager graphics;
 		SpriteBatch spriteBatch;
 		BloomComponent bloom;
 
@@ -78,6 +86,7 @@ protected override void LoadContent()
                 try
                 {
                     MediaPlayer.IsRepeating = true;
+                    MediaPlayer.Volume = NeonShooterGame.GameVolumeMultiplier;
                     MediaPlayer.Play(Sound.Music);
                 }
                 catch { }

NeonShooter/NeonShooter.DesktopGL/Program.cs

@@ -2,4 +2,5 @@
 using NeonShooter;
 
 using var game = new NeonShooterGame();
+NeonShooterGame.IsDesktopGLBuild = true;
 game.Run();