Skip to content

Commit 29090c4

Browse files
eadfeadf
authored
fmt (#135)
1 parent ac6a2cd commit 29090c4

22 files changed

+146
-30
lines changed

‎src/contact.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ use cgmath::prelude::*;
88
/// found contact will have this returned on it, detailing what data is relevant in the
99
/// [`Contact`](struct.Contact.html).
1010
#[derive(Debug, PartialEq, Copy, Clone, PartialOrd)]
11-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
11+
#[cfg_attr(
12+
feature = "serde",
13+
derive(Serialize, Deserialize),
14+
serde(crate = "serde_crate")
15+
)]
1216
pub enum CollisionStrategy {
1317
/// Compute full contact manifold for the collision
1418
FullResolution,

‎src/frustum.rs

+10-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ use cgmath::{Ortho, Perspective, PerspectiveFov};
99

1010
/// View frustum, used for frustum culling
1111
#[derive(Copy, Clone, Debug, PartialEq)]
12-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
12+
#[cfg_attr(
13+
feature = "serde",
14+
derive(Serialize, Deserialize),
15+
serde(crate = "serde_crate")
16+
)]
1317
pub struct Frustum<S: BaseFloat> {
1418
/// Left plane
1519
pub left: Plane<S>,
@@ -99,7 +103,11 @@ impl<S: BaseFloat> Frustum<S> {
99103

100104
/// View frustum corner points
101105
#[derive(Copy, Clone, PartialEq, Debug)]
102-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
106+
#[cfg_attr(
107+
feature = "serde",
108+
derive(Serialize, Deserialize),
109+
serde(crate = "serde_crate")
110+
)]
103111
pub struct FrustumPoints<S> {
104112
/// Near top left point
105113
pub near_top_left: Point3<S>,

‎src/line.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ use crate::Ray2;
1313

1414
/// A generic directed line segment from `origin` to `dest`.
1515
#[derive(Copy, Clone, PartialEq)]
16-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
16+
#[cfg_attr(
17+
feature = "serde",
18+
derive(Serialize, Deserialize),
19+
serde(crate = "serde_crate")
20+
)]
1721
pub struct Line<S, V, P> {
1822
/// Origin of the line
1923
pub origin: P,

‎src/plane.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ use crate::Ray3;
2424
/// alternative, `A*x + B*y + C*z + D = 0`, because it tends to avoid
2525
/// superfluous negations (see _Real Time Collision Detection_, p. 55).
2626
#[derive(Copy, Clone, PartialEq)]
27-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
27+
#[cfg_attr(
28+
feature = "serde",
29+
derive(Serialize, Deserialize),
30+
serde(crate = "serde_crate")
31+
)]
2832
pub struct Plane<S> {
2933
/// Plane normal
3034
pub n: Vector3<S>,

‎src/primitive/capsule.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ use crate::{Aabb3, Ray3};
99
/// Capsule primitive
1010
/// Capsule body is aligned with the Y axis, with local origin in the center of the capsule.
1111
#[derive(Debug, Clone, PartialEq)]
12-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
12+
#[cfg_attr(
13+
feature = "serde",
14+
derive(Serialize, Deserialize),
15+
serde(crate = "serde_crate")
16+
)]
1317
pub struct Capsule<S> {
1418
half_height: S,
1519
radius: S,

‎src/primitive/circle.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ use crate::{Aabb2, Ray2};
88

99
/// Circle primitive
1010
#[derive(Debug, Clone, PartialEq)]
11-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
11+
#[cfg_attr(
12+
feature = "serde",
13+
derive(Serialize, Deserialize),
14+
serde(crate = "serde_crate")
15+
)]
1216
pub struct Circle<S> {
1317
/// Radius of the circle
1418
pub radius: S,

‎src/primitive/cuboid.rs

+10-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ use crate::{Aabb3, Ray3};
1010
///
1111
/// Have a cached set of corner points to speed up computation.
1212
#[derive(Debug, Clone, PartialEq)]
13-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
13+
#[cfg_attr(
14+
feature = "serde",
15+
derive(Serialize, Deserialize),
16+
serde(crate = "serde_crate")
17+
)]
1418
pub struct Cuboid<S> {
1519
/// Dimensions of the box
1620
dim: Vector3<S>,
@@ -132,7 +136,11 @@ where
132136
///
133137
/// Have a cached set of corner points to speed up computation.
134138
#[derive(Debug, Clone, PartialEq)]
135-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
139+
#[cfg_attr(
140+
feature = "serde",
141+
derive(Serialize, Deserialize),
142+
serde(crate = "serde_crate")
143+
)]
136144
pub struct Cube<S> {
137145
cuboid: Cuboid<S>,
138146
}

