diff options
| author | Laurenz <laurmaedje@gmail.com> | 2022-01-24 16:48:24 +0100 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2022-01-24 17:39:49 +0100 |
| commit | 3739ab77207e0e54edb55a110a16a1eb925b84f4 (patch) | |
| tree | 06c8e5987d2fe070ad273ef94641161bbaef7095 /src/geom | |
| parent | db158719d67fdef1d2c76300fb232cf2d4bfb35d (diff) | |
Export into rendered images
Diffstat (limited to 'src/geom')
| -rw-r--r-- | src/geom/angle.rs | 1 | ||||
| -rw-r--r-- | src/geom/em.rs | 1 | ||||
| -rw-r--r-- | src/geom/length.rs | 2 | ||||
| -rw-r--r-- | src/geom/mod.rs | 2 | ||||
| -rw-r--r-- | src/geom/paint.rs | 6 | ||||
| -rw-r--r-- | src/geom/path.rs | 5 | ||||
| -rw-r--r-- | src/geom/point.rs | 2 | ||||
| -rw-r--r-- | src/geom/relative.rs | 1 | ||||
| -rw-r--r-- | src/geom/scalar.rs | 3 | ||||
| -rw-r--r-- | src/geom/spec.rs | 2 | ||||
| -rw-r--r-- | src/geom/transform.rs | 2 |
11 files changed, 9 insertions, 18 deletions
diff --git a/src/geom/angle.rs b/src/geom/angle.rs index af47e51d..df2aca17 100644 --- a/src/geom/angle.rs +++ b/src/geom/angle.rs @@ -2,7 +2,6 @@ use super::*; /// An angle. #[derive(Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)] -#[derive(Serialize, Deserialize)] pub struct Angle(Scalar); impl Angle { diff --git a/src/geom/em.rs b/src/geom/em.rs index 1868222f..af6be706 100644 --- a/src/geom/em.rs +++ b/src/geom/em.rs @@ -4,7 +4,6 @@ use super::*; /// /// `1em` is the same as the font size. #[derive(Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)] -#[derive(Serialize, Deserialize)] pub struct Em(Scalar); impl Em { diff --git a/src/geom/length.rs b/src/geom/length.rs index 210dcce7..b01a7123 100644 --- a/src/geom/length.rs +++ b/src/geom/length.rs @@ -2,8 +2,6 @@ use super::*; /// An absolute length. #[derive(Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)] -#[derive(Serialize, Deserialize)] -#[serde(transparent)] pub struct Length(Scalar); impl Length { diff --git a/src/geom/mod.rs b/src/geom/mod.rs index 2f722f16..a03e88b0 100644 --- a/src/geom/mod.rs +++ b/src/geom/mod.rs @@ -43,8 +43,6 @@ use std::hash::{Hash, Hasher}; use std::iter::Sum; use std::ops::*; -use serde::{Deserialize, Serialize}; - /// Generic access to a structure's components. pub trait Get<Index> { /// The structure's component type. diff --git a/src/geom/paint.rs b/src/geom/paint.rs index 0eba9f2f..d906561c 100644 --- a/src/geom/paint.rs +++ b/src/geom/paint.rs @@ -4,7 +4,7 @@ use std::str::FromStr; use super::*; /// How a fill or stroke should be painted. -#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)] +#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] pub enum Paint { /// A solid color. Solid(Color), @@ -20,7 +20,7 @@ where } /// A color in a dynamic format. -#[derive(Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)] +#[derive(Copy, Clone, Eq, PartialEq, Hash)] pub enum Color { /// An 8-bit RGBA color. Rgba(RgbaColor), @@ -41,7 +41,7 @@ impl From<RgbaColor> for Color { } /// An 8-bit RGBA color. -#[derive(Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)] +#[derive(Copy, Clone, Eq, PartialEq, Hash)] pub struct RgbaColor { /// Red channel. pub r: u8, diff --git a/src/geom/path.rs b/src/geom/path.rs index 87e20dd1..836be1b4 100644 --- a/src/geom/path.rs +++ b/src/geom/path.rs @@ -1,12 +1,11 @@ use super::*; /// A bezier path. -#[derive(Debug, Default, Clone, Eq, PartialEq, Serialize, Deserialize)] -#[serde(transparent)] +#[derive(Debug, Default, Clone, Eq, PartialEq)] pub struct Path(pub Vec<PathElement>); /// An element in a bezier path. -#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)] +#[derive(Debug, Clone, Eq, PartialEq)] pub enum PathElement { MoveTo(Point), LineTo(Point), diff --git a/src/geom/point.rs b/src/geom/point.rs index ab8f4439..6d77507b 100644 --- a/src/geom/point.rs +++ b/src/geom/point.rs @@ -1,7 +1,7 @@ use super::*; /// A point in 2D. -#[derive(Default, Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)] +#[derive(Default, Copy, Clone, Eq, PartialEq, Hash)] pub struct Point { /// The x coordinate. pub x: Length, diff --git a/src/geom/relative.rs b/src/geom/relative.rs index c894f4a5..6f6b152f 100644 --- a/src/geom/relative.rs +++ b/src/geom/relative.rs @@ -5,7 +5,6 @@ use super::*; /// _Note_: `50%` is represented as `0.5` here, but stored as `50.0` in the /// corresponding [literal](crate::syntax::ast::LitKind::Percent). #[derive(Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)] -#[derive(Serialize, Deserialize)] pub struct Relative(Scalar); impl Relative { diff --git a/src/geom/scalar.rs b/src/geom/scalar.rs index 948ea7ec..1435654d 100644 --- a/src/geom/scalar.rs +++ b/src/geom/scalar.rs @@ -3,8 +3,7 @@ use super::*; /// A 64-bit float that implements `Eq`, `Ord` and `Hash`. /// /// Panics if it's `NaN` during any of those operations. -#[derive(Default, Copy, Clone, Serialize, Deserialize)] -#[serde(transparent)] +#[derive(Default, Copy, Clone)] pub struct Scalar(pub f64); impl From<f64> for Scalar { diff --git a/src/geom/spec.rs b/src/geom/spec.rs index cf75f42d..1b8e13c2 100644 --- a/src/geom/spec.rs +++ b/src/geom/spec.rs @@ -4,7 +4,7 @@ use std::ops::{BitAnd, BitAndAssign, BitOr, BitOrAssign, Not}; use super::*; /// A container with a horizontal and vertical component. -#[derive(Default, Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)] +#[derive(Default, Copy, Clone, Eq, PartialEq, Hash)] pub struct Spec<T> { /// The horizontal component. pub x: T, diff --git a/src/geom/transform.rs b/src/geom/transform.rs index 76615e75..eed51d46 100644 --- a/src/geom/transform.rs +++ b/src/geom/transform.rs @@ -1,7 +1,7 @@ use super::*; /// A scale-skew-translate transformation. -#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)] +#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] pub struct Transform { pub sx: Relative, pub ky: Relative, |
