[WIP] Event editor

README.md

@@ -35,7 +35,7 @@ If you're on Linux at the moment for best performance you'll need Chrome canary
 
 Native builds are the main focus at the moment, but no official releases will be made until Luminol is stable.
 If you want to test out Luminol anyway, you can grab a build from [our build workflow](https://github.com/Astrabit-ST/Luminol/actions/workflows/build.yml). 
-We're working on a website where you'll eventually be able to use the latest development build of Luminol!
+It's currently WIP, but there's [a website](https://luminol.dev) where you can try the latest development build of Luminol!
 
 If you'd like to compile luminol yourself, you can by grabbing your favorite nightly rust toolchain from [rustup](https://rustup.rs) and running `cargo build`.
 Additionally, to enable steamworks support pass `--features steamworks` to `cargo build`.
@@ -63,9 +63,9 @@ We've also turned on the unstable `-Z threads=8` compiler flag to speed up build
 This is a pretty unstable feature at the moment and may cause compiler deadlocks.
 Luckily cargo will detect when that happens and halt your build. Re-running `cargo build` continue your build without issue, though.
 
-Luminol has like a bajillion dependencies right now so it may take upwards of 15 minutes to compile.
+Luminol has like a bajillion dependencies right now so it may take upwards of 15 minutes to compile!
 
-**You can not use one of the stable release channels.**
+Luminol's native build currently can compile on stable Rust, however we pin the toolchain to nightly for wasm32 and the aforementioned `-Z threads=8` flag.
 
 ## Credits
 

crates/audio/Cargo.toml

@@ -28,12 +28,13 @@ color-eyre.workspace = true
 thiserror.workspace = true
 
 luminol-filesystem.workspace = true
+fragile.workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-rodio = "0.17.3"
+rodio = "0.19.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-rodio = { version = "0.17.1", features = ["wasm-bindgen"] }
+rodio = { version = "0.19.0", features = ["wasm-bindgen"] }
 web-sys = { version = "0.3", features = ["Window"] }
 
 flume.workspace = true

crates/audio/src/lib.rs

@@ -41,9 +41,6 @@ pub struct Audio {
 }
 
 struct Inner {
-    // OutputStream is lazily evaluated specifically for wasm. web prevents autoplay without user interaction, this is a way of dealing with that.
-    // To actually play tracks the user will have needed to interact with the ui.
-    _output_stream: rodio::OutputStream,
     output_stream_handle: rodio::OutputStreamHandle,
     sinks: std::collections::HashMap<Source, rodio::Sink>,
 }
@@ -59,13 +56,6 @@ pub enum Source {
     SE,
 }
 
-#[cfg(not(target_arch = "wasm32"))] // Audio can't be shared between threads in wasm either
-/// # Safety
-/// cpal claims that Stream (which is why Inner is not send) is not thread safe on android, which is why it is not Send anywhere else.
-/// We don't support android. The only other solution would be to use thread_local and... no.
-#[allow(unsafe_code)]
-unsafe impl Send for Inner {}
-
 impl Default for Audio {
     fn default() -> Self {
         #[cfg(target_arch = "wasm32")]
@@ -74,9 +64,9 @@ impl Default for Audio {
         }
 
         let (output_stream, output_stream_handle) = rodio::OutputStream::try_default().unwrap();
+        std::mem::forget(output_stream); // Prevent the stream from being dropped
         Self {
             inner: parking_lot::Mutex::new(Inner {
-                _output_stream: output_stream,
                 output_stream_handle,
                 sinks: std::collections::HashMap::default(),
             }),
@@ -190,3 +180,14 @@ impl Audio {
         }
     }
 }
+
+impl Source {
+    pub fn as_path(&self) -> &camino::Utf8Path {
+        camino::Utf8Path::new(match self {
+            Source::BGM => "BGM",
+            Source::BGS => "BGS",
+            Source::ME => "ME",
+            Source::SE => "SE",
+        })
+    }
+}

crates/components/Cargo.toml

@@ -52,3 +52,4 @@ fuzzy-matcher = "0.3.7"
 murmur3.workspace = true
 
 image.workspace = true
+camino.workspace = true

crates/components/src/database_view.rs

@@ -48,11 +48,11 @@ impl DatabaseView {
     pub fn show<T, R>(
         &mut self,
         ui: &mut egui::Ui,
-        update_state: &luminol_core::UpdateState<'_>,
+        update_state: &mut luminol_core::UpdateState<'_>,
         label: impl Into<egui::WidgetText>,
         vec: &mut Vec<T>,
         formatter: impl Fn(&T) -> String,
-        inner: impl FnOnce(&mut egui::Ui, &mut Vec<T>, usize) -> R,
+        inner: impl FnOnce(&mut egui::Ui, &mut Vec<T>, usize, &mut luminol_core::UpdateState<'_>) -> R,
     ) -> egui::InnerResponse<DatabaseViewResponse<R>>
     where
         T: luminol_data::rpg::DatabaseEntry,
@@ -262,7 +262,7 @@ impl DatabaseView {
 
                         DatabaseViewResponse {
                             inner: (self.selected_id < vec.len())
-                                .then(|| inner(ui, vec, self.selected_id)),
+                                .then(|| inner(ui, vec, self.selected_id, update_state)),
                             modified,
                         }
                     })

crates/components/src/id_vec.rs

@@ -152,7 +152,7 @@ where
     F: Fn(usize) -> String,
 {
     fn ui(self, ui: &mut egui::Ui) -> egui::Response {
-        if self.search_needs_update && !self.reference.is_sorted() {
+        if self.search_needs_update && luminol_core::slice_is_sorted(self.reference) {
             self.reference.sort_unstable();
         }
 
@@ -304,10 +304,10 @@ where
 {
     fn ui(self, ui: &mut egui::Ui) -> egui::Response {
         if self.search_needs_update {
-            if !self.plus.is_sorted() {
+            if !luminol_core::slice_is_sorted(self.plus) {
                 self.plus.sort_unstable();
             }
-            if !self.minus.is_sorted() {
+            if !luminol_core::slice_is_sorted(self.minus) {
                 self.minus.sort_unstable();
             }
         }

crates/components/src/lib.rs

@@ -22,7 +22,6 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 #![cfg_attr(target_arch = "wasm32", allow(clippy::arc_with_non_send_sync))]
-#![feature(is_sorted)]
 
 use itertools::Itertools;
 
@@ -84,6 +83,38 @@ impl<'e, T: ToString + PartialEq + strum::IntoEnumIterator> egui::Widget for Enu
     }
 }
 
+pub struct EnumRadioList<'e, T> {
+    current_value: &'e mut T,
+}
+
+impl<'e, T> EnumRadioList<'e, T> {
+    pub fn new(current_value: &'e mut T) -> Self {
+        Self { current_value }
+    }
+}
+
+impl<'e, T: ToString + PartialEq + strum::IntoEnumIterator> egui::Widget for EnumRadioList<'e, T> {
+    fn ui(self, ui: &mut egui::Ui) -> egui::Response {
+        let mut changed = false;
+        let mut response = ui
+            .vertical(|ui| {
+                ui.with_cross_justify(|ui| {
+                    for variant in T::iter() {
+                        let text = variant.to_string();
+                        if ui.radio_value(self.current_value, variant, text).changed() {
+                            changed = true;
+                        }
+                    }
+                });
+            })
+            .response;
+        if changed {
+            response.mark_changed();
+        }
+        response
+    }
+}
+
 pub struct Field<T> {
     name: String,
     widget: T,
@@ -476,3 +507,7 @@ pub fn close_options_ui(ui: &mut egui::Ui, open: &mut bool, save: &mut bool) {
         }
     });
 }
+
+pub fn colored_text(text: impl Into<String>, color: egui::Color32) -> egui::RichText {
+    egui::RichText::new(text).color(color)
+}

crates/components/src/map_view.rs

@@ -371,6 +371,23 @@ impl MapView {
             let mut selected_event_rect = None;
 
             for (_, event) in map.events.iter() {
+                if event.extra_data.graphic_modified.get() {
+                    event.extra_data.graphic_modified.set(false);
+                    let sprite = luminol_graphics::Event::new_map(
+                        &update_state.graphics,
+                        update_state.filesystem,
+                        &self.map.viewport,
+                        event,
+                        &self.map.atlas,
+                    )
+                    .unwrap(); // FIXME handle
+                    if let Some(sprite) = sprite {
+                        self.map.events.insert(event.id, sprite);
+                    } else {
+                        self.map.events.remove(event.id);
+                    }
+                }
+
                 let sprite = self.map.events.get_mut(event.id);
                 let has_sprite = sprite.is_some();
                 let event_size = sprite
@@ -456,11 +473,12 @@ impl MapView {
                                             &update_state.graphics,
                                             glam::vec2(event_size.x, event_size.y),
                                         );
+                                        let graphic = &event.pages[0].graphic; // FIXME handle missing first page (should never happen though...)
                                         let sprite = luminol_graphics::Event::new_standalone(
                                             &update_state.graphics,
                                             update_state.filesystem,
                                             &viewport,
-                                            event,
+                                            graphic,
                                             &self.map.atlas,
                                         )
                                         .unwrap()