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

remove serde_derive #385

Merged
merged 6 commits into from
Mar 18, 2023
Merged

remove serde_derive #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a9f312
remove serde_derive
jakobhellermann Mar 13, 2023
f699e1c
fix clippy lints
jakobhellermann Mar 14, 2023
7d1981d
replace std with core
jakobhellermann Mar 14, 2023
b98fd19
fix usage of String
jakobhellermann Mar 14, 2023
5cf7ee7
move serde code to impl_serde
jakobhellermann Mar 17, 2023
adf9a68
add test for EulerRot serialization/deserialization
jakobhellermann Mar 17, 2023
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ bytemuck = { version = "1.5", optional = true, default-features = false }
mint = { version = "0.5.8", optional = true, default-features = false }
num-traits = { version = "0.2.14", optional = true, default-features = false }
rand = { version = "0.8", optional = true, default-features = false }
serde = { version = "1.0", optional = true, default-features = false, features = ["derive"] }
serde = { version = "1.0", optional = true, default-features = false }
rkyv = { version = "0.7", optional = true }
bytecheck = { version = "0.6", optional = true, default-features = false}

Expand Down
1 change: 0 additions & 1 deletion src/euler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ use num_traits::Float;
///
/// YXZ can be used for yaw (y-axis), pitch (x-axis), roll (z-axis).
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
pub enum EulerRot {
/// Intrinsic three-axis rotation ZYX
ZYX,
Expand Down
178 changes: 178 additions & 0 deletions src/features/impl_serde.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,3 +1000,181 @@ mod u32 {

impl_serde_vec_types!(u32, UVec2, UVec3, UVec4);
}

mod euler {
use crate::EulerRot;

impl serde::Serialize for EulerRot {
fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
match *self {
EulerRot::ZYX => {
serde::Serializer::serialize_unit_variant(serializer, "EulerRot", 0u32, "ZYX")
}
EulerRot::ZXY => {
serde::Serializer::serialize_unit_variant(serializer, "EulerRot", 1u32, "ZXY")
}
EulerRot::YXZ => {
serde::Serializer::serialize_unit_variant(serializer, "EulerRot", 2u32, "YXZ")
}
EulerRot::YZX => {
serde::Serializer::serialize_unit_variant(serializer, "EulerRot", 3u32, "YZX")
}
EulerRot::XYZ => {
serde::Serializer::serialize_unit_variant(serializer, "EulerRot", 4u32, "XYZ")
}
EulerRot::XZY => {
serde::Serializer::serialize_unit_variant(serializer, "EulerRot", 5u32, "XZY")
}
}
}
}

impl<'de> serde::Deserialize<'de> for EulerRot {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
{
#[allow(clippy::upper_case_acronyms)]
enum Field {
ZYX,
ZXY,
YXZ,
YZX,
XYZ,
XZY,
}
struct FieldVisitor;

impl<'de> serde::de::Visitor<'de> for FieldVisitor {
type Value = Field;
fn expecting(&self, formatter: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
core::fmt::Formatter::write_str(formatter, "variant identifier")
}
fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
where
E: serde::de::Error,
{
match value {
0u64 => Ok(Field::ZYX),
1u64 => Ok(Field::ZXY),
2u64 => Ok(Field::YXZ),
3u64 => Ok(Field::YZX),
4u64 => Ok(Field::XYZ),
5u64 => Ok(Field::XZY),
_ => Err(serde::de::Error::invalid_value(
serde::de::Unexpected::Unsigned(value),
&"variant index 0 <= i < 6",
)),
}
}
fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
where
E: serde::de::Error,
{
match value {
"ZYX" => Ok(Field::ZYX),
"ZXY" => Ok(Field::ZXY),
"YXZ" => Ok(Field::YXZ),
"YZX" => Ok(Field::YZX),
"XYZ" => Ok(Field::XYZ),
"XZY" => Ok(Field::XZY),
_ => Err(serde::de::Error::unknown_variant(value, VARIANTS)),
}
}
fn visit_bytes<E>(self, value: &[u8]) -> Result<Self::Value, E>
where
E: serde::de::Error,
{
match value {
b"ZYX" => Ok(Field::ZYX),
b"ZXY" => Ok(Field::ZXY),
b"YXZ" => Ok(Field::YXZ),
b"YZX" => Ok(Field::YZX),
b"XYZ" => Ok(Field::XYZ),
b"XZY" => Ok(Field::XZY),
_ => {
#[cfg(feature = "std")]
let value = &String::from_utf8_lossy(value);
#[cfg(not(feature = "std"))]
let value =
core::str::from_utf8(value).unwrap_or("\u{fffd}\u{fffd}\u{fffd}");
Err(serde::de::Error::unknown_variant(value, VARIANTS))
}
}
}
}
impl<'de> serde::Deserialize<'de> for Field {
#[inline]
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
{
serde::Deserializer::deserialize_identifier(deserializer, FieldVisitor)
}
}
struct Visitor<'de> {
marker: core::marker::PhantomData<EulerRot>,
lifetime: core::marker::PhantomData<&'de ()>,
}
impl<'de> serde::de::Visitor<'de> for Visitor<'de> {
type Value = EulerRot;
fn expecting(
&self,
__formatter: &mut core::fmt::Formatter<'_>,
) -> core::fmt::Result {
core::fmt::Formatter::write_str(__formatter, "enum EulerRot")
}
fn visit_enum<A>(self, data: A) -> Result<Self::Value, A::Error>
where
A: serde::de::EnumAccess<'de>,
{
match serde::de::EnumAccess::variant(data)? {
(Field::ZYX, variant) => {
serde::de::VariantAccess::unit_variant(variant)?;
Ok(EulerRot::ZYX)
}
(Field::ZXY, variant) => {
serde::de::VariantAccess::unit_variant(variant)?;
Ok(EulerRot::ZXY)
}
(Field::YXZ, variant) => {
serde::de::VariantAccess::unit_variant(variant)?;
Ok(EulerRot::YXZ)
}
(Field::YZX, variant) => {
serde::de::VariantAccess::unit_variant(variant)?;
Ok(EulerRot::YZX)
}
(Field::XYZ, variant) => {
serde::de::VariantAccess::unit_variant(variant)?;
Ok(EulerRot::XYZ)
}
(Field::XZY, variant) => {
serde::de::VariantAccess::unit_variant(variant)?;
Ok(EulerRot::XZY)
}
}
}
}
const VARIANTS: &[&str] = &["ZYX", "ZXY", "YXZ", "YZX", "XYZ", "XZY"];
serde::Deserializer::deserialize_enum(
deserializer,
"EulerRot",
VARIANTS,
Visitor {
marker: core::marker::PhantomData::<EulerRot>,
lifetime: core::marker::PhantomData,
},
)
}
}

#[test]
fn test_euler_rot_serde() {
let a = EulerRot::XYZ;
let serialized = serde_json::to_string(&a).unwrap();
assert_eq!("\"XYZ\"", serialized);
let deserialized = serde_json::from_str(&serialized).unwrap();
assert_eq!(a, deserialized);
}
}