Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merged by Bors] - Added TryFrom for VertexAttributeValues #1963

Closed
wants to merge 10 commits into from
Closed

[Merged by Bors] - Added TryFrom for VertexAttributeValues #1963

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
85f557e
Added TryInto for VertexAttributeValues
simensgreen Apr 19, 2021
ab1e5f7
TryInto converted to TryFrom
simensgreen Apr 20, 2021
444495b
Improve tests and docs
simensgreen Apr 20, 2021
e7df24f
Informative error messages
simensgreen Apr 20, 2021
49438a6
Add additional vertex formats (#1878)
aloucks Apr 14, 2021
aafead9
New implements after adding new vertex formats
simensgreen Apr 20, 2021
7fac3fe
Сorrection of a mistake in a word
simensgreen Apr 20, 2021
bd993f8
fmt
cart Apr 20, 2021
a32ad7b
Update crates/bevy_render/src/mesh/mesh/conversions.rs
cart Apr 20, 2021
1074202
clippy
cart Apr 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 116 additions & 13 deletions crates/bevy_render/src/mesh/mesh/conversions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,12 @@
//! ```

use crate::mesh::VertexAttributeValues;
use std::convert::{ TryInto, TryFrom };
use std::error::Error;
use std::fmt;
use std::
{
fmt,
error::Error,
convert::{ TryInto, TryFrom },
};

#[derive(Debug, Clone)]
pub struct FromVertexAttributeError
Expand All @@ -55,6 +58,21 @@ impl fmt::Display for FromVertexAttributeError
VertexAttributeValues::Float4(..) => "VertexAttributeValues::Float4",
VertexAttributeValues::Int4(..) => "VertexAttributeValues::Int4",
VertexAttributeValues::Uint4(..) => "VertexAttributeValues::Uint4",
VertexAttributeValues::Short2(..) => "VertexAttributeValues::Short2",
VertexAttributeValues::Short2Norm(..) => "VertexAttributeValues::Short2Norm",
VertexAttributeValues::Ushort2(..) => "VertexAttributeValues::Ushort2",
VertexAttributeValues::Ushort2Norm(..) => "VertexAttributeValues::Ushort2Norm",
VertexAttributeValues::Short4(..) => "VertexAttributeValues::Short4",
VertexAttributeValues::Short4Norm(..) => "VertexAttributeValues::Short4Norm",
VertexAttributeValues::Ushort4(..) => "VertexAttributeValues::Ushort4",
VertexAttributeValues::Ushort4Norm(..) => "VertexAttributeValues::Ushort4Norm",
VertexAttributeValues::Char2(..) => "VertexAttributeValues::Char2",
VertexAttributeValues::Char2Norm(..) => "VertexAttributeValues::Char2Norm",
VertexAttributeValues::Uchar2(..) => "VertexAttributeValues::Uchar2",
VertexAttributeValues::Uchar2Norm(..) => "VertexAttributeValues::Uchar2Norm",
VertexAttributeValues::Char4(..) => "VertexAttributeValues::Char4",
VertexAttributeValues::Char4Norm(..) => "VertexAttributeValues::Char4Norm",
VertexAttributeValues::Uchar4(..) => "VertexAttributeValues::Uchar4",
VertexAttributeValues::Uchar4Norm(..) => "VertexAttributeValues::Uchar4Norm",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have not added a _ placeholder so that whoever adds new formats will take care of conversions

};
write!(f, "can't convert `{}` to `{}`", value_name, self.into)
Expand Down Expand Up @@ -144,8 +162,93 @@ impl TryFrom<VertexAttributeValues> for Vec<[u8; 4]> {

fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Uchar4(value) => Ok(value),
VertexAttributeValues::Uchar4Norm(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[u8; 4]]>" })
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[u8; 4]>" })
}
}
}

impl TryFrom<VertexAttributeValues> for Vec<[i8; 4]> {
type Error = FromVertexAttributeError;

fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Char4(value) => Ok(value),
VertexAttributeValues::Char4Norm(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[i8; 4]>" })
}
}
}

