Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-26 06:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

New mesh attribute: color (#1194)

Browse source 
New mesh attribute: color
This commit is contained in:
MsK` 2021-01-03 20:39:15 +01:00 committed by GitHub
parent b7e35ef744
commit ca310b856f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/bevy_render/src/mesh/mesh.rs
View file

@ -30,6 +30,7 @@ pub enum VertexAttributeValues {
Float4(Vec<[f32; 4]>), Float4(Vec<[f32; 4]>),
Int4(Vec<[i32; 4]>), Int4(Vec<[i32; 4]>),
Uint4(Vec<[u32; 4]>), Uint4(Vec<[u32; 4]>),
Uchar4Norm(Vec<[u8; 4]>),
} }
impl VertexAttributeValues { impl VertexAttributeValues {
@ -47,6 +48,7 @@ impl VertexAttributeValues {
VertexAttributeValues::Float4(ref values) => values.len(), VertexAttributeValues::Float4(ref values) => values.len(),
VertexAttributeValues::Int4(ref values) => values.len(), VertexAttributeValues::Int4(ref values) => values.len(),
VertexAttributeValues::Uint4(ref values) => values.len(), VertexAttributeValues::Uint4(ref values) => values.len(),
VertexAttributeValues::Uchar4Norm(ref values) => values.len(),
} }
} }
@ -69,6 +71,7 @@ impl VertexAttributeValues {
VertexAttributeValues::Float4(values) => values.as_slice().as_bytes(), VertexAttributeValues::Float4(values) => values.as_slice().as_bytes(),
VertexAttributeValues::Int4(values) => values.as_slice().as_bytes(), VertexAttributeValues::Int4(values) => values.as_slice().as_bytes(),
VertexAttributeValues::Uint4(values) => values.as_slice().as_bytes(), VertexAttributeValues::Uint4(values) => values.as_slice().as_bytes(),
VertexAttributeValues::Uchar4Norm(values) => values.as_slice().as_bytes(),
} }
} }
} }
@ -88,6 +91,7 @@ impl From<&VertexAttributeValues> for VertexFormat {
VertexAttributeValues::Float4(_) => VertexFormat::Float4, VertexAttributeValues::Float4(_) => VertexFormat::Float4,
VertexAttributeValues::Int4(_) => VertexFormat::Int4, VertexAttributeValues::Int4(_) => VertexFormat::Int4,
VertexAttributeValues::Uint4(_) => VertexFormat::Uint4, VertexAttributeValues::Uint4(_) => VertexFormat::Uint4,
VertexAttributeValues::Uchar4Norm(_) => VertexFormat::Uchar4Norm,
} }
} }
} }
@ -164,6 +168,12 @@ impl From<Vec<[u32; 4]>> for VertexAttributeValues {
} }
} }
impl From<Vec<[u8; 4]>> for VertexAttributeValues {
fn from(vec: Vec<[u8; 4]>) -> Self {
VertexAttributeValues::Uchar4Norm(vec)
}
}
#[derive(Debug)] #[derive(Debug)]
pub enum Indices { pub enum Indices {
U16(Vec<u16>), U16(Vec<u16>),
@ -190,6 +200,7 @@ pub struct Mesh {
} }
impl Mesh { impl Mesh {
pub const ATTRIBUTE_COLOR: &'static str = "Vertex_Color";
pub const ATTRIBUTE_NORMAL: &'static str = "Vertex_Normal"; pub const ATTRIBUTE_NORMAL: &'static str = "Vertex_Normal";
pub const ATTRIBUTE_POSITION: &'static str = "Vertex_Position"; pub const ATTRIBUTE_POSITION: &'static str = "Vertex_Position";
pub const ATTRIBUTE_UV_0: &'static str = "Vertex_Uv"; pub const ATTRIBUTE_UV_0: &'static str = "Vertex_Uv";