mustache

sspaink · Aug 22, 2023 · 8d8cf04 · 8d8cf04
1 parent 41d2432
commit 8d8cf04
Show file tree

Hide file tree

Showing 42 changed files with 28 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 :crab: Try it out: <https://sspaink.github.io/rustaceanize.me/> :crab:
 
-Make your own personal [Rust mascot](https://rustacean.net/)!
+Make your own custom [Rust mascot](https://rustacean.net/)!
 
 ![logo](pregen_crabs/orange_happy_top.png)
 

diff --git a/assets/facial_hair/mustache.png b/assets/facial_hair/mustache.png
diff --git a/assets/facial_hair/mustache_thumb.png b/assets/facial_hair/mustache_thumb.png
diff --git a/image_gen/src/main.rs b/image_gen/src/main.rs
@@ -53,6 +53,10 @@ fn main() {
 
     merged.extend(merge(&merged, &hats));
 
+    let facial_hair: HashMap<String, DynamicImage> = load_images("facial_hair");
+
+    merged.extend(merge(&merged, &facial_hair));
+
     for (name, image) in merged {
         image.save(format!("{ROOT_DIR}/{name}.png")).unwrap();
     }

diff --git a/pregen_crabs/blue_angry_bow_mustache.png b/pregen_crabs/blue_angry_bow_mustache.png
diff --git a/pregen_crabs/blue_angry_mustache.png b/pregen_crabs/blue_angry_mustache.png
diff --git a/pregen_crabs/blue_angry_top_mustache.png b/pregen_crabs/blue_angry_top_mustache.png
diff --git a/pregen_crabs/blue_girl_bow_mustache.png b/pregen_crabs/blue_girl_bow_mustache.png
diff --git a/pregen_crabs/blue_girl_mustache.png b/pregen_crabs/blue_girl_mustache.png
diff --git a/pregen_crabs/blue_girl_top_mustache.png b/pregen_crabs/blue_girl_top_mustache.png
diff --git a/pregen_crabs/blue_happy_bow_mustache.png b/pregen_crabs/blue_happy_bow_mustache.png
diff --git a/pregen_crabs/blue_happy_mustache.png b/pregen_crabs/blue_happy_mustache.png
diff --git a/pregen_crabs/blue_happy_top_mustache.png b/pregen_crabs/blue_happy_top_mustache.png
diff --git a/pregen_crabs/green_angry_bow_mustache.png b/pregen_crabs/green_angry_bow_mustache.png
diff --git a/pregen_crabs/green_angry_mustache.png b/pregen_crabs/green_angry_mustache.png
diff --git a/pregen_crabs/green_angry_top_mustache.png b/pregen_crabs/green_angry_top_mustache.png
diff --git a/pregen_crabs/green_girl_bow_mustache.png b/pregen_crabs/green_girl_bow_mustache.png
diff --git a/pregen_crabs/green_girl_mustache.png b/pregen_crabs/green_girl_mustache.png
diff --git a/pregen_crabs/green_girl_top_mustache.png b/pregen_crabs/green_girl_top_mustache.png
diff --git a/pregen_crabs/green_happy_bow_mustache.png b/pregen_crabs/green_happy_bow_mustache.png
diff --git a/pregen_crabs/green_happy_mustache.png b/pregen_crabs/green_happy_mustache.png
diff --git a/pregen_crabs/green_happy_top_mustache.png b/pregen_crabs/green_happy_top_mustache.png
diff --git a/pregen_crabs/orange_angry_bow_mustache.png b/pregen_crabs/orange_angry_bow_mustache.png
diff --git a/pregen_crabs/orange_angry_mustache.png b/pregen_crabs/orange_angry_mustache.png
diff --git a/pregen_crabs/orange_angry_top_mustache.png b/pregen_crabs/orange_angry_top_mustache.png
diff --git a/pregen_crabs/orange_girl_bow_mustache.png b/pregen_crabs/orange_girl_bow_mustache.png
diff --git a/pregen_crabs/orange_girl_mustache.png b/pregen_crabs/orange_girl_mustache.png
diff --git a/pregen_crabs/orange_girl_top_mustache.png b/pregen_crabs/orange_girl_top_mustache.png
diff --git a/pregen_crabs/orange_happy_bow_mustache.png b/pregen_crabs/orange_happy_bow_mustache.png
diff --git a/pregen_crabs/orange_happy_mustache.png b/pregen_crabs/orange_happy_mustache.png
diff --git a/pregen_crabs/orange_happy_top_mustache.png b/pregen_crabs/orange_happy_top_mustache.png
diff --git a/pregen_crabs/purple_angry_bow_mustache.png b/pregen_crabs/purple_angry_bow_mustache.png
diff --git a/pregen_crabs/purple_angry_mustache.png b/pregen_crabs/purple_angry_mustache.png
diff --git a/pregen_crabs/purple_angry_top_mustache.png b/pregen_crabs/purple_angry_top_mustache.png
diff --git a/pregen_crabs/purple_girl_bow_mustache.png b/pregen_crabs/purple_girl_bow_mustache.png
diff --git a/pregen_crabs/purple_girl_mustache.png b/pregen_crabs/purple_girl_mustache.png
diff --git a/pregen_crabs/purple_girl_top_mustache.png b/pregen_crabs/purple_girl_top_mustache.png
diff --git a/pregen_crabs/purple_happy_bow_mustache.png b/pregen_crabs/purple_happy_bow_mustache.png
diff --git a/pregen_crabs/purple_happy_mustache.png b/pregen_crabs/purple_happy_mustache.png
diff --git a/pregen_crabs/purple_happy_top_mustache.png b/pregen_crabs/purple_happy_top_mustache.png
diff --git a/src/app.rs b/src/app.rs
@@ -11,6 +11,7 @@ struct Body {
     color: Option<String>,
     eyes: Option<String>,
     hat: Option<String>,
+    facial_hair: Option<String>,
 }
 
 pub struct App {
@@ -26,6 +27,7 @@ impl Default for App {
                 color: Some("orange".to_string()),
                 eyes: Some("happy".to_string()),
                 hat: None,
+                facial_hair: None,
             },
         }
     }
@@ -75,6 +77,15 @@ impl eframe::App for App {
                     true,
                     &assets.remove_thumb,
                 );
+                display_thumbnails(
+                    "Facial Hair",
+                    &mut ferris.facial_hair,
+                    ctx,
+                    ui,
+                    &assets.facial_hair,
+                    true,
+                    &assets.remove_thumb,
+                );
 
                 ui.vertical_centered_justified(|ui| {
                     if ui.button(RichText::new("save").size(30.0)).clicked() {
@@ -127,6 +138,7 @@ impl eframe::App for App {
         display_bodyparts(ctx, &mut ferris.color, &assets.colors);
         display_bodyparts(ctx, &mut ferris.eyes, &assets.eyes);
         display_bodyparts(ctx, &mut ferris.hat, &assets.hats);
+        display_bodyparts(ctx, &mut ferris.facial_hair, &assets.facial_hair);
 
         egui::CentralPanel::default().show(ctx, |_| {});
     }

diff --git a/src/assets.rs b/src/assets.rs
@@ -11,6 +11,7 @@ pub struct Assets {
     pub colors: HashMap<String, Image>,
     pub eyes: HashMap<String, Image>,
     pub hats: HashMap<String, Image>,
+    pub facial_hair: HashMap<String, Image>,
     pub remove_thumb: RetainedImage,
 }
 
@@ -73,6 +74,15 @@ impl Assets {
             hats.insert(i.0, i.1);
         }
 
+        let mut facial_hair: HashMap<String, Image> = HashMap::new();
+
+        let images = [load_image!("facial_hair", "mustache")];
+        category_count.push(images.len() + 1);
+
+        for i in images {
+            facial_hair.insert(i.0, i.1);
+        }
+
         let remove_thumb =
             RetainedImage::from_image_bytes("remove", include_bytes!("../assets/remove_thumb.png"))
                 .unwrap();
@@ -88,6 +98,7 @@ impl Assets {
             colors,
             eyes,
             hats,
+            facial_hair,
             remove_thumb,
         }
     }