From 30432cbade3d9b25c4df62656a7494db3f4ea82a Mon Sep 17 00:00:00 2001
From: shan <shankern@protonmail.com>
Date: Wed, 5 Oct 2022 10:49:58 -0700
Subject: Readjusted namespaces, removed Geometry example as it's no longer
 relevant.

---
 graphics/src/layer/image.rs | 23 +++++++++++++++++++++++
 graphics/src/layer/mesh.rs  | 39 +++++++++++++++++++++++++++++++++++++++
 graphics/src/layer/quad.rs  | 30 ++++++++++++++++++++++++++++++
 graphics/src/layer/text.rs  | 26 ++++++++++++++++++++++++++
 4 files changed, 118 insertions(+)
 create mode 100644 graphics/src/layer/image.rs
 create mode 100644 graphics/src/layer/mesh.rs
 create mode 100644 graphics/src/layer/quad.rs
 create mode 100644 graphics/src/layer/text.rs

(limited to 'graphics/src/layer')

diff --git a/graphics/src/layer/image.rs b/graphics/src/layer/image.rs
new file mode 100644
index 00000000..387b60ed
--- /dev/null
+++ b/graphics/src/layer/image.rs
@@ -0,0 +1,23 @@
+use iced_native::{image, svg};
+use crate::Rectangle;
+
+/// A raster or vector image.
+#[derive(Debug, Clone)]
+pub enum Image {
+    /// A raster image.
+    Raster {
+        /// The handle of a raster image.
+        handle: image::Handle,
+
+        /// The bounds of the image.
+        bounds: Rectangle,
+    },
+    /// A vector image.
+    Vector {
+        /// The handle of a vector image.
+        handle: svg::Handle,
+
+        /// The bounds of the image.
+        bounds: Rectangle,
+    },
+}
\ No newline at end of file
diff --git a/graphics/src/layer/mesh.rs b/graphics/src/layer/mesh.rs
new file mode 100644
index 00000000..a025675a
--- /dev/null
+++ b/graphics/src/layer/mesh.rs
@@ -0,0 +1,39 @@
+//! A collection of triangle primitives.
+
+use crate::{Color, Point, Rectangle, triangle};
+use crate::gradient::Gradient;
+
+/// A mesh of triangles.
+#[derive(Debug, Clone, Copy)]
+pub struct Mesh<'a> {
+    /// The origin of the vertices of the [`Mesh`].
+    pub origin: Point,
+
+    /// The vertex and index buffers of the [`Mesh`].
+    pub buffers: &'a triangle::Mesh2D,
+
+    /// The clipping bounds of the [`Mesh`].
+    pub clip_bounds: Rectangle<f32>,
+
+    /// The shader of the [`Mesh`].
+    pub style: &'a Style,
+}
+
+#[derive(Debug, Clone)]
+/// Supported shaders for primitives.
+pub enum Style {
+    /// Fill a primitive with a solid color.
+    Solid(Color),
+    /// Fill a primitive with an interpolated color.
+    Gradient(Gradient)
+}
+
+impl <'a> Into<Style> for Gradient {
+    fn into(self) -> Style {
+        match self {
+            Gradient::Linear(linear) => {
+                Style::Gradient(Gradient::Linear(linear))
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/graphics/src/layer/quad.rs b/graphics/src/layer/quad.rs
new file mode 100644
index 00000000..4380fb6c
--- /dev/null
+++ b/graphics/src/layer/quad.rs
@@ -0,0 +1,30 @@
+/// A colored rectangle with a border.
+///
+/// This type can be directly uploaded to GPU memory.
+#[derive(Debug, Clone, Copy)]
+#[repr(C)]
+pub struct Quad {
+    /// The position of the [`Quad`].
+    pub position: [f32; 2],
+
+    /// The size of the [`Quad`].
+    pub size: [f32; 2],
+
+    /// The color of the [`Quad`], in __linear RGB__.
+    pub color: [f32; 4],
+
+    /// The border color of the [`Quad`], in __linear RGB__.
+    pub border_color: [f32; 4],
+
+    /// The border radius of the [`Quad`].
+    pub border_radius: f32,
+
+    /// The border width of the [`Quad`].
+    pub border_width: f32,
+}
+
+#[allow(unsafe_code)]
+unsafe impl bytemuck::Zeroable for Quad {}
+
+#[allow(unsafe_code)]
+unsafe impl bytemuck::Pod for Quad {}
\ No newline at end of file
diff --git a/graphics/src/layer/text.rs b/graphics/src/layer/text.rs
new file mode 100644
index 00000000..b6dd4b7f
--- /dev/null
+++ b/graphics/src/layer/text.rs
@@ -0,0 +1,26 @@
+use crate::{alignment, Font, Rectangle};
+
+/// A paragraph of text.
+#[derive(Debug, Clone, Copy)]
+pub struct Text<'a> {
+    /// The content of the [`Text`].
+    pub content: &'a str,
+
+    /// The layout bounds of the [`Text`].
+    pub bounds: Rectangle,
+
+    /// The color of the [`Text`], in __linear RGB_.
+    pub color: [f32; 4],
+
+    /// The size of the [`Text`].
+    pub size: f32,
+
+    /// The font of the [`Text`].
+    pub font: Font,
+
+    /// The horizontal alignment of the [`Text`].
+    pub horizontal_alignment: alignment::Horizontal,
+
+    /// The vertical alignment of the [`Text`].
+    pub vertical_alignment: alignment::Vertical,
+}
\ No newline at end of file
-- 
cgit 


From cb7c4676543cd508dfae8d4dcbd9cc8b61b1a94e Mon Sep 17 00:00:00 2001
From: shan <shankern@protonmail.com>
Date: Thu, 6 Oct 2022 07:28:05 -0700
Subject: Fixed lint issues & cleaned up some documentation.

---
 graphics/src/layer/image.rs | 2 +-
 graphics/src/layer/mesh.rs  | 2 +-
 graphics/src/layer/quad.rs  | 2 +-
 graphics/src/layer/text.rs  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'graphics/src/layer')

diff --git a/graphics/src/layer/image.rs b/graphics/src/layer/image.rs
index 387b60ed..cbba7888 100644
--- a/graphics/src/layer/image.rs
+++ b/graphics/src/layer/image.rs
@@ -20,4 +20,4 @@ pub enum Image {
         /// The bounds of the image.
         bounds: Rectangle,
     },
-}
\ No newline at end of file
+}
diff --git a/graphics/src/layer/mesh.rs b/graphics/src/layer/mesh.rs
index a025675a..8a6b1d70 100644
--- a/graphics/src/layer/mesh.rs
+++ b/graphics/src/layer/mesh.rs
@@ -36,4 +36,4 @@ impl <'a> Into<Style> for Gradient {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/graphics/src/layer/quad.rs b/graphics/src/layer/quad.rs
index 4380fb6c..4def8427 100644
--- a/graphics/src/layer/quad.rs
+++ b/graphics/src/layer/quad.rs
@@ -27,4 +27,4 @@ pub struct Quad {
 unsafe impl bytemuck::Zeroable for Quad {}
 
 #[allow(unsafe_code)]
-unsafe impl bytemuck::Pod for Quad {}
\ No newline at end of file
+unsafe impl bytemuck::Pod for Quad {}
diff --git a/graphics/src/layer/text.rs b/graphics/src/layer/text.rs
index b6dd4b7f..74f7a676 100644
--- a/graphics/src/layer/text.rs
+++ b/graphics/src/layer/text.rs
@@ -23,4 +23,4 @@ pub struct Text<'a> {
 
     /// The vertical alignment of the [`Text`].
     pub vertical_alignment: alignment::Vertical,
-}
\ No newline at end of file
+}
-- 
cgit 