‎src/primitive/cylinder.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ use crate::{Aabb3, Ray3};
99
/// Cylinder primitive
1010
/// Cylinder body is aligned with the Y axis, with local origin in the center of the cylinders.
1111
#[derive(Debug, Clone, PartialEq)]
12-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
12+
#[cfg_attr(
13+
feature = "serde",
14+
derive(Serialize, Deserialize),
15+
serde(crate = "serde_crate")
16+
)]
1317
pub struct Cylinder<S> {
1418
half_height: S,
1519
radius: S,

‎src/primitive/particle.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ use crate::Ray;
1717
/// These intersection tests can be used with any primitive that has `Ray` intersection tests
1818
/// implemented.
1919
#[derive(Debug, Clone, PartialEq)]
20-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
20+
#[cfg_attr(
21+
feature = "serde",
22+
derive(Serialize, Deserialize),
23+
serde(crate = "serde_crate")
24+
)]
2125
pub struct Particle<P> {
2226
m: marker::PhantomData<P>,
2327
}

‎src/primitive/polygon.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ use crate::{Aabb2, Line2, Ray2};
1212
/// Can contain any number of vertices, but a high number of vertices will
1313
/// affect performance of course. Vertices need to be in CCW order.
1414
#[derive(Debug, Clone, PartialEq)]
15-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
15+
#[cfg_attr(
16+
feature = "serde",
17+
derive(Serialize, Deserialize),
18+
serde(crate = "serde_crate")
19+
)]
1620
pub struct ConvexPolygon<S> {
1721
/// Vertices of the convex polygon.
1822
pub vertices: Vec<Point2<S>>,

‎src/primitive/polyhedron.rs

+25-5
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,34 @@ use crate::volume::Sphere;
1111
use crate::{Aabb3, Plane, Ray3};
1212

1313
#[derive(Debug, Clone, PartialEq)]
14-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
14+
#[cfg_attr(
15+
feature = "serde",
16+
derive(Serialize, Deserialize),
17+
serde(crate = "serde_crate")
18+
)]
1519
enum PolyhedronMode {
1620
VertexOnly,
1721
HalfEdge,
1822
}
1923

2024
#[derive(Debug, Clone, PartialEq)]
21-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
25+
#[cfg_attr(
26+
feature = "serde",
27+
derive(Serialize, Deserialize),
28+
serde(crate = "serde_crate")
29+
)]
2230
struct Vertex<S> {
2331
position: Point3<S>,
2432
edge: usize,
2533
ready: bool,
2634
}
2735

2836
#[derive(Debug, Clone, PartialEq)]
29-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
37+
#[cfg_attr(
38+
feature = "serde",
39+
derive(Serialize, Deserialize),
40+
serde(crate = "serde_crate")
41+
)]
3042
struct Edge {
3143
target_vertex: usize,
3244
left_face: usize,
@@ -37,7 +49,11 @@ struct Edge {
3749
}
3850

3951
#[derive(Debug, Clone, PartialEq)]
40-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
52+
#[cfg_attr(
53+
feature = "serde",
54+
derive(Serialize, Deserialize),
55+
serde(crate = "serde_crate")
56+
)]
4157
struct Face<S>
4258
where
4359
S: BaseFloat,
@@ -59,7 +75,11 @@ where
5975
///
6076
///
6177
#[derive(Debug, Clone, PartialEq)]
62-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
78+
#[cfg_attr(
79+
feature = "serde",
80+
derive(Serialize, Deserialize),
81+
serde(crate = "serde_crate")
82+
)]
6383
pub struct ConvexPolyhedron<S>
6484
where
6585
S: BaseFloat,

‎src/primitive/primitive2.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@ use crate::{Aabb2, Line2, Ray2};
1010
/// Wrapper enum for 2D primitives, that also implements the `Primitive` trait, making it easier
1111
/// to use many different primitives in algorithms.
1212
#[derive(Debug, Clone, PartialEq)]
13-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
14-
pub enum Primitive2<S:cgmath::BaseNum> {
13+
#[cfg_attr(
14+
feature = "serde",
15+
derive(Serialize, Deserialize),
16+
serde(crate = "serde_crate")
17+
)]
18+
pub enum Primitive2<S: cgmath::BaseNum> {
1519
/// Particle
1620
Particle(Particle2<S>),
1721
/// Line

‎src/primitive/primitive3.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ use crate::{Aabb3, Ray3};
1212
/// Wrapper enum for 3D primitives, that also implements the `Primitive` trait, making it easier
1313
/// to use many different primitives in algorithms.
1414
#[derive(Debug, Clone, PartialEq)]
15-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
15+
#[cfg_attr(
16+
feature = "serde",
17+
derive(Serialize, Deserialize),
18+
serde(crate = "serde_crate")
19+
)]
1620
pub enum Primitive3<S>
1721
where
1822
S: BaseFloat,

