Merge remote-tracking branch 'upstream/dev' into command-view

melody-rs · Aug 22, 2024 · 8478e7b · 8478e7b
2 parents a4b9dde + 6a7851d
commit 8478e7b
Show file tree

Hide file tree

Showing 62 changed files with 917 additions and 1,202 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -111,4 +111,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: luminol-trunk
-          path: ${{ github.workspace }}/dist/
+          path: ${{ github.workspace }}/crates/launcher/dist/
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -140,15 +140,13 @@ js-sys = "0.3"
 lexical-sort = "0.3.1"
 
 luminol-audio = { version = "0.4.0", path = "crates/audio/" }
-luminol-components = { version = "0.4.0", path = "crates/components/" }
 luminol-config = { version = "0.4.0", path = "crates/config/" }
 luminol-core = { version = "0.4.0", path = "crates/core/" }
 luminol-data = { version = "0.4.0", path = "crates/data/" }
 luminol-filesystem = { version = "0.4.0", path = "crates/filesystem/" }
 luminol-graphics = { version = "0.4.0", path = "crates/graphics/" }
 luminol-macros = { version = "0.4.0", path = "crates/macros/" }
 luminol-proc-macros = { version = "0.4.0", path = "crates/proc-macros/" }
-luminol-modals = { version = "0.4.0", path = "crates/modals/" }
 luminol-term = { version = "0.4.0", path = "crates/term/" }
 luminol-ui = { version = "0.4.0", path = "crates/ui/" }
 luminol-result = { version = "0.4.0", path = "crates/result" }

diff --git a/crates/components/Cargo.toml b/crates/components/Cargo.toml
diff --git a/crates/modals/Cargo.toml b/crates/modals/Cargo.toml
diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml
@@ -23,9 +23,8 @@ luminol-config.workspace = true
 luminol-data.workspace = true
 luminol-graphics.workspace = true
 luminol-filesystem.workspace = true
-luminol-components.workspace = true
-luminol-modals.workspace = true
 luminol-macros.workspace = true
+luminol-egui-wgpu.workspace = true
 
 egui.workspace = true
 egui-modal.workspace = true
@@ -54,6 +53,8 @@ zip = { version = "0.6.6", default-features = false, features = ["deflate"] }
 parking_lot.workspace = true
 once_cell.workspace = true
 qp-trie.workspace = true
+indextree = "4.6.0"
+lexical-sort.workspace = true
 
 itertools.workspace = true
 
@@ -65,5 +66,17 @@ murmur3.workspace = true
 indexmap = "2.2.6"
 alox-48.workspace = true
 
+fuzzy-matcher = "0.3.7"
+
+glam.workspace = true
+
+oneshot.workspace = true
+
+image.workspace = true
+
+syntect = { version = "5.1.0", default-features = false, features = [
+    "default-fancy",
+] }
+
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 luminol-term = { version = "0.4.0", path = "../term/" }
diff --git a/...es/components/src/animation_frame_view.rs → ...ui/src/components/animation_frame_view.rs b/...es/components/src/animation_frame_view.rs → ...ui/src/components/animation_frame_view.rs
diff --git a/crates/components/src/cellpicker.rs → crates/ui/src/components/cellpicker.rs b/crates/components/src/cellpicker.rs → crates/ui/src/components/cellpicker.rs
diff --git a/crates/components/src/collapsing_view.rs → crates/ui/src/components/collapsing_view.rs b/crates/components/src/collapsing_view.rs → crates/ui/src/components/collapsing_view.rs
@@ -22,7 +22,7 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::UiExt;
+use super::UiExt;
 
 /// A component that shows many copies of a layout and only allows one of them to be expanded at a
 /// time.

diff --git a/crates/components/src/command_view/mod.rs → crates/ui/src/components/command_view/mod.rs b/crates/components/src/command_view/mod.rs → crates/ui/src/components/command_view/mod.rs
diff --git a/crates/components/src/database_view.rs → crates/ui/src/components/database_view.rs b/crates/components/src/database_view.rs → crates/ui/src/components/database_view.rs
@@ -22,7 +22,7 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::UiExt;
+use super::UiExt;
 use itertools::Itertools;
 
 pub struct DatabaseViewResponse<R> {

diff --git a/crates/components/src/filesystem_view.rs → crates/ui/src/components/filesystem_view.rs b/crates/components/src/filesystem_view.rs → crates/ui/src/components/filesystem_view.rs
@@ -22,7 +22,7 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::UiExt;
+use super::UiExt;
 use itertools::Itertools;
 
 pub struct FileSystemView<T> {

diff --git a/crates/components/src/id_vec.rs → crates/ui/src/components/id_vec.rs b/crates/components/src/id_vec.rs → crates/ui/src/components/id_vec.rs
@@ -22,7 +22,7 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::UiExt;
+use super::UiExt;
 use itertools::Itertools;
 
 #[derive(Default, Clone)]

diff --git a/crates/components/src/map_view.rs → crates/ui/src/components/map_view.rs b/crates/components/src/map_view.rs → crates/ui/src/components/map_view.rs
@@ -163,7 +163,7 @@ impl MapView {
         ui: &mut egui::Ui,
         update_state: &luminol_core::UpdateState<'_>,
         map: &luminol_data::rpg::Map,
-        tilepicker: &crate::Tilepicker,
+        tilepicker: &super::Tilepicker,
         dragging_event: bool,
         drawing_shape: bool,
         drawing_shape_pos: Option<egui::Pos2>,

diff --git a/crates/components/src/lib.rs → crates/ui/src/components/mod.rs b/crates/components/src/lib.rs → crates/ui/src/components/mod.rs
diff --git a/crates/components/src/sound_tab.rs → crates/ui/src/components/sound_tab.rs b/crates/components/src/sound_tab.rs → crates/ui/src/components/sound_tab.rs
@@ -22,7 +22,7 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::UiExt;
+use super::UiExt;
 
 pub struct SoundTab {
     /// The source for this tab.

diff --git a/crates/components/src/syntax_highlighting.rs → .../ui/src/components/syntax_highlighting.rs b/crates/components/src/syntax_highlighting.rs → .../ui/src/components/syntax_highlighting.rs
diff --git a/crates/components/src/tilepicker.rs → crates/ui/src/components/tilepicker.rs b/crates/components/src/tilepicker.rs → crates/ui/src/components/tilepicker.rs
diff --git a/crates/components/src/ui_ext.rs → crates/ui/src/components/ui_ext.rs b/crates/components/src/ui_ext.rs → crates/ui/src/components/ui_ext.rs
diff --git a/crates/ui/src/lib.rs b/crates/ui/src/lib.rs
@@ -21,11 +21,13 @@
 // it with Steamworks API by Valve Corporation, containing parts covered by
 // 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))]
 
 pub type UpdateState<'res> = luminol_core::UpdateState<'res>;
 
+pub mod components;
+pub mod modals;
 pub mod tabs;
-
 pub mod windows;
 
 macro_rules! tab_enum {