berkus
/
topola
mirror of https://codeberg.org/topola/topola.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(interactor): use enum_dispatch for ActivityStepper

This commit is contained in:
Ellen Emilia Anna Zscheile 2025-03-29 22:28:04 +01:00
parent bf1addbdaf
commit 566949d4c1
1 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/interactor/activity.rs
View File

@ -4,6 +4,7 @@
use std::ops::ControlFlow; use std::ops::ControlFlow;
use enum_dispatch::enum_dispatch;
use geo::Point; use geo::Point;
use thiserror::Error; use thiserror::Error;
@ -43,6 +44,7 @@ pub enum ActivityError {
} }
/// An activity is either an interaction or an execution /// An activity is either an interaction or an execution
#[enum_dispatch(GetMaybeNavmesh, GetMaybeNavcord, GetGhosts, GetObstacles)]
pub enum ActivityStepper { pub enum ActivityStepper {
Interaction(InteractionStepper), Interaction(InteractionStepper),
Execution(ExecutionStepper), Execution(ExecutionStepper),
@ -73,46 +75,6 @@ impl<M: AccessMesadata> Abort<ActivityContext<'_, M>> for ActivityStepper {
} }
} }
impl GetMaybeNavmesh for ActivityStepper {
/// Implemented manually instead of with `enum_dispatch` because it doesn't work across crates.
fn maybe_navmesh(&self) -> Option<&Navmesh> {
match self {
ActivityStepper::Interaction(interaction) => interaction.maybe_navmesh(),
ActivityStepper::Execution(execution) => execution.maybe_navmesh(),
}
}
}
impl GetMaybeNavcord for ActivityStepper {
/// Implemented manually instead of with `enum_dispatch` because it doesn't work across crates.
fn maybe_navcord(&self) -> Option<&NavcordStepper> {
match self {
ActivityStepper::Interaction(interaction) => interaction.maybe_navcord(),
ActivityStepper::Execution(execution) => execution.maybe_navcord(),
}
}
}
impl GetGhosts for ActivityStepper {
/// Implemented manually instead of with `enum_dispatch` because it doesn't work across crates.
fn ghosts(&self) -> &[PrimitiveShape] {
match self {
ActivityStepper::Interaction(interaction) => interaction.ghosts(),
ActivityStepper::Execution(execution) => execution.ghosts(),
}
}
}
impl GetObstacles for ActivityStepper {
/// Implemented manually instead of with `enum_dispatch` because it doesn't work across crates.
fn obstacles(&self) -> &[PrimitiveIndex] {
match self {
ActivityStepper::Interaction(interaction) => interaction.obstacles(),
ActivityStepper::Execution(execution) => execution.obstacles(),
}
}
}
/// An ActivityStepper that preserves its status /// An ActivityStepper that preserves its status
pub struct ActivityStepperWithStatus { pub struct ActivityStepperWithStatus {
activity: ActivityStepper, activity: ActivityStepper,