diff --git a/ggdt/benches/triangles.rs b/ggdt/benches/triangles.rs index 55a508a..92b050c 100644 --- a/ggdt/benches/triangles.rs +++ b/ggdt/benches/triangles.rs @@ -24,14 +24,14 @@ pub fn criterion_benchmark(c: &mut Criterion) { let texcoord_1_1 = Vector2::new(1.0, 1.0); c.bench_function("indexedbitmap_triangle_2d_solid_color", |b| { - let triangle = IndexedTriangle2d::SolidSingleColor { position: [big_v1, big_v2, big_v3], color: 5 }; + let triangle = IndexedTriangle2d::Solid { position: [big_v1, big_v2, big_v3], color: 5 }; b.iter(|| { dest.triangle_2d(black_box(&triangle)); }) }); c.bench_function("indexedbitmap_triangle_2d_solid_color_small", |b| { - let triangle = IndexedTriangle2d::SolidSingleColor { position: [small_v1, small_v2, small_v3], color: 5 }; + let triangle = IndexedTriangle2d::Solid { position: [small_v1, small_v2, small_v3], color: 5 }; b.iter(|| { dest.triangle_2d(black_box(&triangle)); }) diff --git a/ggdt/src/graphics/bitmap/indexed/triangles.rs b/ggdt/src/graphics/bitmap/indexed/triangles.rs index 4c2a8ee..9701dd8 100644 --- a/ggdt/src/graphics/bitmap/indexed/triangles.rs +++ b/ggdt/src/graphics/bitmap/indexed/triangles.rs @@ -4,7 +4,7 @@ use crate::math::vector2::Vector2; #[derive(Debug, Clone, PartialEq)] pub enum IndexedTriangle2d<'a> { - SolidSingleColor { + Solid { position: [Vector2; 3], // color: u8, }, @@ -19,7 +19,7 @@ impl IndexedBitmap { pub fn triangle_2d(&mut self, triangle: &IndexedTriangle2d) { use IndexedTriangle2d::*; match triangle { - SolidSingleColor { position, color } => { + Solid { position, color } => { per_pixel_triangle_2d( self, // position[0], diff --git a/ggdt/src/graphics/bitmap/rgb/triangles.rs b/ggdt/src/graphics/bitmap/rgb/triangles.rs index 8ebcb53..8fb3bea 100644 --- a/ggdt/src/graphics/bitmap/rgb/triangles.rs +++ b/ggdt/src/graphics/bitmap/rgb/triangles.rs @@ -5,7 +5,7 @@ use crate::prelude::{from_rgb32, from_rgb32_normalized, to_rgb32_normalized}; #[derive(Debug, Clone, PartialEq)] pub enum RgbaTriangle2d<'a> { - SolidSingleColor { + Solid { position: [Vector2; 3], // color: u32, }, @@ -24,7 +24,7 @@ impl RgbaBitmap { pub fn triangle_2d(&mut self, triangle: &RgbaTriangle2d) { use RgbaTriangle2d::*; match triangle { - SolidSingleColor { position, color } => { + Solid { position, color } => { per_pixel_triangle_2d( self, // position[0],