refactor: migrate to bevy 15

malezjaa · Nov 12, 2024 · 7fa40a6 · 7fa40a6
1 parent e033012
commit 7fa40a6
Show file tree

Hide file tree

Showing 46 changed files with 84 additions and 108 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bevy = "0.15.0-rc.3"
+bevy = { version = "0.15.0-rc.3", features = ["custom_cursor"] }
 bevy_rapier2d = "0.27.0"
 
 [profile.dev]

diff --git a/assets/cursor.png b/assets/cursor.png
diff --git a/assets/cursors/cursor_default.png b/assets/cursors/cursor_default.png
diff --git a/assets/cursors/cursor_grab.png b/assets/cursors/cursor_grab.png
diff --git a/assets/cursors/cursor_grabbing.png b/assets/cursors/cursor_grabbing.png
diff --git a/assets/cursors/cursor_help.png b/assets/cursors/cursor_help.png
diff --git a/assets/cursors/cursor_move.png b/assets/cursors/cursor_move.png
diff --git a/assets/cursors/cursor_progress.gif b/assets/cursors/cursor_progress.gif
diff --git a/assets/cursors/cursor_select.png b/assets/cursors/cursor_select.png
diff --git a/assets/cursors/cursor_unavailable.png b/assets/cursors/cursor_unavailable.png
diff --git a/assets/cursors/cursor_work.gif b/assets/cursors/cursor_work.gif
diff --git a/assets/tile000.png b/assets/tile000.png
diff --git a/assets/tile001.png b/assets/tile001.png
diff --git a/assets/tile002.png b/assets/tile002.png
diff --git a/assets/tile003.png b/assets/tile003.png
diff --git a/assets/tile004.png b/assets/tile004.png
diff --git a/assets/tile005.png b/assets/tile005.png
diff --git a/assets/tile006.png b/assets/tile006.png
diff --git a/assets/tile007.png b/assets/tile007.png
diff --git a/assets/tile008.png b/assets/tile008.png
diff --git a/assets/tile016.png b/assets/tile016.png
diff --git a/assets/tile017.png b/assets/tile017.png
diff --git a/assets/tile018.png b/assets/tile018.png
diff --git a/assets/tile019.png b/assets/tile019.png
diff --git a/assets/tile020.png b/assets/tile020.png
diff --git a/assets/tile021.png b/assets/tile021.png
diff --git a/assets/tile022.png b/assets/tile022.png
diff --git a/assets/tile023.png b/assets/tile023.png
diff --git a/assets/tile024.png b/assets/tile024.png
diff --git a/assets/tile032.png b/assets/tile032.png
diff --git a/assets/tile033.png b/assets/tile033.png
diff --git a/assets/tile034.png b/assets/tile034.png
diff --git a/assets/tile035.png b/assets/tile035.png
diff --git a/assets/tile036.png b/assets/tile036.png
diff --git a/assets/tile037.png b/assets/tile037.png
diff --git a/assets/tile038.png b/assets/tile038.png
diff --git a/assets/tile039.png b/assets/tile039.png
diff --git a/assets/tile040.png b/assets/tile040.png
diff --git a/assets/tile050.png b/assets/tile050.png
diff --git a/assets/tile055.png b/assets/tile055.png
diff --git a/assets/tile071.png b/assets/tile071.png
diff --git a/rustc-ice-2024-11-11T21_20_32-29384.txt b/rustc-ice-2024-11-11T21_20_32-29384.txt
diff --git a/src/cursor.rs b/src/cursor.rs
@@ -1,9 +1,48 @@
-use bevy::prelude::*;
-use bevy::winit::cursor::CustomCursor;
-
-pub fn setup_cursor(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.insert_resource(CustomCursor::Image {
-        handle: asset_server.load("cursor.png"),
-        hotspot: (128, 128),
-    }.into());
-}
+// use bevy::prelude::*;
+// use bevy::window::SystemCursorIcon;
+// use bevy::winit::cursor::{CursorIcon, CustomCursor};
+// 
+// #[derive(Resource)]
+// pub struct CursorIcons(Vec<CursorIcon>);
+// 
+// pub fn setup_cursor(mut commands: Commands, asset_server: Res<AssetServer>) {
+//     commands.insert_resource(CursorIcons(vec![
+//         CustomCursor::Image {
+//             handle: asset_server.load("cursors/cursor_default.png"),
+//             hotspot: (23, 24),
+//         }
+//             .into(),
+//         CustomCursor::Image {
+//             handle: asset_server.load("cursors/cursor_select.png"),
+//             hotspot: (23, 24),
+//         }
+//             .into(),
+//         CustomCursor::Image {
+//             handle: asset_server.load("cursors/cursor_progress.gif"),
+//             hotspot: (23, 24),
+//         }
+//             .into(),
+//         SystemCursorIcon::Text.into(),
+//     ]));
+// }
+// 
+// pub fn handle_cursor(
+//     mut commands: Commands,
+//     window: Single<Entity, With<Window>>,
+//     input: Res<ButtonInput<MouseButton>>,
+//     cursor_icons: Res<CursorIcons>,
+// ) {
+//     if input.just_pressed(MouseButton::Left) {
+//         commands
+//             .entity(*window)
+//             .insert(cursor_icons.0[1].clone());
+//     } else if input.just_released(MouseButton::Left) {
+//         commands
+//             .entity(*window)
+//             .insert(cursor_icons.0[0].clone());
+//     }
+// 
+//     commands
+//         .entity(*window)
+//         .insert(cursor_icons.0[0].clone());
+// }
diff --git a/src/main.rs b/src/main.rs
@@ -1,36 +1,40 @@
-pub mod player;
+mod cursor;
 pub mod menu;
