From f1c341fdbcd0ea269413050f045f33a4d9aa8f64 Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Fri, 1 Oct 2021 20:41:23 -0400
Subject: [PATCH] bloom shading

---
 game/assets/shaders/pixelart.fs | 28 ++++++++++++++--------------
 game/src/utilities/datastore.rs | 11 -----------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/game/assets/shaders/pixelart.fs b/game/assets/shaders/pixelart.fs
index 13152c9..c7b4846 100644
--- a/game/assets/shaders/pixelart.fs
+++ b/game/assets/shaders/pixelart.fs
@@ -44,18 +44,6 @@ void main() {
   // Calculate a UV for this new blocky pixel
   vec2 pixelatedUV = vec2(dx * floor(baseUV.x / dx), dy * floor(baseUV.y / dy));
 
-  // --- BEGIN BLOOM EFFECT ---
-
-  vec2 sizeFactor = vec2(1) / viewport * bloomQuality;
-  vec4 textureSum = vec4(0);
-
-  const int range = 2;
-  for (int x = -range; x <= range; x++) {
-    for (int y = -range; y <= range; y++) {
-      textureSum += texture(texture0, fragTexCoord + vec2(x, y) * sizeFactor);
-    }
-  }
-
   // --- BEGIN CRT SHADER ---
 
   // Warp the UVs of the pixelated texture
@@ -74,13 +62,25 @@ void main() {
     return;
   }
 
+  // --- BEGIN BLOOM EFFECT ---
+
+  vec2 sizeFactor = vec2(1) / viewport * bloomQuality;
+  vec4 textureSum = vec4(0);
+
+  const int range = 2;
+  for (int x = -range; x <= range; x++) {
+    for (int y = -range; y <= range; y++) {
+      textureSum += texture(texture0, warpedUV + vec2(x, y) * sizeFactor);
+    }
+  }
+
   // Determine factor of if we are rendering on a scanline
   float scanlineFactor =
       abs(sin(fragTexCoord.y * viewport.y) * 0.5 * scanlineDarkness);
 
   // Build the final pixel
   vec4 texWithBloom =
-      ((textureSum / (bloomSamples * bloomSamples)) + texture0) * colDiffuse;
+      ((textureSum / (bloomSamples * bloomSamples)) + texture(texture0, warpedUV)) * colDiffuse;
   finalColor = vec4(
-      mix(texture(texWithBloom, warpedUV).rgb, vec3(0.0), scanlineFactor), 1.0);
+      mix(texWithBloom.rgb, vec3(0.0), scanlineFactor), 1.0);
 }
diff --git a/game/src/utilities/datastore.rs b/game/src/utilities/datastore.rs
index 6689440..506f46d 100644
--- a/game/src/utilities/datastore.rs
+++ b/game/src/utilities/datastore.rs
@@ -65,14 +65,3 @@ pub fn load_texture_from_internal_data(
 
     Ok(texture)
 }
-
-pub fn load_tilemap_from_internal_data(&str path)
-    -> Result<Texture2D, TiledError> {
-
-        let temp_dir = tempdir()?;
-        let tmp_path = temp_dir.path().join(Path::new(path).file_name().unwrap());
-
-        std::fs::write(
-            &tmp_path
-        )
-}