Cleanups

papadanku · Jun 3, 2023 · f9bb580 · f9bb580
1 parent 4f3fa4d
commit f9bb580
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/shaders/cCircles.fx b/shaders/cCircles.fx
@@ -19,11 +19,6 @@ uniform float _TileRadius <
     ui_max = 0.5;
 > = 0.45;
 
-float GetMod(float X, float Y)
-{
-    return X - Y * floor(X / Y);
-}
-
 float2 GetTiles(float2 Tex)
 {
     Tex *= _TileAmount;

diff --git a/shaders/cDiscBlur.fx b/shaders/cDiscBlur.fx
@@ -31,7 +31,9 @@ namespace cDiscBlur
 
     /*
         Pixel shaders
+        ---
         Repurposed Wojciech Sterna's shadow sampling code as a screen-space convolution
+        ---
         http://maxest.gct-game.net/content/chss.pdf
     */
 

diff --git a/shaders/cFilmGrain.fx b/shaders/cFilmGrain.fx
@@ -1,4 +1,5 @@
 #include "shared/cGraphics.fxh"
+#include "shared/cImageProcessing.fxh"
 
 /*
     Construct options
@@ -25,19 +26,12 @@ uniform float _Intensity <
 // "Well ill believe it when i see it."
 // Yoinked code by Luluco250 (RIP) [https://www.shadertoy.com/view/4t2fRz] [MIT]
 
-float GaussianWeights(float x, float Sigma)
-{
-    const float Pi = 3.14159265359;
-    Sigma = Sigma * Sigma;
-    return rsqrt(Pi * Sigma) * exp(-((x * x) / (2.0 * Sigma)));
-}
-
 float4 PS_FilmGrain(VS2PS_Quad Input) : SV_TARGET0
 {
     float Time = rcp(1e+3 / _Time) * _Speed;
     float Seed = dot(Input.HPos.xy, float2(12.9898, 78.233));
     float Noise = frac(sin(Seed) * 43758.5453 + Time);
-    return GaussianWeights(Noise, _Variance) * _Intensity;
+    return GetGaussianWeight(Noise, _Variance) * _Intensity;
 }
 
 technique CShade_FilmGrain

diff --git a/shaders/cMatrixTransforms.fx → shaders/cTransform.fx b/shaders/cMatrixTransforms.fx → shaders/cTransform.fx
@@ -65,7 +65,7 @@ float4 PS_Matrix(VS2PS_Quad Input) : SV_TARGET0
     return tex2D(CShade_SampleColorTex, Input.Tex0);
 }
 
-technique CShade_MatrixTransforms
+technique CShade_Transform
 {
     pass
     {

diff --git a/shaders/shared/cGraphics.fxh b/shaders/shared/cGraphics.fxh
@@ -40,4 +40,9 @@
     {
         return tex2D(SampleSource, Input.Tex0);
     }
+
+    float GetMod(float X, float Y)
+    {
+        return X - Y * floor(X / Y);
+    }
 #endif
diff --git a/shaders/shared/cMacros.fxh b/shaders/shared/cMacros.fxh
@@ -1,7 +1,7 @@
 
 #if !defined(CMACROS_FXH)
     /*
-        Macros and macro 
+        Macros and macro accessories
         ---
         https://graphics.stanford.edu/~seander/bithacks.html
     */