+pub mod player;
 mod screen;
 mod text;
-mod cursor;
 
-use bevy::prelude::*;
-use bevy_rapier2d::prelude::*;
 use crate::menu::{menu_plugin, setup_camera, GameState};
+use bevy::prelude::*;
 use bevy::window::{CursorMoved, WindowTheme};
 use bevy::winit::cursor::{CursorIcon, CustomCursor};
-use crate::cursor::setup_cursor;
+use bevy_rapier2d::prelude::*;
 
 pub const GAME_TITLE: &str = "Chronos Game";
 
 fn main() {
+    std::env::set_var("RUST_BACKTRACE", "1");
+
     App::new()
-        .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()).set(
-            WindowPlugin {
-                primary_window: Some(Window {
-                    title: GAME_TITLE.into(),
-                    window_theme: Some(WindowTheme::Dark),
-                    enabled_buttons: bevy::window::EnabledButtons {
-                        maximize: false,
-                        ..Default::default()
-                    },
+        .add_plugins(
+            DefaultPlugins
+                .set(ImagePlugin::default_nearest())
+                .set(WindowPlugin {
+                    primary_window: Some(Window {
+                        title: GAME_TITLE.into(),
+                        window_theme: Some(WindowTheme::Dark),
+                        enabled_buttons: bevy::window::EnabledButtons {
+                            maximize: false,
+                            ..Default::default()
+                        },
+                        ..default()
+                    }),
                     ..default()
                 }),
-                ..default()
-            }
-        ))
+        )
         .init_state::<GameState>()
-        .add_systems(Startup, (setup_camera, setup_cursor))
+        .add_systems(Startup, (setup_camera /* * setup_cursor **/))
+        // .add_systems(Update, handle_cursor)
         .add_plugins(menu_plugin)
         .run();
-}
+}
diff --git a/src/menu.rs b/src/menu.rs
@@ -1,7 +1,7 @@
 use bevy::{app::AppExit, color::palettes::css::CRIMSON, prelude::*};
 use bevy::color::palettes::css::{BLACK, SLATE_GRAY};
 use crate::screen::despawn_screen;
-use crate::text::{text_bundle, TEXT_COLOR};
+use crate::text::{text_bundle, text_style, TEXT_COLOR};
 
 #[derive(Clone, Copy, Default, Eq, PartialEq, Debug, Hash, States)]
 pub enum GameState {
@@ -117,11 +117,6 @@ fn main_menu_setup(mut commands: Commands, asset_server: Res<AssetServer>) {
         ..default()
     };
 
-    let button_text_style = TextFont {
-        font_size: 40.0,
-        ..default()
-    };
-
     commands
         .spawn((
             Node {
@@ -150,10 +145,7 @@ fn main_menu_setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                 }))
                 .with_children(|parent| {
                     parent.spawn(
-                        text_bundle("Main Menu", &asset_server, (TextFont {
-                            font_size: 65.0,
-                            ..default()
-                        }, Node {
+                        text_bundle("Main Menu", (text_style(65.0, &asset_server), Node {
                             margin: UiRect {
                                 bottom: Val::Px(20.0),
                                 ..default()
@@ -180,7 +172,7 @@ fn main_menu_setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                             ..default()
                         }, button_icon_style));
                         parent.spawn(
-                            text_bundle("Play", &asset_server, button_text_style.clone())
+                            text_bundle("Play", text_style(40.0, &asset_server))
                         );
                     });
                 });

diff --git a/src/text.rs b/src/text.rs
@@ -2,11 +2,14 @@ use bevy::prelude::*;
 
 pub const TEXT_COLOR: Color = Color::srgb(0.0, 0.0, 0.0);
 
-pub fn text_bundle(text: impl Into<String>, asset_server: &Res<AssetServer>, style: impl Bundle) -> impl Bundle {
-    (Text::new(
-        text,
-    ), style, TextFont {
-        font: asset_server.load("fonts/Roboto-Regular.ttf"),
+pub fn text_bundle(text: impl Into<String>, style: impl Bundle) -> impl Bundle {
+    (Text::new(text), style)
+}
+
+pub fn text_style(size: f32, asset_server: &Res<AssetServer>) -> impl Bundle {
+    (TextFont {
+        font: asset_server.load("fonts/main-font.ttf"),
+        font_size: size,
         ..default()
-    })
+    }, TextColor(TEXT_COLOR))
 }