From 6b1af0a943e668637a7853d93ee3671ad6692ef8 Mon Sep 17 00:00:00 2001
From: Thomas Forgione <thomas@forgione.fr>
Date: Wed, 3 Apr 2019 15:49:51 +0200
Subject: [PATCH] Fix transparency bug

---
 assets/textures/grass.png | Bin 0 -> 2970 bytes
 build.rs                  |  25 +++++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 assets/textures/grass.png

diff --git a/assets/textures/grass.png b/assets/textures/grass.png
new file mode 100644
index 0000000000000000000000000000000000000000..6dfc320d9e3da32ef8fd41b4c9ebbc572b3e00c5
GIT binary patch
literal 2970
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
Q$p8QV07*qoM6N<$f;kei$^ZZW

literal 0
HcmV?d00001

diff --git a/build.rs b/build.rs
index 879bf6c..a7cbc4f 100644
--- a/build.rs
+++ b/build.rs
@@ -1,6 +1,6 @@
 use std::fs::create_dir_all;
 
-use image::RgbaImage;
+use image::{RgbaImage, GenericImage};
 use image::imageops::{rotate90, rotate180, rotate270};
 
 fn superpose(image: &RgbaImage, superposition: &RgbaImage) -> RgbaImage {
@@ -20,12 +20,15 @@ fn superpose(image: &RgbaImage, superposition: &RgbaImage) -> RgbaImage {
 
 fn main() {
     create_dir_all("assets/textures-generated").unwrap();
-    let background = image::open("assets/textures/grass/background.png").unwrap().to_rgba();
-    let border = image::open("assets/textures/grass/border.png").unwrap().to_rgba();
-    let corner_horiz = image::open("assets/textures/grass/corner-horiz.png").unwrap().to_rgba();
-    let corner_vert = image::open("assets/textures/grass/corner-vert.png").unwrap().to_rgba();
-    let corner_inside = image::open("assets/textures/grass/corner-inside.png").unwrap().to_rgba();
-    let corner_outside = image::open("assets/textures/grass/corner-outside.png").unwrap().to_rgba();
+    let mut texture = image::open("assets/textures/grass.png").unwrap().to_rgba();
+    let background = texture.sub_image(0, 0, 32, 32).to_image();
+    let border = texture.sub_image(32, 0, 32, 32).to_image();
+    let corner_horiz = texture.sub_image(32 * 2 , 0, 32, 32).to_image();
+    let corner_vert =    texture.sub_image(32 * 3, 0, 32, 32).to_image();
+    let corner_inside =  texture.sub_image(32 * 4, 0, 32, 32).to_image();
+    let corner_outside = texture.sub_image(32 * 5, 0, 32, 32).to_image();
+    let mut background_color = texture.sub_image(32 * 6, 0, 32, 32);
+    let background_color = background_color.get_pixel_mut(0, 0);
 
     let mut vec = vec![];
 
@@ -181,10 +184,12 @@ fn main() {
     for (index, image) in vec.into_iter().enumerate() {
         for y in 0 .. image.width() {
             for x in 0 .. image.height() {
-                *output.get_pixel_mut(x + 32 * index as u32, y) = *background.get_pixel(x, y);
                 let new_pixel = image.get_pixel(x, y);
-                if new_pixel[3] > 0 {
-                    *output.get_pixel_mut(x + 32 * index as u32, y) = *new_pixel;
+                if new_pixel != background_color {
+                    *output.get_pixel_mut(x + 32 * index as u32, y) = *background.get_pixel(x, y);
+                    if new_pixel[3] > 0 {
+                        *output.get_pixel_mut(x + 32 * index as u32, y) = *new_pixel;
+                    }
                 }
             }
         }