Skip to content

Added Serde feature and optionnal dependency #37

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

Draft
VirgileHenry wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Added Serde feature and optionnal dependency #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2312d6
Added Serde feature and optionnal dependency
Apr 18, 2025
27db16a
Added serialize traits for basic shapes too
Apr 18, 2025
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: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ std = ["glam/std", "tinyvec?/std"]
adjacency = ["dep:tinyvec"]
shape-extras = []
libm = ["dep:libm", "glam/libm"]
serde = ["dep:serde", "tinyvec/serde", "glam/serde"]

[dependencies]
constgebra = { version = "0.1.4", default-features = false }
glam = { version = "0.30.0", default-features = false }
libm = { version = "0.2", optional = true }
serde = { version = "1.0.219", optional = true, features=["serde_derive"] }
tinyvec = { version = "1.8.1", optional = true, default-features = false }
4 changes: 4 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ pub trait EquilateralBaseShape: BaseShape {
/// The edge between two main triangles.
///
#[derive(Debug, Clone)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
struct Edge {
///
/// Indices of the points between the endpoints.
Expand Down Expand Up @@ -281,6 +282,7 @@ impl Edge {
/// shared.
///
#[derive(Clone, Debug)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
enum TriangleContents {
///
/// Nothing inside the triangle: subdivisions 0 and 1
Expand Down Expand Up @@ -827,6 +829,7 @@ impl TriangleContents {
}

#[derive(Clone, Debug)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
///
/// A main triangle on the base shape of a subdivided shape.
///
Expand Down Expand Up @@ -1053,6 +1056,7 @@ impl Triangle {
/// lie on the unit sphere.
///
#[derive(Clone)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct Subdivided<T, S: BaseShape> {
points: Vec<Vec3A>,
data: Vec<T>,
Expand Down
6 changes: 6 additions & 0 deletions src/shapes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use glam::Vec3A;
/// then the result will be 12 pentagons and many hexagons.
///
#[derive(Default, Copy, Clone, Debug)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct IcoSphereBase;

impl BaseShape for IcoSphereBase {
Expand Down Expand Up @@ -90,6 +91,7 @@ impl<T> IcoSphere<T> {
/// geometric spherical linear interpolation. (`nlerp` over `slerp`).
///
#[derive(Default, Copy, Clone, Debug)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct NormIcoSphereBase;

impl BaseShape for NormIcoSphereBase {
Expand Down Expand Up @@ -153,6 +155,7 @@ pub type NormIcoSphere<T> = Subdivided<T, NormIcoSphereBase>;
/// be used for acceptable results.
///
#[derive(Default, Copy, Clone, Debug)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct TetraSphereBase;

impl BaseShape for TetraSphereBase {
Expand Down Expand Up @@ -214,6 +217,7 @@ pub type TetraSphere<T> = Subdivided<T, TetraSphereBase>;
/// circle on the triangle has radius 1.0.
///
#[derive(Default, Copy, Clone, Debug)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct TriangleBase;

impl BaseShape for TriangleBase {
Expand Down Expand Up @@ -276,6 +280,7 @@ pub type TrianglePlane<T> = Subdivided<T, TriangleBase>;
/// This is a square on the XZ plane.
///
#[derive(Default, Copy, Clone, Debug)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct SquareBase;

impl BaseShape for SquareBase {
Expand Down Expand Up @@ -324,6 +329,7 @@ pub type SquarePlane<T> = Subdivided<T, SquareBase>;
/// enable this to be used in making a sphere.
///
#[derive(Default, Copy, Clone, Debug)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct CubeBase;

impl BaseShape for CubeBase {
Expand Down