From 0d620b7701f427ed0091f3640ab9ca0e116eb412 Mon Sep 17 00:00:00 2001 From: Artur Sapek Date: Wed, 1 Jan 2020 15:44:32 -0700 Subject: Implement Geometry2D primitive --- wgpu/src/primitive.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'wgpu/src/primitive.rs') diff --git a/wgpu/src/primitive.rs b/wgpu/src/primitive.rs index 6c61f800..06121262 100644 --- a/wgpu/src/primitive.rs +++ b/wgpu/src/primitive.rs @@ -1,6 +1,6 @@ use iced_native::{ image, svg, Background, Color, Font, HorizontalAlignment, Rectangle, - Vector, VerticalAlignment, + Vector, VerticalAlignment, Geometry2D, }; /// A rendering primitive. @@ -63,6 +63,11 @@ pub enum Primitive { /// The content of the clip content: Box, }, + /// A low-level geometry primitive + Geometry2D { + /// The vertices and indices of the geometry + geometry: Geometry2D, + }, } impl Default for Primitive { -- cgit From 5ca98b113e49bfb2372b245a985f957611a0a1ac Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 2 Jan 2020 19:25:00 +0100 Subject: Rename `Geometry2D` to `Mesh2D` and move it to `iced_wgpu` --- wgpu/src/primitive.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'wgpu/src/primitive.rs') diff --git a/wgpu/src/primitive.rs b/wgpu/src/primitive.rs index 06121262..815ba3b0 100644 --- a/wgpu/src/primitive.rs +++ b/wgpu/src/primitive.rs @@ -1,8 +1,11 @@ use iced_native::{ image, svg, Background, Color, Font, HorizontalAlignment, Rectangle, - Vector, VerticalAlignment, Geometry2D, + Vector, VerticalAlignment, }; +use crate::triangle; +use std::sync::Arc; + /// A rendering primitive. #[derive(Debug, Clone)] pub enum Primitive { @@ -63,11 +66,10 @@ pub enum Primitive { /// The content of the clip content: Box, }, - /// A low-level geometry primitive - Geometry2D { - /// The vertices and indices of the geometry - geometry: Geometry2D, - }, + /// A low-level primitive to render a mesh of triangles. + /// + /// It can be used to render many kinds of geometry freely. + Mesh2D(Arc), } impl Default for Primitive { -- cgit