[#72] Add Neckline::None

Orchaldir · Sep 17, 2023 · 0b86430 · 0b86430
1 parent c907124
commit 0b86430
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/rpg_tools_core/src/model/equipment/appearance/shirt.rs b/rpg_tools_core/src/model/equipment/appearance/shirt.rs
@@ -15,9 +15,10 @@ pub struct Shirt {
 #[derive(Convert, ui, Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Neckline {
     Boat,
-    #[default]
     Crew,
     DeepV,
+    #[default]
+    None,
     Scoop,
     V,
 }

diff --git a/rpg_tools_rendering/src/rendering/equipment/shirt.rs b/rpg_tools_rendering/src/rendering/equipment/shirt.rs
@@ -28,6 +28,7 @@ fn add_neckline(aabb: &AABB, torso: &TorsoConfig, shirt: &Shirt, builder: &mut P
         Neckline::Boat => add_round(&aabb, torso, builder, 0.7, 0.05),
         Neckline::Crew => add_round(&aabb, torso, builder, 0.3, 0.1),
         Neckline::DeepV => add_v(&aabb, torso, builder, 0.4),
+        Neckline::None => {}
         Neckline::Scoop => add_round(&aabb, torso, builder, 0.5, 0.2),
         Neckline::V => add_v(&aabb, torso, builder, 0.2),
     }
@@ -42,7 +43,7 @@ fn add_round(
 ) {
     let width = torso.shoulder_width * width;
     builder.add_mirrored_points(&aabb, width, 0.0, true);
-    builder.add_mirrored_points(&aabb, width, depth, false);
+    builder.add_mirrored_points(&aabb, width * 0.7, depth, false);
 }
 
 fn add_v(aabb: &&AABB, torso: &TorsoConfig, builder: &mut Polygon2dBuilder, depth: f32) {