summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-11-03 06:05:23 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-11-03 06:05:23 +0100
commitf31c8f2504ea7c004c5caed8913e5da28d2e50e2 (patch)
tree798131b295ea0ce22ff8f560d146c0a6dab377ed
parent68cddd64687b8df63306631c062048d6d2fffbd1 (diff)
downloadiced-f31c8f2504ea7c004c5caed8913e5da28d2e50e2.tar.gz
iced-f31c8f2504ea7c004c5caed8913e5da28d2e50e2.tar.bz2
iced-f31c8f2504ea7c004c5caed8913e5da28d2e50e2.zip
Refactor imports of `triangle` modules in `iced_glow` and `iced_wgpu`
-rw-r--r--glow/src/triangle.rs7
-rw-r--r--wgpu/src/triangle.rs20
2 files changed, 13 insertions, 14 deletions
diff --git a/glow/src/triangle.rs b/glow/src/triangle.rs
index 5d14666c..0e27bcf2 100644
--- a/glow/src/triangle.rs
+++ b/glow/src/triangle.rs
@@ -2,16 +2,15 @@
mod gradient;
mod solid;
-use crate::{program, Transformation};
+use crate::program;
+use crate::Transformation;
use iced_graphics::layer::mesh::{self, Mesh};
-use iced_graphics::triangle;
+use iced_graphics::triangle::{self, Vertex2D};
use glow::HasContext;
use std::marker::PhantomData;
-pub use iced_graphics::triangle::{Mesh2D, Vertex2D};
-
#[derive(Debug)]
pub(crate) struct Pipeline {
vertex_array: <glow::Context as HasContext>::VertexArray,
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 765f7d30..f9abf2b5 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -1,18 +1,18 @@
//! Draw meshes of triangles.
-use crate::{settings, Transformation};
-use core::fmt;
-use std::fmt::Formatter;
+mod gradient;
+mod msaa;
+mod solid;
+
+use crate::buffer::r#static::Buffer;
+use crate::settings;
+use crate::Transformation;
use iced_graphics::layer::mesh::{self, Mesh};
-use iced_graphics::triangle;
+use iced_graphics::triangle::{self, Vertex2D};
use iced_graphics::Size;
-use crate::buffer::r#static::Buffer;
-pub use iced_graphics::triangle::{Mesh2D, Vertex2D};
-
-mod gradient;
-mod msaa;
-mod solid;
+use core::fmt;
+use std::fmt::Formatter;
/// Triangle pipeline for all mesh layers in a [`iced_graphics::Canvas`] widget.
#[derive(Debug)]