Split out workcell editor #239
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,9 +3,3 @@ pub fn demo_office() -> Vec<u8> { | |
| .as_bytes() | ||
| .to_vec(); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,8 +15,11 @@ | |
| * | ||
| */ | ||
|
|
||
| use crate::{ | ||
| interaction::select::*, | ||
| site::{CurrentLevel, Model}, | ||
| }; | ||
| use bevy::ecs::system::{Command, SystemParam, SystemState}; | ||
|
|
||
| #[derive(Default)] | ||
| pub struct ObjectPlacementPlugin {} | ||
|
|
@@ -31,38 +34,28 @@ impl Plugin for ObjectPlacementPlugin { | |
| #[derive(Resource, Clone, Copy)] | ||
| pub struct ObjectPlacementServices { | ||
| pub place_object_2d: Service<Option<Entity>, ()>, | ||
| } | ||
|
|
||
| impl ObjectPlacementServices { | ||
| pub fn from_app(app: &mut App) -> Self { | ||
| let place_object_2d = spawn_place_object_2d_workflow(app); | ||
| Self { place_object_2d } | ||
| } | ||
| } | ||
|
|
||
| #[derive(SystemParam)] | ||
| pub struct ObjectPlacement<'w, 's> { | ||
| pub services: Res<'w, ObjectPlacementServices>, | ||
| pub commands: Commands<'w, 's>, | ||
| current_level: Res<'w, CurrentLevel>, | ||
| } | ||
|
|
||
| impl<'w, 's> ObjectPlacement<'w, 's> { | ||
| pub fn place_object_2d(&mut self, object: Model) { | ||
| let Some(level) = self.current_level.0 else { | ||
| warn!("Unble to create [object:?] outside a level"); | ||
| return; | ||
| }; | ||
|
Comment on lines
-65
to
+58
There was a problem hiding this comment. This is part of my effort to reduce code duplication. I refactored both 2d and 3d object placement to take the same input (just a rmf_site/rmf_site_editor/src/widgets/fuel_asset_browser.rs Lines 28 to 40 in 3496425 |
||
| let state = self | ||
| .commands | ||
| .spawn(SelectorInput(PlaceObject2d { object, level })) | ||
|
|
@@ -73,40 +66,32 @@ impl<'w, 's> ObjectPlacement<'w, 's> { | |
| }); | ||
| } | ||
|
|
||
| fn send(&mut self, run: RunSelector) { | ||
| self.commands.add(move |world: &mut World| { | ||
| world.send_event(run); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| /// Trait to be implemented to allow placing models with commands | ||
| pub trait ObjectPlacementExt<'w, 's> { | ||
| fn place_object_2d(&mut self, object: Model); | ||
| } | ||
|
|
||
| impl<'w, 's> ObjectPlacementExt<'w, 's> for Commands<'w, 's> { | ||
| fn place_object_2d(&mut self, object: Model) { | ||
| self.add(ObjectPlaceCommand(object)); | ||
| } | ||
| } | ||
|
|
||
| #[derive(Deref, DerefMut)] | ||
| pub struct ObjectPlaceCommand(Model); | ||
|
|
||
| impl Command for ObjectPlaceCommand { | ||
| fn apply(self, world: &mut World) { | ||
| let mut system_state: SystemState<ObjectPlacement> = SystemState::new(world); | ||
| let mut placement = system_state.get_mut(world); | ||
| placement.place_object_2d(self.0); | ||
| system_state.apply(world); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This resource initialization has been moved here from other plugins since the
InteractionPluginwill panic if used in a third party app without them.An alternative solution could be to split the interaction plugin into several sub-plugins and allow users to only include the ones they need, but that would have been a much larger refactor so I left it out for now.