New editor UI

Cargo.toml

@@ -22,13 +22,22 @@ opt-level = 3
 core = { path = "./core", package = "fishfight-core" }
 # ultimate = { path = "../FishFight-ultimate", package = "fishfight-ultimate", optional = true }
 ff-particles = { version = "0.1", features = ["serde"] }
-fishsticks = { git = "https://github.com/fishfight/fishsticks", default-features = false, features = ["gilrs"] }
+fishsticks = { git = "https://github.com/fishfight/fishsticks", default-features = false, features = [
+    "gilrs",
+] }
 macroquad = { version = "0.3.10" }
 macroquad-platformer = "0.1"
 hecs = "0.7.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+egui = "0.18.1"
+egui_extras = { git = "https://github.com/aleokdev/egui" }
+egui-macroquad = "0.9.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen = "0.2.74"
 
+[patch.crates-io]
+# Temporal patch until https://github.com/optozorax/egui-macroquad/pull/17 gets merged
+egui-macroquad = { git = "https://github.com/aleokdev/egui-macroquad" }
+egui = { git = "https://github.com/aleokdev/egui" }

assets/textures.json

@@ -83,6 +83,14 @@
       "y": 49
     }
   },
+  {
+    "id": "object_error_icon",
+    "path": "textures/ui/editor_icons/error.png",
+    "sprite_size": {
+      "x": 32,
+      "y": 32
+    }
+  },
   {
     "id": "spawn_point_placement_tool_icon",
     "path": "textures/ui/editor_icons/Pointer and Map.png",
@@ -631,4 +639,4 @@
       "y": 6
     }
   }
-]
+]

core/src/input/mapping.rs

@@ -526,7 +526,7 @@ impl From<usize> for GamepadMapping {
 
 impl From<&GamepadId> for GamepadMapping {
     fn from(id: &GamepadId) -> Self {
-        let id: usize = id.into();
+        let id: usize = (*id).into();
         id.into()
     }
 }

core/src/input/mod.rs

@@ -77,7 +77,7 @@ pub fn collect_local_input(input_scheme: GameInputScheme) -> PlayerInput {
                 let config = storage::get::<Config>();
                 config
                     .input
-                    .get_gamepad_mapping(ix.into())
+                    .get_gamepad_mapping((*ix).into())
                     .unwrap_or_else(|| ix.into())
             };
 

src/editor/RATIONALE.md

@@ -0,0 +1,18 @@
+TODO: Delete this file before merging!
+
+- I changed the type of selected_tool from an option of type ID to an enum, because the available
+tools are known at compiletime.
+- The `actions` module file was too crowded, so I split all actions into their own files in `actions/`.
+I think it's much more organized this way.
+- Actions have been stripped from the `Action` suffix, as the parent module already tells us that
+they are actions: `editor::actions::CreateLayerAction`. So instead of importing all the actions from
+the editor and directly calling them with their names, I just import the actions module and refer to
+them as `actions::CreateLayer` for instance. I think this is less redundant and also eliminates the
+need to import all used actions, as their names are shorter.
+- First, I tried to make the `ui` method in the editor state be immutable, sending *all* actions
+through `UiAction`s being returned from the function. After a lot of work, I decided against making
+it immutable. The reasoning behind this change is that passing all changes through the `UiAction`
+enum is tiring and mechanical work that doesn't always have benefits, as there are some changes
+that are *not* kept track of, such as opening windows, closing them, changing data within these
+windows, etc. As of now, changes that do not require keeping track of are performed immediately,
+while actions that do go through the history are sent through `apply_action` immediately.

src/editor/TODO.md

@@ -0,0 +1,13 @@
+- [X] Object list
+- [X] Spawnpoint placement
+- [X] Spawnpoint selection & movement
+- [X] Object placement via rightclick context menu
+- [X] Re-add object placement tool
+- [X] Moving camera via middle click
+- [X] Open map window
+- [X] Import map window
+- [X] New map window
+- [X] Background edit window
+- [X] Map zoom
+- [ ] Theme support
+- [ ] Gamepad support