pirate and fez

sspaink · Aug 23, 2023 · 2ef2c42 · 2ef2c42
1 parent 8d8cf04
commit 2ef2c42
Show file tree

Hide file tree

Showing 128 changed files with 48 additions and 38 deletions.
diff --git a/assets/eyes/pirate.png b/assets/eyes/pirate.png
diff --git a/assets/eyes/pirate_thumb.png b/assets/eyes/pirate_thumb.png
diff --git a/assets/facial_hair/bushy.png b/assets/facial_hair/bushy.png
diff --git a/assets/facial_hair/bushy_thumb.png b/assets/facial_hair/bushy_thumb.png
diff --git a/assets/hats/fez.png b/assets/hats/fez.png
diff --git a/assets/hats/fez_thumb.png b/assets/hats/fez_thumb.png
diff --git a/pregen_crabs/blue_angry_bow_bushy.png b/pregen_crabs/blue_angry_bow_bushy.png
diff --git a/pregen_crabs/blue_angry_bushy.png b/pregen_crabs/blue_angry_bushy.png
diff --git a/pregen_crabs/blue_angry_fez.png b/pregen_crabs/blue_angry_fez.png
diff --git a/pregen_crabs/blue_angry_fez_bushy.png b/pregen_crabs/blue_angry_fez_bushy.png
diff --git a/pregen_crabs/blue_angry_fez_mustache.png b/pregen_crabs/blue_angry_fez_mustache.png
diff --git a/pregen_crabs/blue_angry_top_bushy.png b/pregen_crabs/blue_angry_top_bushy.png
diff --git a/pregen_crabs/blue_girl_bow_bushy.png b/pregen_crabs/blue_girl_bow_bushy.png
diff --git a/pregen_crabs/blue_girl_bushy.png b/pregen_crabs/blue_girl_bushy.png
diff --git a/pregen_crabs/blue_girl_fez.png b/pregen_crabs/blue_girl_fez.png
diff --git a/pregen_crabs/blue_girl_fez_bushy.png b/pregen_crabs/blue_girl_fez_bushy.png
diff --git a/pregen_crabs/blue_girl_fez_mustache.png b/pregen_crabs/blue_girl_fez_mustache.png
diff --git a/pregen_crabs/blue_girl_top_bushy.png b/pregen_crabs/blue_girl_top_bushy.png
diff --git a/pregen_crabs/blue_happy_bow_bushy.png b/pregen_crabs/blue_happy_bow_bushy.png
diff --git a/pregen_crabs/blue_happy_bushy.png b/pregen_crabs/blue_happy_bushy.png
diff --git a/pregen_crabs/blue_happy_fez.png b/pregen_crabs/blue_happy_fez.png
diff --git a/pregen_crabs/blue_happy_fez_bushy.png b/pregen_crabs/blue_happy_fez_bushy.png
diff --git a/pregen_crabs/blue_happy_fez_mustache.png b/pregen_crabs/blue_happy_fez_mustache.png
diff --git a/pregen_crabs/blue_happy_top_bushy.png b/pregen_crabs/blue_happy_top_bushy.png
diff --git a/pregen_crabs/blue_pirate.png b/pregen_crabs/blue_pirate.png
diff --git a/pregen_crabs/blue_pirate_bow.png b/pregen_crabs/blue_pirate_bow.png
diff --git a/pregen_crabs/blue_pirate_bow_bushy.png b/pregen_crabs/blue_pirate_bow_bushy.png
diff --git a/pregen_crabs/blue_pirate_bow_mustache.png b/pregen_crabs/blue_pirate_bow_mustache.png
diff --git a/pregen_crabs/blue_pirate_bushy.png b/pregen_crabs/blue_pirate_bushy.png
diff --git a/pregen_crabs/blue_pirate_fez.png b/pregen_crabs/blue_pirate_fez.png
diff --git a/pregen_crabs/blue_pirate_fez_bushy.png b/pregen_crabs/blue_pirate_fez_bushy.png
diff --git a/pregen_crabs/blue_pirate_fez_mustache.png b/pregen_crabs/blue_pirate_fez_mustache.png
diff --git a/pregen_crabs/blue_pirate_mustache.png b/pregen_crabs/blue_pirate_mustache.png
diff --git a/pregen_crabs/blue_pirate_top.png b/pregen_crabs/blue_pirate_top.png
diff --git a/pregen_crabs/blue_pirate_top_bushy.png b/pregen_crabs/blue_pirate_top_bushy.png
diff --git a/pregen_crabs/blue_pirate_top_mustache.png b/pregen_crabs/blue_pirate_top_mustache.png
diff --git a/pregen_crabs/green_angry_bow_bushy.png b/pregen_crabs/green_angry_bow_bushy.png
diff --git a/pregen_crabs/green_angry_bushy.png b/pregen_crabs/green_angry_bushy.png
diff --git a/pregen_crabs/green_angry_fez.png b/pregen_crabs/green_angry_fez.png
diff --git a/pregen_crabs/green_angry_fez_bushy.png b/pregen_crabs/green_angry_fez_bushy.png
diff --git a/pregen_crabs/green_angry_fez_mustache.png b/pregen_crabs/green_angry_fez_mustache.png
diff --git a/pregen_crabs/green_angry_top_bushy.png b/pregen_crabs/green_angry_top_bushy.png
diff --git a/pregen_crabs/green_girl_bow_bushy.png b/pregen_crabs/green_girl_bow_bushy.png
diff --git a/pregen_crabs/green_girl_bushy.png b/pregen_crabs/green_girl_bushy.png
diff --git a/pregen_crabs/green_girl_fez.png b/pregen_crabs/green_girl_fez.png
diff --git a/pregen_crabs/green_girl_fez_bushy.png b/pregen_crabs/green_girl_fez_bushy.png
diff --git a/pregen_crabs/green_girl_fez_mustache.png b/pregen_crabs/green_girl_fez_mustache.png
diff --git a/pregen_crabs/green_girl_top_bushy.png b/pregen_crabs/green_girl_top_bushy.png
diff --git a/pregen_crabs/green_happy_bow_bushy.png b/pregen_crabs/green_happy_bow_bushy.png
diff --git a/pregen_crabs/green_happy_bushy.png b/pregen_crabs/green_happy_bushy.png
diff --git a/pregen_crabs/green_happy_fez.png b/pregen_crabs/green_happy_fez.png
diff --git a/pregen_crabs/green_happy_fez_bushy.png b/pregen_crabs/green_happy_fez_bushy.png
diff --git a/pregen_crabs/green_happy_fez_mustache.png b/pregen_crabs/green_happy_fez_mustache.png
diff --git a/pregen_crabs/green_happy_top_bushy.png b/pregen_crabs/green_happy_top_bushy.png
diff --git a/pregen_crabs/green_pirate.png b/pregen_crabs/green_pirate.png
diff --git a/pregen_crabs/green_pirate_bow.png b/pregen_crabs/green_pirate_bow.png
diff --git a/pregen_crabs/green_pirate_bow_bushy.png b/pregen_crabs/green_pirate_bow_bushy.png
diff --git a/pregen_crabs/green_pirate_bow_mustache.png b/pregen_crabs/green_pirate_bow_mustache.png
diff --git a/pregen_crabs/green_pirate_bushy.png b/pregen_crabs/green_pirate_bushy.png
diff --git a/pregen_crabs/green_pirate_fez.png b/pregen_crabs/green_pirate_fez.png
diff --git a/pregen_crabs/green_pirate_fez_bushy.png b/pregen_crabs/green_pirate_fez_bushy.png
diff --git a/pregen_crabs/green_pirate_fez_mustache.png b/pregen_crabs/green_pirate_fez_mustache.png
diff --git a/pregen_crabs/green_pirate_mustache.png b/pregen_crabs/green_pirate_mustache.png
diff --git a/pregen_crabs/green_pirate_top.png b/pregen_crabs/green_pirate_top.png
diff --git a/pregen_crabs/green_pirate_top_bushy.png b/pregen_crabs/green_pirate_top_bushy.png
diff --git a/pregen_crabs/green_pirate_top_mustache.png b/pregen_crabs/green_pirate_top_mustache.png
diff --git a/pregen_crabs/orange_angry_bow_bushy.png b/pregen_crabs/orange_angry_bow_bushy.png
diff --git a/pregen_crabs/orange_angry_bushy.png b/pregen_crabs/orange_angry_bushy.png
diff --git a/pregen_crabs/orange_angry_fez.png b/pregen_crabs/orange_angry_fez.png
diff --git a/pregen_crabs/orange_angry_fez_bushy.png b/pregen_crabs/orange_angry_fez_bushy.png
diff --git a/pregen_crabs/orange_angry_fez_mustache.png b/pregen_crabs/orange_angry_fez_mustache.png
diff --git a/pregen_crabs/orange_angry_top_bushy.png b/pregen_crabs/orange_angry_top_bushy.png
diff --git a/pregen_crabs/orange_girl_bow_bushy.png b/pregen_crabs/orange_girl_bow_bushy.png
diff --git a/pregen_crabs/orange_girl_bushy.png b/pregen_crabs/orange_girl_bushy.png
diff --git a/pregen_crabs/orange_girl_fez.png b/pregen_crabs/orange_girl_fez.png
diff --git a/pregen_crabs/orange_girl_fez_bushy.png b/pregen_crabs/orange_girl_fez_bushy.png
diff --git a/pregen_crabs/orange_girl_fez_mustache.png b/pregen_crabs/orange_girl_fez_mustache.png
diff --git a/pregen_crabs/orange_girl_top_bushy.png b/pregen_crabs/orange_girl_top_bushy.png
diff --git a/pregen_crabs/orange_happy_bow_bushy.png b/pregen_crabs/orange_happy_bow_bushy.png
diff --git a/pregen_crabs/orange_happy_bushy.png b/pregen_crabs/orange_happy_bushy.png
diff --git a/pregen_crabs/orange_happy_fez.png b/pregen_crabs/orange_happy_fez.png
diff --git a/pregen_crabs/orange_happy_fez_bushy.png b/pregen_crabs/orange_happy_fez_bushy.png
diff --git a/pregen_crabs/orange_happy_fez_mustache.png b/pregen_crabs/orange_happy_fez_mustache.png
diff --git a/pregen_crabs/orange_happy_top_bushy.png b/pregen_crabs/orange_happy_top_bushy.png
diff --git a/pregen_crabs/orange_pirate.png b/pregen_crabs/orange_pirate.png
diff --git a/pregen_crabs/orange_pirate_bow.png b/pregen_crabs/orange_pirate_bow.png
diff --git a/pregen_crabs/orange_pirate_bow_bushy.png b/pregen_crabs/orange_pirate_bow_bushy.png
diff --git a/pregen_crabs/orange_pirate_bow_mustache.png b/pregen_crabs/orange_pirate_bow_mustache.png
diff --git a/pregen_crabs/orange_pirate_bushy.png b/pregen_crabs/orange_pirate_bushy.png
diff --git a/pregen_crabs/orange_pirate_fez.png b/pregen_crabs/orange_pirate_fez.png
diff --git a/pregen_crabs/orange_pirate_fez_bushy.png b/pregen_crabs/orange_pirate_fez_bushy.png
diff --git a/pregen_crabs/orange_pirate_fez_mustache.png b/pregen_crabs/orange_pirate_fez_mustache.png
diff --git a/pregen_crabs/orange_pirate_mustache.png b/pregen_crabs/orange_pirate_mustache.png
diff --git a/pregen_crabs/orange_pirate_top.png b/pregen_crabs/orange_pirate_top.png
diff --git a/pregen_crabs/orange_pirate_top_bushy.png b/pregen_crabs/orange_pirate_top_bushy.png
diff --git a/pregen_crabs/orange_pirate_top_mustache.png b/pregen_crabs/orange_pirate_top_mustache.png
diff --git a/pregen_crabs/purple_angry_bow_bushy.png b/pregen_crabs/purple_angry_bow_bushy.png
diff --git a/pregen_crabs/purple_angry_bushy.png b/pregen_crabs/purple_angry_bushy.png
diff --git a/pregen_crabs/purple_angry_fez.png b/pregen_crabs/purple_angry_fez.png
diff --git a/pregen_crabs/purple_angry_fez_bushy.png b/pregen_crabs/purple_angry_fez_bushy.png
diff --git a/pregen_crabs/purple_angry_fez_mustache.png b/pregen_crabs/purple_angry_fez_mustache.png
diff --git a/pregen_crabs/purple_angry_top_bushy.png b/pregen_crabs/purple_angry_top_bushy.png
diff --git a/pregen_crabs/purple_girl_bow_bushy.png b/pregen_crabs/purple_girl_bow_bushy.png
diff --git a/pregen_crabs/purple_girl_bushy.png b/pregen_crabs/purple_girl_bushy.png
diff --git a/pregen_crabs/purple_girl_fez.png b/pregen_crabs/purple_girl_fez.png
diff --git a/pregen_crabs/purple_girl_fez_bushy.png b/pregen_crabs/purple_girl_fez_bushy.png
diff --git a/pregen_crabs/purple_girl_fez_mustache.png b/pregen_crabs/purple_girl_fez_mustache.png
diff --git a/pregen_crabs/purple_girl_top_bushy.png b/pregen_crabs/purple_girl_top_bushy.png
diff --git a/pregen_crabs/purple_happy_bow_bushy.png b/pregen_crabs/purple_happy_bow_bushy.png
diff --git a/pregen_crabs/purple_happy_bushy.png b/pregen_crabs/purple_happy_bushy.png
diff --git a/pregen_crabs/purple_happy_fez.png b/pregen_crabs/purple_happy_fez.png
diff --git a/pregen_crabs/purple_happy_fez_bushy.png b/pregen_crabs/purple_happy_fez_bushy.png
diff --git a/pregen_crabs/purple_happy_fez_mustache.png b/pregen_crabs/purple_happy_fez_mustache.png
diff --git a/pregen_crabs/purple_happy_top_bushy.png b/pregen_crabs/purple_happy_top_bushy.png
diff --git a/pregen_crabs/purple_pirate.png b/pregen_crabs/purple_pirate.png
diff --git a/pregen_crabs/purple_pirate_bow.png b/pregen_crabs/purple_pirate_bow.png
diff --git a/pregen_crabs/purple_pirate_bow_bushy.png b/pregen_crabs/purple_pirate_bow_bushy.png
diff --git a/pregen_crabs/purple_pirate_bow_mustache.png b/pregen_crabs/purple_pirate_bow_mustache.png
diff --git a/pregen_crabs/purple_pirate_bushy.png b/pregen_crabs/purple_pirate_bushy.png
diff --git a/pregen_crabs/purple_pirate_fez.png b/pregen_crabs/purple_pirate_fez.png
diff --git a/pregen_crabs/purple_pirate_fez_bushy.png b/pregen_crabs/purple_pirate_fez_bushy.png
diff --git a/pregen_crabs/purple_pirate_fez_mustache.png b/pregen_crabs/purple_pirate_fez_mustache.png
diff --git a/pregen_crabs/purple_pirate_mustache.png b/pregen_crabs/purple_pirate_mustache.png
diff --git a/pregen_crabs/purple_pirate_top.png b/pregen_crabs/purple_pirate_top.png
diff --git a/pregen_crabs/purple_pirate_top_bushy.png b/pregen_crabs/purple_pirate_top_bushy.png
diff --git a/pregen_crabs/purple_pirate_top_mustache.png b/pregen_crabs/purple_pirate_top_mustache.png
diff --git a/src/app.rs b/src/app.rs
@@ -50,42 +50,44 @@ impl eframe::App for App {
             .resizable(false)
             .min_width(200.0)
             .show(ctx, |ui| {
-                display_thumbnails(
-                    "Color",
-                    &mut ferris.color,
-                    ctx,
-                    ui,
-                    &assets.colors,
-                    false,
-                    &assets.remove_thumb,
-                );
-                display_thumbnails(
-                    "Eyes",
-                    &mut ferris.eyes,
-                    ctx,
-                    ui,
-                    &assets.eyes,
-                    false,
-                    &assets.remove_thumb,
-                );
-                display_thumbnails(
-                    "Hat",
-                    &mut ferris.hat,
-                    ctx,
-                    ui,
-                    &assets.hats,
-                    true,
-                    &assets.remove_thumb,
-                );
-                display_thumbnails(
-                    "Facial Hair",
-                    &mut ferris.facial_hair,
-                    ctx,
-                    ui,
-                    &assets.facial_hair,
-                    true,
-                    &assets.remove_thumb,
-                );
+                egui::ScrollArea::vertical().show(ui, |ui| {
+                    display_thumbnails(
+                        "Color",
+                        &mut ferris.color,
+                        ctx,
+                        ui,
+                        &assets.colors,
+                        false,
+                        &assets.remove_thumb,
+                    );
+                    display_thumbnails(
+                        "Eyes",
+                        &mut ferris.eyes,
+                        ctx,
+                        ui,
+                        &assets.eyes,
+                        false,
+                        &assets.remove_thumb,
+                    );
+                    display_thumbnails(
+                        "Hat",
+                        &mut ferris.hat,
+                        ctx,
+                        ui,
+                        &assets.hats,
+                        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() {

diff --git a/src/assets.rs b/src/assets.rs
@@ -58,6 +58,7 @@ impl Assets {
             load_image!("eyes", "happy"),
             load_image!("eyes", "girl"),
             load_image!("eyes", "angry"),
+            load_image!("eyes", "pirate"),
         ];
         category_count.push(images.len());
 
@@ -67,7 +68,11 @@ impl Assets {
 
         let mut hats: HashMap<String, Image> = HashMap::new();
 
-        let images = [load_image!("hats", "top"), load_image!("hats", "bow")];
+        let images = [
+            load_image!("hats", "top"),
+            load_image!("hats", "bow"),
+            load_image!("hats", "fez"),
+        ];
         category_count.push(images.len() + 1);
 
         for i in images {
@@ -76,7 +81,10 @@ impl Assets {
 
         let mut facial_hair: HashMap<String, Image> = HashMap::new();
 
-        let images = [load_image!("facial_hair", "mustache")];
+        let images = [
+            load_image!("facial_hair", "mustache"),
+            load_image!("facial_hair", "bushy"),
+        ];
         category_count.push(images.len() + 1);
 
         for i in images {