Shape Drawing Improvements

Examples/Examples.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <RunWorkingDirectory>$(MSBuildThisFileDirectory)</RunWorkingDirectory>
     <Nullable>enable</Nullable>

Examples/PayloadSystem/PayloadDeliverySystem.cs

@@ -62,7 +62,10 @@ public void Update(float dt)
         {
             var payload = payloads[i];
             payload.Update(dt);
-            if(payload.IsFinished()) payloads.RemoveAt(i);
+            if(payload.IsFinished())
+            {
+                payloads.RemoveAt(i);
+            }
         }
 
 

Examples/Resources/Shaders/AlphaCircle.frag

@@ -4,15 +4,21 @@ in vec2 fragTexCoord;
 out vec4 finalColor;
 uniform sampler2D texture0;
 
+uniform float renderWidth = 800.0;
+uniform float renderHeight = 450.0;
 uniform vec2 origin = vec2(0, 0);
 uniform float minDis = 0.25;
 uniform float maxDis = 1;
 //uniform float threshold = 0.5;
 
 void main()
 {
-    vec2 uv = (fragTexCoord * 2) - 1;
-    float dis = length(uv - (origin * vec2(1, -1)));
+    vec2 uv = fragTexCoord;
+    vec2 center = vec2(origin.x, 1.0 - origin.y);
+    vec2 delta = uv - center;
+    float aspect = renderWidth / max(renderHeight, 1.0);
+    delta.x *= aspect;
+    float dis = length(delta);
     float f = 0;
 
     if(dis > minDis) f = dis - minDis / maxDis - minDis;

Examples/Resources/Shaders/BloomShader.frag

@@ -13,33 +13,58 @@ out vec4 finalColor;
 
 // NOTE Add here your custom variables
 
-uniform vec2 size = vec2(800, 450);   // Framebuffer size
-uniform float samples = 5.0;          // Pixels per axis; higher = bigger glow, worse performance
-uniform float quality = 2.5;          // Defines size factor: Lower = smaller glow, better quality
-//uniform vec4 targetColor = vec4(1.0, 0.498, 0.314, 1.0);
-//uniform float targetThreshold = 0.25;
+uniform vec2 size = vec2(800, 450);       // Framebuffer size in pixels
+uniform float threshold = 0.75;           // Only pixels brighter than this contribute to bloom
+uniform float softThreshold = 0.15;       // Smooth threshold band to avoid harsh cutoffs
+uniform float blurSpread = 5.0;           // Sample radius in pixels
+uniform float bloomIntensity = 3.0;       // Strength of the bloom contribution
 
 
 void main()
 {
-    vec4 sum = vec4(0);
-    vec2 sizeFactor = vec2(1)/size*quality;
-
-    // Texel color fetching from texture sampler
     vec4 source = texture(texture0, fragTexCoord);
+    vec2 texelSize = vec2(1.0) / max(size, vec2(1.0));
+    vec2 spread = texelSize * max(blurSpread, 0.0);
+
+    vec2 offsets[9] = vec2[](
+        vec2( 0.0,  0.0),
+        vec2(-1.0,  0.0),
+        vec2( 1.0,  0.0),
+        vec2( 0.0, -1.0),
+        vec2( 0.0,  1.0),
+        vec2(-1.0, -1.0),
+        vec2( 1.0, -1.0),
+        vec2(-1.0,  1.0),
+        vec2( 1.0,  1.0)
+    );
+
+    float weights[9] = float[](
+        0.227027,
+        0.121622,
+        0.121622,
+        0.121622,
+        0.121622,
+        0.071351,
+        0.071351,
+        0.071351,
+        0.071351
+    );
 
-    const int range = 2;            // should be = (samples - 1)/2;
+    vec3 bloom = vec3(0.0);
 
-    for (int x = -range; x <= range; x++)
+    for (int i = 0; i < 9; i++)
     {
-        for (int y = -range; y <= range; y++)
-        {
-            sum += texture(texture0, fragTexCoord + vec2(x, y)*sizeFactor);
-        }
+        vec4 sampleTexel = texture(texture0, fragTexCoord + offsets[i] * spread);
+        vec3 sampleColor = sampleTexel.rgb * sampleTexel.a;
+        float brightness = dot(sampleColor, vec3(0.2126, 0.7152, 0.0722));
+        float brightMask = smoothstep(threshold - softThreshold, threshold + softThreshold, brightness);
+        bloom += sampleColor * brightMask * weights[i];
     }
 
-    // Calculate final fragment color
-    finalColor = ((sum/(samples*samples)) + source)*colDiffuse;
+    vec3 bloomContribution = bloom * max(bloomIntensity, 0.0);
+    vec3 finalRgb = source.rgb + bloomContribution;
+    float bloomAlpha = clamp(max(max(bloomContribution.r, bloomContribution.g), bloomContribution.b), 0.0, 1.0);
+    float finalAlpha = max(source.a, bloomAlpha);
 
-
+    finalColor = vec4(finalRgb, finalAlpha) * colDiffuse;
 }