From 215e6c95be7370bdd29c75b904463f06f942b7c0 Mon Sep 17 00:00:00 2001
From: shan <shankern@protonmail.com>
Date: Fri, 7 Oct 2022 13:21:32 -0700
Subject: More import adjusting.

---
 graphics/src/layer/mesh.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'graphics/src/layer')

diff --git a/graphics/src/layer/mesh.rs b/graphics/src/layer/mesh.rs
index 8a6b1d70..0946317e 100644
--- a/graphics/src/layer/mesh.rs
+++ b/graphics/src/layer/mesh.rs
@@ -37,3 +37,15 @@ impl <'a> Into<Style> for Gradient {
         }
     }
 }
+
+/// Returns the number of total vertices & total indices of all [`Mesh`]es.
+pub fn attribute_count_of<'a>(meshes: &'a [Mesh<'a>]) -> (usize, usize) {
+    meshes
+        .iter()
+        .map(|Mesh { buffers, .. }| {
+            (buffers.vertices.len(), buffers.indices.len())
+        })
+        .fold((0, 0), |(total_v, total_i), (v, i)| {
+            (total_v + v, total_i + i)
+        })
+}
-- 
cgit 


From 20a0577034b40a6bbabee9bbbfc085f3fd5016c0 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 3 Nov 2022 04:33:54 +0100
Subject: Reuse last buffer in `Frame` if `mesh_style` matches

---
 graphics/src/layer/mesh.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'graphics/src/layer')

diff --git a/graphics/src/layer/mesh.rs b/graphics/src/layer/mesh.rs
index 0946317e..a2232a1f 100644
--- a/graphics/src/layer/mesh.rs
+++ b/graphics/src/layer/mesh.rs
@@ -1,7 +1,7 @@
 //! A collection of triangle primitives.
 
