diff options
| author | Sébastien Crozet <developer@crozet.re> | 2022-01-23 09:16:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-23 09:16:52 -0800 |
| commit | 71bb25acf821512f5c6d5cfc4e8db5b853f4cb0b (patch) | |
| tree | b2467543ba4610bc7d3e0902f6d45e3fb3823a01 /src/geometry | |
| parent | 1608a1323ed76cdf33644cfea599cea715acf7a9 (diff) | |
| parent | 0c7ebae1aaae3ca2a55e33429a4466110deda208 (diff) | |
| download | rapier-71bb25acf821512f5c6d5cfc4e8db5b853f4cb0b.tar.gz rapier-71bb25acf821512f5c6d5cfc4e8db5b853f4cb0b.tar.bz2 rapier-71bb25acf821512f5c6d5cfc4e8db5b853f4cb0b.zip | |
Merge pull request #274 from besok/master
add defaults for the several structs
Diffstat (limited to 'src/geometry')
| -rw-r--r-- | src/geometry/broad_phase_multi_sap/broad_phase_pair_event.rs | 6 | ||||
| -rw-r--r-- | src/geometry/collider_components.rs | 2 | ||||
| -rw-r--r-- | src/geometry/narrow_phase.rs | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/geometry/broad_phase_multi_sap/broad_phase_pair_event.rs b/src/geometry/broad_phase_multi_sap/broad_phase_pair_event.rs index f72d1df..7b489f5 100644 --- a/src/geometry/broad_phase_multi_sap/broad_phase_pair_event.rs +++ b/src/geometry/broad_phase_multi_sap/broad_phase_pair_event.rs @@ -33,6 +33,12 @@ impl ColliderPair { } } +impl Default for ColliderPair { + fn default() -> Self { + ColliderPair::zero() + } +} + /// An event emitted by the broad-phase. pub enum BroadPhasePairEvent { /// A potential new collision pair has been detected by the broad-phase. diff --git a/src/geometry/collider_components.rs b/src/geometry/collider_components.rs index 1c737dd..fe2961f 100644 --- a/src/geometry/collider_components.rs +++ b/src/geometry/collider_components.rs @@ -6,7 +6,7 @@ use crate::pipeline::{ActiveEvents, ActiveHooks}; use std::ops::{Deref, DerefMut}; /// The unique identifier of a collider added to a collider set. -#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] +#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Default)] #[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))] #[repr(transparent)] pub struct ColliderHandle(pub crate::data::arena::Index); diff --git a/src/geometry/narrow_phase.rs b/src/geometry/narrow_phase.rs index 643b584..df49aa9 100644 --- a/src/geometry/narrow_phase.rs +++ b/src/geometry/narrow_phase.rs @@ -24,7 +24,7 @@ use std::collections::HashMap; use std::sync::Arc; #[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))] -#[derive(Copy, Clone, Debug, PartialEq, Eq)] +#[derive(Copy, Clone, Debug, PartialEq, Eq, Default)] struct ColliderGraphIndices { contact_graph_index: ColliderGraphIndex, intersection_graph_index: ColliderGraphIndex, |