impl TryFrom<VertexAttributeValues> for Vec<[u8; 2]> {
type Error = FromVertexAttributeError;

fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Uchar2(value) => Ok(value),
VertexAttributeValues::Uchar2Norm(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[u8; 2]>" })
}
}
}

impl TryFrom<VertexAttributeValues> for Vec<[i8; 2]> {
type Error = FromVertexAttributeError;

fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Char2(value) => Ok(value),
VertexAttributeValues::Char2Norm(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[i8; 2]>" })
}
}
}

impl TryFrom<VertexAttributeValues> for Vec<[i16; 4]> {
type Error = FromVertexAttributeError;

fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Short4(value) => Ok(value),
VertexAttributeValues::Short4Norm(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[i16; 4]>" })
}
}
}

impl TryFrom<VertexAttributeValues> for Vec<[u16; 4]> {
type Error = FromVertexAttributeError;

fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Ushort4(value) => Ok(value),
VertexAttributeValues::Ushort4Norm(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[u16; 4]>" })
}
}
}

impl TryFrom<VertexAttributeValues> for Vec<[u16; 2]> {
type Error = FromVertexAttributeError;

fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Ushort2(value) => Ok(value),
VertexAttributeValues::Ushort2Norm(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[i16; 2]>" })
}
}
}

impl TryFrom<VertexAttributeValues> for Vec<[i16; 2]> {
type Error = FromVertexAttributeError;

fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Short2(value) => Ok(value),
VertexAttributeValues::Short2Norm(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[i16; 2]>" })
}
}
}
Expand All @@ -156,7 +259,7 @@ impl TryFrom<VertexAttributeValues> for Vec<[u32; 4]> {
fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Uint4(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[u32; 4]]>" })
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[u32; 4]>" })
}
}
}
Expand All @@ -167,7 +270,7 @@ impl TryFrom<VertexAttributeValues> for Vec<[i32; 4]> {
fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Int4(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[i32; 4]]>" })
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[i32; 4]>" })
}
}
}
Expand All @@ -178,7 +281,7 @@ impl TryFrom<VertexAttributeValues> for Vec<[f32; 4]> {
fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Float4(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[f32; 4]]>" })
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[f32; 4]>" })
}
}
}
Expand All @@ -189,7 +292,7 @@ impl TryFrom<VertexAttributeValues> for Vec<[u32; 3]> {
fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Uint3(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[u32; 3]]>" })
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[u32; 3]>" })
}
}
}
Expand All @@ -200,7 +303,7 @@ impl TryFrom<VertexAttributeValues> for Vec<[i32; 3]> {
fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Int3(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[i32; 3]]>" })
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[i32; 3]>" })
}
}
}
Expand All @@ -211,7 +314,7 @@ impl TryFrom<VertexAttributeValues> for Vec<[f32; 3]> {
fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Float3(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[f32; 3]]>" })
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[f32; 3]>" })
}
}
}
Expand All @@ -222,7 +325,7 @@ impl TryFrom<VertexAttributeValues> for Vec<[u32; 2]> {
fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Uint2(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[u32; 2]]>" })
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[u32; 2]>" })
}
}
}
Expand All @@ -233,7 +336,7 @@ impl TryFrom<VertexAttributeValues> for Vec<[i32; 2]> {
fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Int2(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[i32; 2]]>" })
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[i32; 2]>" })
}
}
}
Expand All @@ -244,7 +347,7 @@ impl TryFrom<VertexAttributeValues> for Vec<[f32; 2]> {
fn try_from(value: VertexAttributeValues) -> Result<Self, Self::Error> {
match value {
VertexAttributeValues::Float2(value) => Ok(value),
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[f32; 2]]>" })
_ => Err(FromVertexAttributeError{ from: value, into: "Vec<[f32; 2]>" })
}
}
}
Expand Down