From 6f023a222184f70bce8291d9dcaced3f59df17a8 Mon Sep 17 00:00:00 2001
From: Math/Nuba <quintana.mathieu@yahoo.fr>
Date: Fri, 23 Feb 2024 16:37:01 +0100
Subject: [PATCH] Change names

---
 dessin/src/contrib/layout.rs            | 4 ++--
 dessin/src/contrib/polygone.rs          | 8 ++++----
 examples/animation.rs                   | 7 ++++---
 examples/blue_triangle_with_macro.rs    | 4 ++--
 examples/blue_triangle_without_macro.rs | 4 ++--
 examples/diamond_without_macro.rs       | 4 ++--
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/dessin/src/contrib/layout.rs b/dessin/src/contrib/layout.rs
index e61379a..71ef6f7 100644
--- a/dessin/src/contrib/layout.rs
+++ b/dessin/src/contrib/layout.rs
@@ -237,7 +237,7 @@ mod tests {
 
     #[test]
     fn layout_of_polygons() {
-        let height_triangle = polygons::Triangle::default()
+        let height_triangle = polygons::TriangleEquilateral::default()
             .as_shape()
             .local_bounding_box()
             .height();
@@ -245,7 +245,7 @@ mod tests {
         assert_float_absolute_eq!(height_triangle, 2. * (3f32.sqrt() / 2.), 10e-5);
 
         let shape = dessin2!([VerticalLayout(
-            of = dessin2!(polygons::Triangle()),
+            of = dessin2!(polygons::TriangleEquilateral()),
             of = dessin2!(Circle(radius = 1.)),
         )]);
 
diff --git a/dessin/src/contrib/polygone.rs b/dessin/src/contrib/polygone.rs
index 86458d4..b8a3c84 100644
--- a/dessin/src/contrib/polygone.rs
+++ b/dessin/src/contrib/polygone.rs
@@ -6,8 +6,8 @@ use std::f32::consts::TAU;
 pub mod polygons {
     use super::Polygon;
 
-    /// Triangle
-    pub type Triangle = Polygon<3>;
+    /// Equilaterl Triangle
+    pub type TriangleEquilateral = Polygon<3>;
     /// Square
     pub type Square = Polygon<4>;
     /// Pentagon
@@ -62,7 +62,7 @@ fn triangle() {
 
     let sqrt3_over_2 = 3f32.sqrt() / 2.;
 
-    let Shape::Curve(triangle) = Triangle::default().as_shape() else {
+    let Shape::Curve(triangle) = TriangleEquilateral::default().as_shape() else {
         panic!("Not a curve");
     };
 
@@ -122,7 +122,7 @@ fn triangle_in_group() {
         local_transform,
         shapes,
         ..
-    }) = dessin2!([Triangle()])
+    }) = dessin2!([TriangleEquilateral()])
     else {
         panic!("Not a group");
     };
diff --git a/examples/animation.rs b/examples/animation.rs
index 2e0bf20..97d2ac0 100644
--- a/examples/animation.rs
+++ b/examples/animation.rs
@@ -5,9 +5,10 @@ use dessin_image::*;
 use dessin_svg::*;
 
 fn main() {
-    let test_img = dessin2!(polygons::Triangle!(fill = Color::BLUE) > (scale = [50., 50.]))
-        .rasterize()
-        .unwrap();
+    let test_img =
+        dessin2!(polygons::TriangleEquilateral!(fill = Color::BLUE) > (scale = [50., 50.]))
+            .rasterize()
+            .unwrap();
 
     let triangle = Default::default();
 
diff --git a/examples/blue_triangle_with_macro.rs b/examples/blue_triangle_with_macro.rs
index 08cbb9c..8b2800b 100644
--- a/examples/blue_triangle_with_macro.rs
+++ b/examples/blue_triangle_with_macro.rs
@@ -5,11 +5,11 @@ use dessin_svg::ToSVG;
 
 use dessin::nalgebra::{Rotation2, Scale2};
 
-use dessin::prelude::polygons::Triangle;
+use dessin::prelude::polygons::TriangleEquilateral;
 
 fn main() {
     let triangle: Shape = dessin!([
-         Triangle: #(
+        TriangleEquilateral: #(
 
          // chooses an equilateral triangle [(x,x) => equilateral] with a size of 5. [if you want an isosceles triangle : (x,y)]
          scale={Scale2::new(5., 5.)}
diff --git a/examples/blue_triangle_without_macro.rs b/examples/blue_triangle_without_macro.rs
index 061b1a2..f8a530e 100644
--- a/examples/blue_triangle_without_macro.rs
+++ b/examples/blue_triangle_without_macro.rs
@@ -5,11 +5,11 @@ use dessin_svg::ToSVG;
 
 use dessin::nalgebra::{Rotation2, Scale2};
 
-use dessin::prelude::polygons::Triangle;
+use dessin::prelude::polygons::TriangleEquilateral;
 
 fn main() {
     // creates a rectangle with a width of 11 and a height of 6
-    let triangle = Triangle::default();
+    let triangle = TriangleEquilateral::default();
 
     let mut triangle = Style::new(triangle);
 
diff --git a/examples/diamond_without_macro.rs b/examples/diamond_without_macro.rs
index ade51ce..b8e7f53 100644
--- a/examples/diamond_without_macro.rs
+++ b/examples/diamond_without_macro.rs
@@ -1,6 +1,6 @@
 use std::fs;
 
-use dessin::{prelude::*, shapes};
+use dessin::prelude::*;
 use dessin_svg::ToSVG;
 
 use dessin::nalgebra::Rotation2;
@@ -49,4 +49,4 @@ fn main() {
 
     // prints in svg version with Shape::from(...) -> Shape::Group(group) because of the group
     fs::write("./out/diamond.svg", Shape::Group(group).to_svg().unwrap()).unwrap();
-}
\ No newline at end of file
+}