From c2e0c52ce031ffe1c300b3cfa362b0e445ac5afd Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 19 May 2020 20:34:17 +0200 Subject: Move `Antialiasing` to `iced_graphics` --- glow/src/settings.rs | 25 +------------------------ graphics/src/antialiasing.rs | 23 +++++++++++++++++++++++ graphics/src/lib.rs | 2 ++ wgpu/src/settings.rs | 25 +------------------------ 4 files changed, 27 insertions(+), 48 deletions(-) create mode 100644 graphics/src/antialiasing.rs diff --git a/glow/src/settings.rs b/glow/src/settings.rs index bffc867e..07b36938 100644 --- a/glow/src/settings.rs +++ b/glow/src/settings.rs @@ -1,6 +1,7 @@ //! Configure a [`Renderer`]. //! //! [`Renderer`]: struct.Renderer.html +pub use iced_graphics::Antialiasing; /// The settings of a [`Renderer`]. /// @@ -24,27 +25,3 @@ impl Default for Settings { } } } - -/// An antialiasing strategy. -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum Antialiasing { - /// Multisample AA with 2 samples - MSAAx2, - /// Multisample AA with 4 samples - MSAAx4, - /// Multisample AA with 8 samples - MSAAx8, - /// Multisample AA with 16 samples - MSAAx16, -} - -impl Antialiasing { - pub(crate) fn sample_count(self) -> u32 { - match self { - Antialiasing::MSAAx2 => 2, - Antialiasing::MSAAx4 => 4, - Antialiasing::MSAAx8 => 8, - Antialiasing::MSAAx16 => 16, - } - } -} diff --git a/graphics/src/antialiasing.rs b/graphics/src/antialiasing.rs new file mode 100644 index 00000000..f92b3692 --- /dev/null +++ b/graphics/src/antialiasing.rs @@ -0,0 +1,23 @@ +/// An antialiasing strategy. +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum Antialiasing { + /// Multisample AA with 2 samples + MSAAx2, + /// Multisample AA with 4 samples + MSAAx4, + /// Multisample AA with 8 samples + MSAAx8, + /// Multisample AA with 16 samples + MSAAx16, +} + +impl Antialiasing { + pub fn sample_count(self) -> u32 { + match self { + Antialiasing::MSAAx2 => 2, + Antialiasing::MSAAx4 => 4, + Antialiasing::MSAAx8 => 8, + Antialiasing::MSAAx16 => 16, + } + } +} diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs index 152dc7b0..5dc4040f 100644 --- a/graphics/src/lib.rs +++ b/graphics/src/lib.rs @@ -1,3 +1,4 @@ +mod antialiasing; mod defaults; mod primitive; mod renderer; @@ -12,6 +13,7 @@ pub mod triangle; #[doc(no_inline)] pub use widget::*; +pub use antialiasing::Antialiasing; pub use backend::Backend; pub use defaults::Defaults; pub use primitive::Primitive; diff --git a/wgpu/src/settings.rs b/wgpu/src/settings.rs index 5ee245b6..05d301e7 100644 --- a/wgpu/src/settings.rs +++ b/wgpu/src/settings.rs @@ -1,6 +1,7 @@ //! Configure a [`Renderer`]. //! //! [`Renderer`]: struct.Renderer.html +pub use iced_graphics::Antialiasing; /// The settings of a [`Renderer`]. /// @@ -30,27 +31,3 @@ impl Default for Settings { } } } - -/// An antialiasing strategy. -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum Antialiasing { - /// Multisample AA with 2 samples - MSAAx2, - /// Multisample AA with 4 samples - MSAAx4, - /// Multisample AA with 8 samples - MSAAx8, - /// Multisample AA with 16 samples - MSAAx16, -} - -impl Antialiasing { - pub(crate) fn sample_count(self) -> u32 { - match self { - Antialiasing::MSAAx2 => 2, - Antialiasing::MSAAx4 => 4, - Antialiasing::MSAAx8 => 8, - Antialiasing::MSAAx16 => 16, - } - } -} -- cgit