-use crate::{Color, Point, Rectangle, triangle};
 use crate::gradient::Gradient;
+use crate::{triangle, Color, Point, Rectangle};
 
 /// A mesh of triangles.
 #[derive(Debug, Clone, Copy)]
@@ -19,16 +19,16 @@ pub struct Mesh<'a> {
     pub style: &'a Style,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 /// Supported shaders for primitives.
 pub enum Style {
     /// Fill a primitive with a solid color.
     Solid(Color),
     /// Fill a primitive with an interpolated color.
-    Gradient(Gradient)
+    Gradient(Gradient),
 }
 
-impl <'a> Into<Style> for Gradient {
+impl<'a> Into<Style> for Gradient {
     fn into(self) -> Style {
         match self {
             Gradient::Linear(linear) => {
-- 
cgit 


From b95745340441835bd25b5cadc2342254631f8c05 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 3 Nov 2022 04:35:16 +0100
Subject: Run `cargo fmt`

---
 graphics/src/layer/image.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'graphics/src/layer')

diff --git a/graphics/src/layer/image.rs b/graphics/src/layer/image.rs
index cbba7888..045ec665 100644
--- a/graphics/src/layer/image.rs
+++ b/graphics/src/layer/image.rs
@@ -1,5 +1,5 @@
-use iced_native::{image, svg};
 use crate::Rectangle;
+use iced_native::{image, svg};
 
 /// A raster or vector image.
 #[derive(Debug, Clone)]
-- 
cgit 


From 7e22e2d45293c5916812be03dc7367134b69b3ad Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 3 Nov 2022 04:53:27 +0100
Subject: Fix lints by `clippy`

---
 graphics/src/layer/mesh.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'graphics/src/layer')

diff --git a/graphics/src/layer/mesh.rs b/graphics/src/layer/mesh.rs
index a2232a1f..7056db9b 100644
--- a/graphics/src/layer/mesh.rs
+++ b/graphics/src/layer/mesh.rs
@@ -28,13 +28,9 @@ pub enum Style {
     Gradient(Gradient),
 }
 
-impl<'a> Into<Style> for Gradient {
-    fn into(self) -> Style {
-        match self {
-            Gradient::Linear(linear) => {
-                Style::Gradient(Gradient::Linear(linear))
-            }
-        }
+impl From<Gradient> for Style {
+    fn from(gradient: Gradient) -> Self {
+        Self::Gradient(gradient)
     }
 }
 
-- 
cgit 


From 0b806235f6810160633feedbc3c639f6108e89a3 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 3 Nov 2022 05:23:43 +0100
Subject: Remove blank line if `layer::mesh` in `iced_graphics`

---
 graphics/src/layer/mesh.rs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'graphics/src/layer')

diff --git a/graphics/src/layer/mesh.rs b/graphics/src/layer/mesh.rs
index 7056db9b..370aab1a 100644
--- a/graphics/src/layer/mesh.rs
+++ b/graphics/src/layer/mesh.rs
@@ -1,5 +1,4 @@
 //! A collection of triangle primitives.
-
 use crate::gradient::Gradient;
 use crate::{triangle, Color, Point, Rectangle};
 
-- 
cgit 


From 84d1b79fefc88534835fdfbe79bc0eb3b43627cf Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 3 Nov 2022 05:50:53 +0100
Subject: Move `mesh::Style` to `triangle` and reuse it in `fill` and `stroke`

---
 graphics/src/layer/mesh.rs | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'graphics/src/layer')

diff --git a/graphics/src/layer/mesh.rs b/graphics/src/layer/mesh.rs
index 370aab1a..979081f1 100644
--- a/graphics/src/layer/mesh.rs
+++ b/graphics/src/layer/mesh.rs
@@ -1,6 +1,6 @@
 //! A collection of triangle primitives.
-use crate::gradient::Gradient;
-use crate::{triangle, Color, Point, Rectangle};
+use crate::triangle;
+use crate::{Point, Rectangle};
 
 /// A mesh of triangles.
 #[derive(Debug, Clone, Copy)]
@@ -15,22 +15,7 @@ pub struct Mesh<'a> {
     pub clip_bounds: Rectangle<f32>,
 
     /// The shader of the [`Mesh`].
-    pub style: &'a Style,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-/// Supported shaders for primitives.
-pub enum Style {
-    /// Fill a primitive with a solid color.
-    Solid(Color),
-    /// Fill a primitive with an interpolated color.
-    Gradient(Gradient),
-}
-
-impl From<Gradient> for Style {
-    fn from(gradient: Gradient) -> Self {
-        Self::Gradient(gradient)
-    }
+    pub style: &'a triangle::Style,
 }
 
 /// Returns the number of total vertices & total indices of all [`Mesh`]es.
-- 
cgit