From 1517aa11d00f0eaf4ce98858761cf02ccc254e53 Mon Sep 17 00:00:00 2001 From: hodasemi Date: Sat, 24 Aug 2024 19:50:41 +0200 Subject: [PATCH] Split engine object --- engine/src/engine/engineobject.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/engine/src/engine/engineobject.rs b/engine/src/engine/engineobject.rs index 2ee7d93..8e1ac7f 100644 --- a/engine/src/engine/engineobject.rs +++ b/engine/src/engine/engineobject.rs @@ -29,14 +29,9 @@ pub enum EngineEvent { FileDrop(String), } -pub trait EngineObject: Any { +pub trait EngineObjectHelper: Any { type Payload: Send + Sync; - fn name(&self) -> &str; - - fn update(&mut self) -> Result<()>; - fn event(&mut self, event: EngineEvent) -> Result<()>; - fn access(&self) -> EngineObjectAccess<'_, Self::Payload>; fn payload(&self) -> EngineObjectDataHandle; fn ui(&self) -> &States; @@ -97,6 +92,13 @@ pub trait EngineObject: Any { } } +pub trait EngineObject: Any { + fn name(&self) -> &str; + + fn update(&mut self) -> Result<()>; + fn event(&mut self, event: EngineEvent) -> Result<()>; +} + pub struct Input { pub direction_mapping: HashMap, }