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.

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

Serialize DQ to [N;8] #817

Merged
merged 1 commit into from Dec 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 35 additions & 1 deletion src/geometry/dual_quaternion.rs
@@ -1,4 +1,6 @@
use crate::{Quaternion, SimdRealField};
#[cfg(feature = "serde-serialize")]
use serde::{Deserialize, Deserializer, Serialize, Serializer};

/// A dual quaternion.
///
Expand Down Expand Up @@ -27,7 +29,6 @@ use crate::{Quaternion, SimdRealField};
/// See https://github.com/dimforge/nalgebra/issues/487
#[repr(C)]
#[derive(Debug, Default, Eq, PartialEq, Copy, Clone)]
#[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))]
pub struct DualQuaternion<N: SimdRealField> {
/// The real component of the quaternion
pub real: Quaternion<N>,
Expand Down Expand Up @@ -80,3 +81,36 @@ where
*self = self.normalize();
}
}

#[cfg(feature = "serde-serialize")]
impl<N: SimdRealField> Serialize for DualQuaternion<N>
where
N: Serialize,
{
fn serialize<S>(&self, serializer: S) -> Result<<S as Serializer>::Ok, <S as Serializer>::Error>
where
S: Serializer,
{
self.as_ref().serialize(serializer)
}
}

#[cfg(feature = "serde-serialize")]
impl<'a, N: SimdRealField> Deserialize<'a> for DualQuaternion<N>
where
N: Deserialize<'a>,
{
fn deserialize<Des>(deserializer: Des) -> Result<Self, Des::Error>
where
Des: Deserializer<'a>,
{
type Dq<N> = [N; 8];

let dq: Dq<N> = Dq::<N>::deserialize(deserializer)?;

Ok(Self {
real: Quaternion::new(dq[3], dq[0], dq[1], dq[2]),
dual: Quaternion::new(dq[7], dq[4], dq[5], dq[6]),
})
}
}
10 changes: 8 additions & 2 deletions tests/core/matrixcompare.rs
Expand Up @@ -4,9 +4,15 @@
//! The tests here only check that the necessary trait implementations are correctly implemented,
//! in addition to some sanity checks with example input.

use nalgebra::{DMatrix, MatrixMN, U4, U5};
use nalgebra::{MatrixMN, U4, U5};

use matrixcompare::{assert_matrix_eq, DenseAccess};
#[cfg(feature = "arbitrary")]
use nalgebra::DMatrix;

use matrixcompare::assert_matrix_eq;

#[cfg(feature = "arbitrary")]
use matrixcompare::DenseAccess;

#[cfg(feature = "arbitrary")]
quickcheck! {
Expand Down