From 9729f1c5c8356dc478b1c354b9b810d91a576849 Mon Sep 17 00:00:00 2001
From: Michel Fedde <michel.fedde@gmail.com>
Date: Sun, 21 May 2023 14:13:00 +0200
Subject: [PATCH] Added support for transparent colors.

---
 .../Classes/Rendering/Particles/Explosion.cs  |   2 +-
 .../Classes/Rendering/Particles/explosion.cfx | Bin 8688 -> 8723 bytes
 .../Classes/Rendering/Particles/explosion.fx  |   5 +++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CityGame/Classes/Rendering/Particles/Explosion.cs b/CityGame/Classes/Rendering/Particles/Explosion.cs
index a9493d0..55b9656 100644
--- a/CityGame/Classes/Rendering/Particles/Explosion.cs
+++ b/CityGame/Classes/Rendering/Particles/Explosion.cs
@@ -82,7 +82,7 @@ public sealed class Explosion : ParticleEmitter, IParticleHandler
     public void Draw(ref ParticleDrawContext context)
     {
         context.Effect.Parameters["view_projection"].SetValue(context.View * context.Projection);
-        context.Effect.Parameters["color"].SetValue(this.Color.ToVector3());
+        context.Effect.Parameters["color"].SetValue(this.Color.ToVector4());
 
         
         
diff --git a/CityGame/Classes/Rendering/Particles/explosion.cfx b/CityGame/Classes/Rendering/Particles/explosion.cfx
index 63b6f12ac03369fca6b5f53adc4fb726d49502b4..acabad602ffbb55a3945687b60c86e822a5da33e 100644
GIT binary patch
delta 91
zcmez1JlTcI*WE3Gi{UE!cEgEWxl9wJC;yX{nz)u@<LpGH&3mP^7&m`lnkhc{KR5g2
viBc+(`OXG<<qEb61;z1226`0=S|C=kv0nM+C(?YZj4YEC6(uIKE4~B(#5Ep%

delta 67
zcmV-J0KET`MDRljO-Dvp3IOy+U=@)HZ31x{lN}ryk*x@^n_&X8G6anm1#d$zE_ai|
Z8z-~$0x|)!1{@0o0Rxj!ArzA;A?e(m6vzMo

diff --git a/CityGame/Classes/Rendering/Particles/explosion.fx b/CityGame/Classes/Rendering/Particles/explosion.fx
index 7774a2a..e05b6da 100644
--- a/CityGame/Classes/Rendering/Particles/explosion.fx
+++ b/CityGame/Classes/Rendering/Particles/explosion.fx
@@ -15,7 +15,7 @@ int pixelSize;
 float timing;
 float2 noiseOffset;
 
-float3 color;
+float4 color;
 
 #define BLUR_KERNEL_X_MIN -0.5
 #define BLUR_KERNEL_X_MAX 0.5
@@ -108,7 +108,8 @@ float4 SpritePixelShader(PixelInput p) : SV_TARGET {
     val = val + calculateAlpha(relPos, noiseCoord);
     
     float noiseResult = getNoise(noiseCoord).r;
-    float3 resultColor = color * lerp(0.5, 1, noiseResult);
+    float3 resultColor = color.rgb * lerp(0.5, 1, noiseResult);
+    val *= color.a;
     
     return float4(resultColor,val);
 }