From b0a3506054a1afd7c6c5554d653753fab6411203 Mon Sep 17 00:00:00 2001 From: HampusM Date: Tue, 7 May 2024 22:00:43 +0200 Subject: refactor(engine): remove unused vertex color attribute --- engine/src/vertex.rs | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'engine/src/vertex.rs') diff --git a/engine/src/vertex.rs b/engine/src/vertex.rs index 37a6c51..456a2a3 100644 --- a/engine/src/vertex.rs +++ b/engine/src/vertex.rs @@ -1,6 +1,5 @@ use std::mem::size_of; -use crate::color::Color; use crate::vector::{Vec2, Vec3}; #[derive(Debug, Clone, Default)] @@ -8,7 +7,6 @@ use crate::vector::{Vec2, Vec3}; pub struct Vertex { pos: Vec3, - color: Color, texture_coords: Vec2, normal: Vec3, } @@ -17,7 +15,6 @@ pub struct Vertex pub struct Builder { pos: Option>, - color: Option>, texture_coords: Vec2, normal: Option>, } @@ -38,14 +35,6 @@ impl Builder self } - #[must_use] - pub fn color(mut self, color: Color) -> Self - { - self.color = Some(color); - - self - } - #[must_use] pub fn texture_coords(mut self, texture_coords: Vec2) -> Self { @@ -66,12 +55,10 @@ impl Builder pub fn build(self) -> Option { let pos = self.pos?; - let color = self.color.unwrap_or_default(); let normal = self.normal.unwrap_or_default(); Some(Vertex { pos, - color, texture_coords: self.texture_coords, normal, }) @@ -93,17 +80,11 @@ impl Vertex Attribute { index: 1, component_type: AttributeComponentType::Float, - component_cnt: AttributeComponentCnt::Three, - component_size: size_of::() as u32, - }, - Attribute { - index: 2, - component_type: AttributeComponentType::Float, component_cnt: AttributeComponentCnt::Two, component_size: size_of::() as u32, }, Attribute { - index: 3, + index: 2, component_type: AttributeComponentType::Float, component_cnt: AttributeComponentCnt::Three, component_size: size_of::() as u32, -- cgit v1.2.3-18-g5258