‎src/primitive/quad.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ use crate::{Aabb3, Ray3, Sphere};
1111
///
1212
/// Have a cached set of corner points to speed up computation.
1313
#[derive(Debug, Clone, PartialEq)]
14-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
14+
#[cfg_attr(
15+
feature = "serde",
16+
derive(Serialize, Deserialize),
17+
serde(crate = "serde_crate")
18+
)]
1519
pub struct Quad<S> {
1620
/// Dimensions of the rectangle
1721
dim: Vector2<S>,

‎src/primitive/rectangle.rs

+10-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ use crate::{Aabb2, Ray2};
1111
///
1212
/// Have a cached set of corner points to speed up computation.
1313
#[derive(Debug, Clone, PartialEq)]
14-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
14+
#[cfg_attr(
15+
feature = "serde",
16+
derive(Serialize, Deserialize),
17+
serde(crate = "serde_crate")
18+
)]
1519
pub struct Rectangle<S> {
1620
/// Dimensions of the rectangle
1721
dim: Vector2<S>,
@@ -110,7 +114,11 @@ where
110114
///
111115
/// Have a cached set of corner points to speed up computation.
112116
#[derive(Debug, Clone, PartialEq)]
113-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
117+
#[cfg_attr(
118+
feature = "serde",
119+
derive(Serialize, Deserialize),
120+
serde(crate = "serde_crate")
121+
)]
114122
pub struct Square<S> {
115123
rectangle: Rectangle<S>,
116124
}

‎src/primitive/sphere.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ use crate::{Aabb3, Ray3};
66

77
/// Sphere primitive
88
#[derive(Debug, Clone, PartialEq)]
9-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
9+
#[cfg_attr(
10+
feature = "serde",
11+
derive(Serialize, Deserialize),
12+
serde(crate = "serde_crate")
13+
)]
1014
pub struct Sphere<S> {
1115
/// Radius of the sphere
1216
pub radius: S,

‎src/ray.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ use crate::traits::{Continuous, ContinuousTransformed, Discrete, DiscreteTransfo
1313
/// A generic ray starting at `origin` and extending infinitely in
1414
/// `direction`.
1515
#[derive(Copy, Clone, PartialEq)]
16-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
16+
#[cfg_attr(
17+
feature = "serde",
18+
derive(Serialize, Deserialize),
19+
serde(crate = "serde_crate")
20+
)]
1721
pub struct Ray<S, P, V> {
1822
/// Ray origin
1923
pub origin: P,

‎src/volume/aabb/aabb2.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ use crate::{Line2, Ray2};
1212

1313
/// A two-dimensional AABB, aka a rectangle.
1414
#[derive(Copy, Clone, PartialEq)]
15-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
15+
#[cfg_attr(
16+
feature = "serde",
17+
derive(Serialize, Deserialize),
18+
serde(crate = "serde_crate")
19+
)]
1620
pub struct Aabb2<S> {
1721
/// Minimum point of the AABB
1822
pub min: Point2<S>,

‎src/volume/aabb/aabb3.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ use crate::{Line3, Plane, Ray3, Sphere};
1212

1313
/// A three-dimensional AABB, aka a rectangular prism.
1414
#[derive(Copy, Clone, PartialEq)]
15-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
15+
#[cfg_attr(
16+
feature = "serde",
17+
derive(Serialize, Deserialize),
18+
serde(crate = "serde_crate")
19+
)]
1620
pub struct Aabb3<S> {
1721
/// Minimum point of the AABB
1822
pub min: Point3<S>,

‎src/volume/cylinder.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ use cgmath::Vector3;
55

66
/// Bounding cylinder
77
#[derive(Copy, Clone, PartialEq, Debug)]
8-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
8+
#[cfg_attr(
9+
feature = "serde",
10+
derive(Serialize, Deserialize),
11+
serde(crate = "serde_crate")
12+
)]
913
pub struct Cylinder<S> {
1014
/// Center point
1115
pub center: Point3<S>,

‎src/volume/obb.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ use cgmath::{Vector2, Vector3};
88
/// Generic object bounding box, centered on `center`, aligned with `axis`,
99
/// and with size `extents`.
1010
#[derive(Copy, Clone, PartialEq, Debug)]
11-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
11+
#[cfg_attr(
12+
feature = "serde",
13+
derive(Serialize, Deserialize),
14+
serde(crate = "serde_crate")
15+
)]
1216
pub struct Obb<S, V, P> {
1317
/// OBB center point in world space
1418
pub center: P,

‎src/volume/sphere.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ use crate::{Aabb3, Line3, Plane, Ray3};
88

99
/// Bounding sphere.
1010
#[derive(Copy, Clone, PartialEq, Debug)]
11-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
11+
#[cfg_attr(
12+
feature = "serde",
13+
derive(Serialize, Deserialize),
14+
serde(crate = "serde_crate")
15+
)]
1216
pub struct Sphere<S: BaseFloat> {
1317
/// Center point of the sphere in world space
1418
pub center: Point3<S>,

0 commit comments

Comments
 (0)