add angry eyes and bow

sspaink · Aug 22, 2023 · 41d2432 · 41d2432
1 parent 76a1682
commit 41d2432
Show file tree

Hide file tree

Showing 27 changed files with 20 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# rustaceanize.me
+# [rustaceanize.me](https://sspaink.github.io/rustaceanize.me/)
 
 :crab: Try it out: <https://sspaink.github.io/rustaceanize.me/> :crab:
 

diff --git a/assets/eyes/angry.png b/assets/eyes/angry.png
diff --git a/assets/eyes/angry_thumb.png b/assets/eyes/angry_thumb.png
diff --git a/assets/hats/bow.png b/assets/hats/bow.png
diff --git a/assets/hats/bow_thumb.png b/assets/hats/bow_thumb.png
diff --git a/pregen_crabs/blue_angry.png b/pregen_crabs/blue_angry.png
diff --git a/pregen_crabs/blue_angry_bow.png b/pregen_crabs/blue_angry_bow.png
diff --git a/pregen_crabs/blue_angry_top.png b/pregen_crabs/blue_angry_top.png
diff --git a/pregen_crabs/blue_girl_bow.png b/pregen_crabs/blue_girl_bow.png
diff --git a/pregen_crabs/blue_happy_bow.png b/pregen_crabs/blue_happy_bow.png
diff --git a/pregen_crabs/green_angry.png b/pregen_crabs/green_angry.png
diff --git a/pregen_crabs/green_angry_bow.png b/pregen_crabs/green_angry_bow.png
diff --git a/pregen_crabs/green_angry_top.png b/pregen_crabs/green_angry_top.png
diff --git a/pregen_crabs/green_girl_bow.png b/pregen_crabs/green_girl_bow.png
diff --git a/pregen_crabs/green_happy_bow.png b/pregen_crabs/green_happy_bow.png
diff --git a/pregen_crabs/orange_angry.png b/pregen_crabs/orange_angry.png
diff --git a/pregen_crabs/orange_angry_bow.png b/pregen_crabs/orange_angry_bow.png
diff --git a/pregen_crabs/orange_angry_top.png b/pregen_crabs/orange_angry_top.png
diff --git a/pregen_crabs/orange_girl_bow.png b/pregen_crabs/orange_girl_bow.png
diff --git a/pregen_crabs/orange_happy_bow.png b/pregen_crabs/orange_happy_bow.png
diff --git a/pregen_crabs/purple_angry.png b/pregen_crabs/purple_angry.png
diff --git a/pregen_crabs/purple_angry_bow.png b/pregen_crabs/purple_angry_bow.png
diff --git a/pregen_crabs/purple_angry_top.png b/pregen_crabs/purple_angry_top.png
diff --git a/pregen_crabs/purple_girl_bow.png b/pregen_crabs/purple_girl_bow.png
diff --git a/pregen_crabs/purple_happy_bow.png b/pregen_crabs/purple_happy_bow.png
diff --git a/src/app.rs b/src/app.rs
@@ -144,19 +144,21 @@ fn display_thumbnails(
     ui.collapsing(RichText::new(id).size(20.0).strong(), |ui| {
         egui::Grid::new(id).show(ui, |ui| {
             let mut current = 0;
+            if removable {
+                current += 1;
+            }
+            if removable
+                && ui
+                    .add(egui::ImageButton::new(
+                        remove_thumb.texture_id(ctx),
+                        remove_thumb.size_vec2(),
+                    ))
+                    .clicked()
+            {
+                *active = None
+            };
 
             for (name, image) in assets.iter() {
-                if removable
-                    && ui
-                        .add(egui::ImageButton::new(
-                            remove_thumb.texture_id(ctx),
-                            remove_thumb.size_vec2(),
-                        ))
-                        .clicked()
-                {
-                    *active = None
-                };
-
                 if ui
                     .add(egui::ImageButton::new(
                         image.thumb.texture_id(ctx),

diff --git a/src/assets.rs b/src/assets.rs
@@ -53,7 +53,11 @@ impl Assets {
 
         let mut eyes: HashMap<String, Image> = HashMap::new();
 
-        let images = [load_image!("eyes", "happy"), load_image!("eyes", "girl")];
+        let images = [
+            load_image!("eyes", "happy"),
+            load_image!("eyes", "girl"),
+            load_image!("eyes", "angry"),
+        ];
         category_count.push(images.len());
 
         for i in images {
@@ -62,7 +66,7 @@ impl Assets {
 
         let mut hats: HashMap<String, Image> = HashMap::new();
 
-        let images = [load_image!("hats", "top")];
+        let images = [load_image!("hats", "top"), load_image!("hats", "bow")];
         category_count.push(images.len() + 1);
 
         for i in images {