[#42] Update examples

Orchaldir · Sep 23, 2023 · 97a87fe · 97a87fe
1 parent 7b8b89e
commit 97a87fe
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/rpg_tools_rendering/examples/pants.rs b/rpg_tools_rendering/examples/pants.rs
@@ -1,7 +1,7 @@
 extern crate rpg_tools_core;
 extern crate rpg_tools_rendering;
 
-use crate::utils::render::render_2_sets;
+use crate::utils::render::{add_names, render_2_sets};
 use rpg_tools_core::model::character::appearance::body::{Body, BodyShape};
 use rpg_tools_core::model::character::appearance::Appearance;
 use rpg_tools_core::model::color::Color;
@@ -21,17 +21,20 @@ fn main() {
     render_2_sets(
         "pants.svg",
         pants,
-        BodyShape::get_all(),
+        add_names(BodyShape::get_all()),
         create_appearance,
         false,
     );
 }
 
-fn create(style: PantsStyle) -> Pants {
-    Pants {
-        style,
-        color: Color::Blue,
-    }
+fn create(style: PantsStyle) -> (String, Pants) {
+    (
+        style.to_string(),
+        Pants {
+            style,
+            color: Color::Blue,
+        },
+    )
 }
 
 fn create_appearance(height: Length, pants: &Pants, shape: &BodyShape) -> Appearance {

diff --git a/rpg_tools_rendering/examples/shirts.rs b/rpg_tools_rendering/examples/shirts.rs
@@ -1,7 +1,7 @@
 extern crate rpg_tools_core;
 extern crate rpg_tools_rendering;
 
-use crate::utils::render::render_2_sets;
+use crate::utils::render::{add_names, render_2_sets};
 use rpg_tools_core::model::character::appearance::body::{Body, BodyShape};
 use rpg_tools_core::model::character::appearance::Appearance;
 use rpg_tools_core::model::color::Color;
@@ -16,23 +16,30 @@ fn main() {
 
     for neckline in Neckline::get_all() {
         for sleeve_style in SleeveStyle::get_all() {
-            shirts.push(Shirt {
-                sleeve_style,
-                neckline,
-                color: Color::Aqua,
-            })
+            shirts.push(create(neckline, sleeve_style))
         }
     }
 
     render_2_sets(
         "shirts.svg",
         shirts,
-        BodyShape::get_all(),
+        add_names(BodyShape::get_all()),
         create_appearance,
         false,
     );
 }
 
+fn create(neckline: Neckline, sleeve_style: SleeveStyle) -> (String, Shirt) {
+    (
+        format!("{} {}", neckline, sleeve_style),
+        Shirt {
+            sleeve_style,
+            neckline,
+            color: Color::Aqua,
+        },
+    )
+}
+
 fn create_appearance(height: Length, shirt: &Shirt, shape: &BodyShape) -> Appearance {
     Appearance::humanoid(
         Body {