New System for Tile Map, Tile Set, and Brush

editor/src/asset/item.rs

@@ -18,6 +18,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+use fyrox::core::log::Log;
+
 use crate::{
     asset::open_in_explorer,
     fyrox::{
@@ -41,7 +43,7 @@ use crate::{
             UserInterface,
         },
         material::Material,
-        scene::tilemap::tileset::TileSet,
+        scene::tilemap::{brush::TileMapBrush, tileset::TileSet},
     },
     message::MessageSender,
     Message,
@@ -134,19 +136,31 @@ impl AssetItem {
         if self
             .path
             .extension()
-            .map_or(false, |ext| ext == "rgs" || ext == "ui")
+            .is_some_and(|ext| ext == "rgs" || ext == "ui")
         {
             sender.send(Message::LoadScene(self.path.clone()));
-        } else if self.path.extension().map_or(false, |ext| ext == "material") {
+        } else if self.path.extension().is_some_and(|ext| ext == "material") {
             if let Ok(path) = make_relative_path(&self.path) {
                 if let Ok(material) = block_on(resource_manager.request::<Material>(path)) {
                     sender.send(Message::OpenMaterialEditor(material));
                 }
             }
-        } else if self.path.extension().map_or(false, |ext| ext == "tileset") {
+        } else if self.path.extension().is_some_and(|ext| ext == "tileset") {
+            if let Ok(path) = make_relative_path(&self.path) {
+                match block_on(resource_manager.request::<TileSet>(path)) {
+                    Ok(tile_set) => sender.send(Message::OpenTileSetEditor(tile_set)),
+                    Err(err) => Log::err(format!("Open tileset error: {err:?}")),
+                }
+            }
+        } else if self
+            .path
+            .extension()
+            .is_some_and(|ext| ext == "tile_map_brush")
+        {
             if let Ok(path) = make_relative_path(&self.path) {
-                if let Ok(tile_set) = block_on(resource_manager.request::<TileSet>(path)) {
-                    sender.send(Message::OpenTileSetEditor(tile_set));
+                match block_on(resource_manager.request::<TileMapBrush>(path)) {
+                    Ok(brush) => sender.send(Message::OpenTileMapBrushEditor(brush)),
+                    Err(err) => Log::err(format!("Open tile_map_brush error: {err:?}")),
                 }
             }
         } else if self.path.is_dir() {

editor/src/asset/mod.rs

@@ -953,7 +953,7 @@ impl AssetBrowser {
                         folders.push(entry_path);
                     } else if entry_path
                         .extension()
-                        .map_or(false, |ext| is_supported_resource(ext, resource_manager))
+                        .is_some_and(|ext| is_supported_resource(ext, resource_manager))
                     {
                         resources.push(entry_path);
                     }

editor/src/interaction/mod.rs

@@ -115,6 +115,33 @@ pub trait InteractionMode: BaseInteractionMode {
         settings: &Settings,
     );
 
+    /// Called when the mouse enters the scene viewer while this interaction mode is active.
+    #[allow(unused_variables)]
+    fn on_mouse_enter(
+        &mut self,
+        editor_selection: &Selection,
+        controller: &mut dyn SceneController,
+        engine: &mut Engine,
+        frame_size: Vector2<f32>,
+        settings: &Settings,
+    ) {
+    }
+
+    /// Called when the mouse leaves the scene viewer while this interaction mode is active.
+    /// - `mouse_position`: The position of the mouse relative to the scene viewer, with (0,0) being the left-top corner.
+    /// - `editor_selection`: The currently selected object in the editor.
+    #[allow(unused_variables)]
+    fn on_mouse_leave(
+        &mut self,
+        mouse_position: Vector2<f32>,
+        editor_selection: &Selection,
+        controller: &mut dyn SceneController,
+        engine: &mut Engine,
+        frame_size: Vector2<f32>,
+        settings: &Settings,
+    ) {
+    }
+
     fn update(
         &mut self,
         #[allow(unused_variables)] editor_selection: &Selection,

editor/src/lib.rs

@@ -272,9 +272,8 @@ pub fn create_terrain_layer_material() -> MaterialResource {
 pub fn make_scene_file_filter() -> Filter {
     Filter::new(|p: &Path| {
         p.is_dir()
-            || p.extension().map_or(false, |ext| {
-                matches!(ext.to_string_lossy().as_ref(), "rgs" | "ui")
-            })
+            || p.extension()
+                .is_some_and(|ext| matches!(ext.to_string_lossy().as_ref(), "rgs" | "ui"))
     })
 }
 
@@ -1812,7 +1811,7 @@ impl Editor {
             || self
                 .scenes
                 .current_scene_controller_ref()
-                .map_or(false, |s| s.is_interacting())
+                .is_some_and(|s| s.is_interacting())
             || stays_active
     }
 
@@ -1858,7 +1857,7 @@ impl Editor {
 
     fn load_scene(&mut self, scene_path: PathBuf) {
         for entry in self.scenes.entries.iter() {
-            if entry.path.as_ref().map_or(false, |p| p == &scene_path) {
+            if entry.path.as_ref() == Some(&scene_path) {
                 self.set_current_scene(entry.id);
                 return;
             }

editor/src/message.rs

@@ -33,7 +33,7 @@ use crate::{
     scene::Selection,
     SaveSceneConfirmationDialogAction,
 };
-use fyrox::scene::tilemap::tileset::TileSetResource;
+use fyrox::scene::tilemap::{brush::TileMapBrushResource, tileset::TileSetResource};
 use std::sync::mpsc::channel;
 use std::{path::PathBuf, sync::mpsc::Sender};
 
@@ -66,6 +66,7 @@ pub enum Message {
     OpenAbsmEditor,
     OpenMaterialEditor(MaterialResource),
     OpenTileSetEditor(TileSetResource),
+    OpenTileMapBrushEditor(TileMapBrushResource),
     OpenNodeRemovalDialog,
     ShowInAssetBrowser(PathBuf),
     LocateObject {

editor/src/plugins/absm/canvas.rs

@@ -211,7 +211,7 @@ impl AbsmCanvas {
     {
         if ui
             .try_get(node_handle)
-            .map_or(false, |n| n.has_component::<T>())
+            .is_some_and(|n| n.has_component::<T>())
         {
             return node_handle;
         }

editor/src/plugins/absm/state_graph/mod.rs

@@ -132,7 +132,7 @@ impl StateGraphViewer {
         if let Some(view_handle) = ui.node(self.canvas).children().iter().cloned().find(|c| {
             ui.node(*c)
                 .query_component::<TransitionView>()
-                .map_or(false, |transition_view_ref| {
+                .is_some_and(|transition_view_ref| {
                     transition == transition_view_ref.model_handle.into()
                 })
         }) {

editor/src/plugins/absm/state_viewer/mod.rs

@@ -446,7 +446,7 @@ impl StateViewer {
                             if machine_layer
                                 .nodes()
                                 .try_borrow(pose_node.model_handle)
-                                .map_or(false, |node| node.parent_state == self.state.into())
+                                .is_some_and(|node| node.parent_state == self.state.into())
                             {
                                 true
                             } else {

editor/src/plugins/absm/toolbar.rs

@@ -268,7 +268,7 @@ impl Toolbar {
                         .filter(|n| {
                             graph
                                 .try_get(*n)
-                                .map_or(false, |n| !unique_nodes.contains(&n.parent()))
+                                .is_some_and(|n| !unique_nodes.contains(&n.parent()))
                         })
                         .collect::<Vec<_>>();
 

editor/src/plugins/animation/toolbar.rs

@@ -825,12 +825,12 @@ impl Toolbar {
                 .with_title(WindowTitle::text("Select Animation To Import")),
         )
         .with_filter(Filter::new(|p: &Path| {
+            // TODO: Here we allow importing only FBX files, but they can contain
+            // multiple animations and it might be good to also add animation selector
+            // that will be used to select a particular animation to import.
             p.is_dir()
-                || p.extension().map_or(false, |ext|
-                // TODO: Here we allow importing only FBX files, but they can contain
-                // multiple animations and it might be good to also add animation selector
-                // that will be used to select a particular animation to import.
-                ext.to_string_lossy().as_ref() == "fbx")
+                || p.extension()
+                    .is_some_and(|ext| ext.to_string_lossy().as_ref() == "fbx")
         }))
         .build(ctx);
 

editor/src/plugins/inspector/editors/mod.rs

@@ -18,18 +18,26 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-use crate::plugins::inspector::editors::{
-    animation::{
-        AnimationContainerPropertyEditorDefinition, AnimationPropertyEditorDefinition,
-        MachinePropertyEditorDefinition,
+use fyrox::scene::tilemap::TileDefinitionHandle;
+
+use crate::plugins::{
+    inspector::editors::{
+        animation::{
+            AnimationContainerPropertyEditorDefinition, AnimationPropertyEditorDefinition,
+            MachinePropertyEditorDefinition,
+        },
+        font::FontPropertyEditorDefinition,
+        handle::{EntityKind, NodeHandlePropertyEditorDefinition},
+        resource::ResourceFieldPropertyEditorDefinition,
+        script::ScriptPropertyEditorDefinition,
+        spritesheet::SpriteSheetFramesContainerEditorDefinition,
+        surface::SurfaceDataPropertyEditorDefinition,
+        texture::TexturePropertyEditorDefinition,
+    },
+    tilemap::{
+        OptionTileDefinitionHandlePropertyEditorDefinition,
+        TileDefinitionHandlePropertyEditorDefinition,
     },
-    font::FontPropertyEditorDefinition,
-    handle::{EntityKind, NodeHandlePropertyEditorDefinition},
-    resource::ResourceFieldPropertyEditorDefinition,
-    script::ScriptPropertyEditorDefinition,
-    spritesheet::SpriteSheetFramesContainerEditorDefinition,
-    surface::SurfaceDataPropertyEditorDefinition,
-    texture::TexturePropertyEditorDefinition,
 };
 use crate::{
     fyrox::{
@@ -106,7 +114,7 @@ use crate::{
             },
             terrain::{Chunk, Layer},
             tilemap::brush::{TileMapBrush, TileMapBrushResource},
-            tilemap::tileset::TileCollider,
+            tilemap::TileCollider,
             tilemap::{tileset::TileSet, Tile},
             transform::Transform,
         },
@@ -211,6 +219,11 @@ where
 pub fn make_property_editors_container(sender: MessageSender) -> PropertyEditorDefinitionContainer {
     let container = PropertyEditorDefinitionContainer::with_default_editors();
 
+    container.insert(TileDefinitionHandlePropertyEditorDefinition);
+    container.insert(OptionTileDefinitionHandlePropertyEditorDefinition);
+    container.register_inheritable_vec_collection::<TileDefinitionHandle>();
+    container.register_inheritable_vec_collection::<Option<TileDefinitionHandle>>();
+
     container.insert(TexturePropertyEditorDefinition { untyped: false });
     container.insert(TexturePropertyEditorDefinition { untyped: true });
     container.insert(FontPropertyEditorDefinition);

editor/src/plugins/path_fixer.rs

@@ -326,7 +326,7 @@ impl PathFixer {
                                 // Turn hash map into vec to be able to index it.
                                 self.orphaned_scene_resources = scene_resources
                                     .into_iter()
-                                    .filter(|r| !r.kind().path().map_or(false, |p| p.exists()))
+                                    .filter(|r| !r.kind().path().is_some_and(|p| p.exists()))
                                     .collect::<Vec<_>>();
 
                                 let ctx = &mut ui.build_ctx();