Merge pull request #33 from hyoi/migration_0.14

hyoi · web-flow · commit b099c80d8097 · 2024-08-04T15:54:01.000+09:00
v0.14.0のリリース(Bevy 0.14対応)
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,12 +3,13 @@ resolver = "2"
 members = [ "crates/tigtag" ]
 
 [workspace.package]
-version = "0.13.0"
+version = "0.14.0"
 edition = "2021"
 
 [workspace.dependencies]
+#bevy = { git = "https://github.com/bevyengine/bevy", branch = "release-0.14.0" }
 #bevy = { git = "https://github.com/bevyengine/bevy" } #Master branch
-bevy = "0.13"
+bevy = "0.14"
 once_cell = "1"
 rand = "0.8"
 chrono = "0.4"
diff --git a/crates/share/src/lib.rs b/crates/share/src/lib.rs
@@ -3,6 +3,7 @@ use bevy::
 {   prelude::*,
     window::WindowMode,
     ecs::query::QueryFilter,
+    color::palettes::css,
 };
 use once_cell::sync::Lazy;
 
diff --git a/crates/share/src/misc/constants.rs b/crates/share/src/misc/constants.rs
@@ -1,5 +1,7 @@
 #![allow( dead_code )]
 
+use super::*;
+
 ////////////////////////////////////////////////////////////////////////////////
 
 //アプリの情報
@@ -15,4 +17,42 @@ pub const SPRITE_SHEET_OFF: fn() -> bool = || cfg!( feature = "sprite_sheet_off"
 
 ////////////////////////////////////////////////////////////////////////////////
 
+//v0.14.0でカラー定数がmodule移動したので、とりあえず自力で追加
+
+//オーファンルール対策用trait
+pub trait ColorConstants
+{   const BISQUE   : Color;
+    const DARK_GRAY: Color;
+    const RED      : Color;
+    const GREEN    : Color;
+    const BLUE     : Color;
+    const GRAY     : Color;
+    const YELLOW   : Color;
+    const TEAL     : Color;
+    const SILVER   : Color;
+    const SEA_GREEN: Color;
+    const GOLD     : Color;
+    const CYAN     : Color;
+    const PINK     : Color;
+}
+
+//カラー定数を bevy::prelude::Color へ追加（とりあえず）
+impl ColorConstants for bevy::prelude::Color
+{   const BISQUE   : Color = Color::Srgba( css::BISQUE    );
+    const DARK_GRAY: Color = Color::Srgba( css::DARK_GRAY );
+    const RED      : Color = Color::Srgba( css::RED       );
+    const GREEN    : Color = Color::Srgba( css::GREEN     );
+    const BLUE     : Color = Color::Srgba( css::BLUE      );
+    const GRAY     : Color = Color::Srgba( css::GRAY      );
+    const YELLOW   : Color = Color::Srgba( css::YELLOW    );
+    const TEAL     : Color = Color::Srgba( css::TEAL      );
+    const SILVER   : Color = Color::Srgba( css::SILVER    );
+    const SEA_GREEN: Color = Color::Srgba( css::SEA_GREEN );
+    const GOLD     : Color = Color::Srgba( css::GOLD      );
+    const CYAN     : Color = Color::Srgba( css::AQUA      );
+    const PINK     : Color = Color::Srgba( css::PINK      );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 //End of code.
diff --git a/crates/share/src/misc/functions.rs b/crates/share/src/misc/functions.rs
@@ -166,4 +166,21 @@ pub fn hide_component<T: Component>
 
 ////////////////////////////////////////////////////////////////////////////////
 
+//bevy::window::close_on_escがv0.14.0で廃止になったため代替
+//  remove close_on_esc #12859
+//  https://github.com/bevyengine/bevy/pull/12859
+pub fn close_on_esc
+(   mut cmds: Commands,
+    windows: Query< ( Entity, &Window ) >,
+    inkey: Res< ButtonInput< KeyCode > >,
+)
+{   for ( id, window ) in windows.iter()
+    {   if window.focused && inkey.just_pressed( KeyCode::Escape )
+        {   cmds.entity( id ).despawn();
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 //End of code.
diff --git a/crates/tigtag/src/debug.rs b/crates/tigtag/src/debug.rs
@@ -6,7 +6,7 @@ use super::*;
 pub fn spawn_2d_sprites
 (   mut cmds: Commands,
 )
-{   let color = Color::rgba( 0.1, 0.1, 0.1, 0.4 );
+{   let color = Color::srgba( 0.1, 0.1, 0.1, 0.4 );
     let custom_size = Some ( GRID_CUSTOM_SIZE * 0.9 );
 
     for x in GRIDS_X_RANGE
@@ -268,7 +268,7 @@ pub fn catch_input_mouse
     //ホイールで極座標を更新する
     for mouse_wheel in evt_mouse_wheel.read()
     {   orbit.r += mouse_wheel.y * 0.2; //感度良すぎるので
-        orbit.r = orbit.r.min( CAMERA_ORBIT_MAX_R ).max( CAMERA_ORBIT_MIN_R );
+        orbit.r = orbit.r.clamp( CAMERA_ORBIT_MIN_R, CAMERA_ORBIT_MAX_R );
     }
 
     //右ボタンが押されていないなら
@@ -278,7 +278,7 @@ pub fn catch_input_mouse
     for mouse_motion in evt_mouse_motion.read()
     {   //上下
         orbit.theta += mouse_motion.delta.y * 0.01; //感度良すぎるので
-        orbit.theta = orbit.theta.min( CAMERA_ORBIT_MAX_THETA ).max( CAMERA_ORBIT_MIN_THETA );
+        orbit.theta = orbit.theta.clamp( CAMERA_ORBIT_MIN_THETA, CAMERA_ORBIT_MAX_THETA );
 
         //左右
         orbit.phi -= mouse_motion.delta.x * 0.01; //感度良すぎるので
@@ -328,7 +328,7 @@ pub fn catch_input_gamepad
     if let Some ( value ) = axis_stick.get( stick_y )
     {   if value != 0.0
         {   orbit.theta += value * time_delta;
-            orbit.theta = orbit.theta.min( CAMERA_ORBIT_MAX_THETA ).max( CAMERA_ORBIT_MIN_THETA );
+            orbit.theta = orbit.theta.clamp( CAMERA_ORBIT_MIN_THETA, CAMERA_ORBIT_MAX_THETA );
             flag = true;
         }
     }
diff --git a/crates/tigtag/src/init_app.rs b/crates/tigtag/src/init_app.rs
@@ -96,7 +96,7 @@ const FOOTER_RIGHT: &[ MessageSect ] =
 const GRID_X_KANI: i32 = SCREEN_GRIDS_WIDTH  - 4;
 const GRID_Y_KANI: i32 = SCREEN_GRIDS_HEIGHT - 1;
 const MAGNIFY_SPRITE_KANI: f32 = 0.9;
-const COLOR_SPRITE_KANI: Color = Color::rgba( 1.0, 1.0, 1.0, 0.6 );
+const COLOR_SPRITE_KANI: Color = Color::srgba( 1.0, 1.0, 1.0, 0.6 );
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/crates/tigtag/src/load_assets.rs b/crates/tigtag/src/load_assets.rs
@@ -117,7 +117,7 @@ fn is_loading_done
     for handle in assets.handles.iter()
     {   match asset_svr.get_load_state( handle )
         {   Some ( LoadState::Loaded ) => (), //ロード完了
-            Some ( LoadState::Failed ) =>
+            Some ( LoadState::Failed (_) ) =>
             {   //ロード失敗⇒パニック
                 let mut filename = "Unknown".to_string();
                 if let Some ( asset_path ) = handle.path()
diff --git a/crates/tigtag/src/main.rs b/crates/tigtag/src/main.rs
@@ -70,8 +70,8 @@ fn main()
                 misc::change_gamepad_connection,
 
                 //特殊な操作
-                (   bevy::window::close_on_esc, //[ESC]で終了
-                    misc::toggle_window_mode,   //フルスクリーン切換
+                (   misc::close_on_esc,       //[ESC]で終了
+                    misc::toggle_window_mode, //フルスクリーン切換
                 )
                 .run_if( not( WASM ) ),
             ),
diff --git a/crates/tigtag_inside/src/chasers.rs b/crates/tigtag_inside/src/chasers.rs
@@ -15,9 +15,9 @@ pub struct Chaser
     pub px_end   : Vec2,  //1フレーム時間に移動した微小区間の終点
     pub opt_fn_autochase: Option<FnAutoChase>, //敵キャラの移動方向を決める関数
     pub color    : Color, //敵キャラの表示色
-    pub anime_timer: Timer,                         //アニメーションのタイマー
-    pub sprite_sheet_frame: usize,                  //アニメーションのフレーム数
-    pub sprite_sheet_indexes: HashMap<News, usize>, //アニメーションの先頭位置(offset値)
+    pub anime_timer: Timer,                       //アニメーションのタイマー
+    pub sprite_sheet_frame: u32,                  //アニメーションのフレーム数
+    pub sprite_sheet_indexes: HashMap<News, u32>, //アニメーションの先頭位置(offset値)
 }
 
 impl Default for Chaser
@@ -48,10 +48,10 @@ impl CharacterAnimation for Chaser
 {   fn anime_timer_mut( &mut self ) -> &mut Timer
     {   &mut self.anime_timer
     }
-    fn sprite_sheet_frame( &self ) -> usize
+    fn sprite_sheet_frame( &self ) -> u32
     {   self.sprite_sheet_frame
     }
-    fn sprite_sheet_offset( &self, news: News ) -> usize
+    fn sprite_sheet_offset( &self, news: News ) -> u32
     {   *self.sprite_sheet_indexes.get( &news ).unwrap()
     }
     fn direction( &self ) -> News
@@ -76,10 +76,10 @@ const MAX_X: i32 = map::MAP_GRIDS_WIDTH  - 2;
 const MAX_Y: i32 = map::MAP_GRIDS_HEIGHT - 2;
 
 //スプライトシートを使ったアニメーションの情報
-const  SPRITE_SHEET_SIZE_CHASER: Vec2 = Vec2::new( 8.0, 8.0 );
-const  SPRITE_SHEET_COLS_CHASER: usize = 4;
-const  SPRITE_SHEET_ROWS_CHASER: usize = 4;
-static SPRITE_SHEET_IDXS_CHASER: Lazy<HashMap<News,usize>> = Lazy::new
+const  SPRITE_SHEET_SIZE_CHASER: UVec2 = UVec2::new( 8, 8 );
+const  SPRITE_SHEET_COLS_CHASER: u32 = 4;
+const  SPRITE_SHEET_ROWS_CHASER: u32 = 4;
+static SPRITE_SHEET_IDXS_CHASER: Lazy<HashMap<News,u32>> = Lazy::new
 (   ||
     HashMap::from
     (   [   ( News::North,  0 ),
@@ -156,8 +156,8 @@ pub fn spawn_sprite
                         None, None
                     )
                 );
-                let index = chaser.sprite_sheet_offset( chaser.direction() );
-                cmds.spawn( ( SpriteSheetBundle::default(), chaser ) )
+                let index = chaser.sprite_sheet_offset( chaser.direction() ) as usize;
+                cmds.spawn( ( SpriteBundle::default(), chaser ) )
                 .insert( Sprite { custom_size, ..default() } )
                 .insert( asset_svr.load( asset_file ) as Handle<Image> )
                 .insert( TextureAtlas { layout, index } )
@@ -253,9 +253,9 @@ pub fn move_sprite
 
             //進行方向が変わったらスプライトの見栄えを変える（スプライトシートのindexを変える）
             if ! SPRITE_SHEET_OFF() && chaser.direction != new_side
-            {   let old_offset = chaser.sprite_sheet_offset( chaser.direction );
-                let new_offset = chaser.sprite_sheet_offset( new_side         );
-                sprite_sheet.index = sprite_sheet.index - old_offset + new_offset;
+            {   let old_offset = chaser.sprite_sheet_offset( chaser.direction ) as usize;
+                let new_offset = chaser.sprite_sheet_offset( new_side         ) as usize;
+                sprite_sheet.index = sprite_sheet.index + new_offset - old_offset;
             }
             chaser.direction = new_side;
 
@@ -273,7 +273,7 @@ pub fn move_sprite
 
     //後続の処理にtimer finishedを伝達する
     if ! chaser_timer_finished.is_empty()
-    {   evt_timer.send( EventTimerChasers ( chaser_timer_finished ) );
+    {   evt_timer.send( EventTimerChasers );
     }
 
     //敵キャラは重なるとスピードアップする
diff --git a/crates/tigtag_inside/src/common.rs b/crates/tigtag_inside/src/common.rs
@@ -42,9 +42,9 @@ impl Record
 //System間の通知用イベント
 #[derive( Event )] pub struct EventClear;
 #[derive( Event )] pub struct EventOver;
-#[derive( Event )] pub struct EventEatDot ( pub IVec2 );
+#[derive( Event )] pub struct EventEatDot;
 #[derive( Event )] pub struct EventTimerPlayer;
-#[derive( Event )] pub struct EventTimerChasers ( pub Vec<Color> );
+#[derive( Event )] pub struct EventTimerChasers;
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -129,8 +129,8 @@ impl AddAssign<News> for IVec2
 //スプライトシートでアニメーションするためのトレイト
 pub trait CharacterAnimation
 {   fn anime_timer_mut( &mut self ) -> &mut Timer;
-    fn sprite_sheet_frame( &self ) -> usize;
-    fn sprite_sheet_offset( &self, news: News ) -> usize;
+    fn sprite_sheet_frame( &self ) -> u32;
+    fn sprite_sheet_offset( &self, news: News ) -> u32;
     fn direction( &self ) -> News;
 }
 
diff --git a/crates/tigtag_inside/src/detection.rs b/crates/tigtag_inside/src/detection.rs
@@ -29,7 +29,7 @@ pub fn scoring_and_stage_clear
     //ドットの削除
     cmds.entity( dot ).despawn();
     *map.opt_entity_mut( player.grid ) = None;
-    evt_eatdot.send( EventEatDot ( player.grid ) ); //後続の処理にドット削除を伝達する
+    evt_eatdot.send( EventEatDot ); //後続の処理にドット削除を伝達する
 
     //スコア更新
     *record.score_mut() += 1;
diff --git a/crates/tigtag_inside/src/lib.rs b/crates/tigtag_inside/src/lib.rs
@@ -40,6 +40,7 @@ mod pause;
 //マップ、自機、追手の処理
 mod map;
 use map::GridToPixelOnMap;
+
 mod player;
 mod chasers;
 mod detection;
diff --git a/crates/tigtag_inside/src/map.rs b/crates/tigtag_inside/src/map.rs
@@ -132,7 +132,7 @@ impl GridToPixelOnMap for IVec2
 }
 
 //ドットのスプライトの情報
-const SPRITE_DOT_COLOR: Color = Color::rgb( 1.0, 1.0, 0.7 );
+const SPRITE_DOT_COLOR: Color = Color::srgb( 1.0, 1.0, 0.7 );
 const SPRITE_DOT_SCALING: f32 = 0.08;
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/crates/tigtag_inside/src/pause.rs b/crates/tigtag_inside/src/pause.rs
@@ -16,7 +16,7 @@ impl Plugin for Schedule
         .add_systems
         (   Update,
             (   //PAUSEメニュー表示／非表示のトグル処理（close_on_escより前に実行する）
-                show_and_hide_pause_menu.before( bevy::window::close_on_esc ),
+                show_and_hide_pause_menu.before( misc::close_on_esc ),
             )
         )
         .add_systems
@@ -150,7 +150,7 @@ fn spawn_ui_text
             grid_row       : GridPlacement::start_end( 2, 3 ), //２行目
             ..default()
         },
-        background_color: Color::rgba( 0.2, 0.2, 0.2, 0.9).into(),
+        background_color: Color::srgba( 0.2, 0.2, 0.2, 0.9).into(),
         visibility: Visibility::Hidden, //初期非表示
         ..default()
     };
diff --git a/crates/tigtag_inside/src/player.rs b/crates/tigtag_inside/src/player.rs
@@ -14,9 +14,9 @@ pub struct Player
     pub px_start : Vec2,  //1フレーム時間に移動した微小区間の始点
     pub px_end   : Vec2,  //1フレーム時間に移動した微小区間の終点
     pub opt_fn_autodrive: Option<FnAutoDrive>, //デモ時に自キャラの移動方向を決める関数
-    pub anime_timer: Timer,                         //キャラアニメーションのタイマー
-    pub sprite_sheet_frame: usize,                  //キャラアニメーションのフレーム数
-    pub sprite_sheet_indexes: HashMap<News, usize>, //キャラアニメーションの先頭位置(offset値)
+    pub anime_timer: Timer,                       //キャラアニメーションのタイマー
+    pub sprite_sheet_frame: u32,                  //キャラアニメーションのフレーム数
+    pub sprite_sheet_indexes: HashMap<News, u32>, //キャラアニメーションの先頭位置(offset値)
 }
 
 impl Default for Player
@@ -60,10 +60,10 @@ impl CharacterAnimation for Player
 {   fn anime_timer_mut( &mut self ) -> &mut Timer
     {   &mut self.anime_timer
     }
-    fn sprite_sheet_frame( &self ) -> usize
+    fn sprite_sheet_frame( &self ) -> u32
     {   self.sprite_sheet_frame
     }
-    fn sprite_sheet_offset( &self, news: News ) -> usize
+    fn sprite_sheet_offset( &self, news: News ) -> u32
     {   *self.sprite_sheet_indexes.get( &news ).unwrap()
     }
     fn direction( &self ) -> News
@@ -80,10 +80,10 @@ const PLAYER_SPRITE_SCALING: f32 = 0.4; //primitive shape表示時の縮小係
 const PLAYER_SPRITE_COLOR: Color = Color::YELLOW;
 
 //スプライトシートを使ったアニメーションの情報
-pub const  SPRITE_SHEET_SIZE_PLAYER: Vec2 = Vec2::new( 8.0, 8.0 );
-pub const  SPRITE_SHEET_COLS_PLAYER: usize = 4;
-pub const  SPRITE_SHEET_ROWS_PLAYER: usize = 4;
-pub static SPRITE_SHEET_IDXS_PLAYER: Lazy<HashMap<News,usize>> = Lazy::new
+pub const  SPRITE_SHEET_SIZE_PLAYER: UVec2 = UVec2::new( 8, 8 );
+pub const  SPRITE_SHEET_COLS_PLAYER: u32 = 4;
+pub const  SPRITE_SHEET_ROWS_PLAYER: u32 = 4;
+pub static SPRITE_SHEET_IDXS_PLAYER: Lazy<HashMap<News,u32>> = Lazy::new
 (   ||
     HashMap::from
     (   [   ( News::North,  0 ),
@@ -174,8 +174,8 @@ pub fn spawn_sprite
                 None, None
             )
         );
-        let index = player.sprite_sheet_offset( player.direction() );
-        cmds.spawn( ( SpriteSheetBundle::default(), player ) )
+        let index = player.sprite_sheet_offset( player.direction() ) as usize;
+        cmds.spawn( ( SpriteBundle::default(), player ) )
         .insert( Sprite { custom_size, ..default() } )
         .insert( asset_svr.load( ASSETS_SPRITE_SHEET_PLAYER ) as Handle<Image> )
         .insert( TextureAtlas { layout, index } )
@@ -297,9 +297,9 @@ pub fn move_sprite
             }
             else
             {   //スプライトシートのindexを変更する
-                let old_offset = player.sprite_sheet_offset( player.direction );
-                let new_offset = player.sprite_sheet_offset( new_side         );
-                sprite_sheet.index = sprite_sheet.index - old_offset + new_offset;
+                let old_offset = player.sprite_sheet_offset( player.direction ) as usize;
+                let new_offset = player.sprite_sheet_offset( new_side         ) as usize;
+                sprite_sheet.index = sprite_sheet.index + new_offset - old_offset;
             }
             player.direction = new_side;
         }
diff --git a/crates/tigtag_inside/src/schedule.rs b/crates/tigtag_inside/src/schedule.rs
@@ -210,7 +210,7 @@ fn animating_sprites<T: Component + CharacterAnimation>
         {   sprite.index += 1;
             let offset = character.sprite_sheet_offset( character.direction() );
             let frame  = character.sprite_sheet_frame();
-            if sprite.index >= offset + frame { sprite.index = offset }
+            if sprite.index as u32 >= offset + frame { sprite.index = offset as usize }
         }
     }
 }
diff --git a/crates/tigtag_inside/src/ui/effect.rs b/crates/tigtag_inside/src/ui/effect.rs
@@ -157,7 +157,7 @@ impl AddOnTraitForText for Text
     }
     //Textのsectionsの透明度を一括で変更する
     fn set_alpha( &mut self, alpha: f32 )
-    {   self.sections.iter_mut().for_each( |x| { x.style.color.set_a( alpha ); } );
+    {   self.sections.iter_mut().for_each( |x| { x.style.color.set_alpha( alpha ); } );
     }
 }
 
diff --git a/crates/tigtag_inside/src/ui/title_demo.rs b/crates/tigtag_inside/src/ui/title_demo.rs
@@ -3,8 +3,8 @@ use super::*;
 ////////////////////////////////////////////////////////////////////////////////
 
 //メッセージの設定
-const TITLE_COLOR1: Color = Color::rgba( 0.6, 1.0, 0.4, 0.75 );
-const TITLE_COLOR2: Color = Color::rgba( 0.0, 0.7, 0.5, 0.75 );
+const TITLE_COLOR1: Color = Color::srgba( 0.6, 1.0, 0.4, 0.75 );
+const TITLE_COLOR2: Color = Color::srgba( 0.0, 0.7, 0.5, 0.75 );
 
 const UI_TITLE: &[ MessageSect ] =
 &[  ( APP_TITLE, ASSETS_FONT_PRESSSTART2P_REGULAR, PIXELS_PER_GRID * 3.5, TITLE_COLOR1 ),
diff --git a/wasm/tigtag.js b/wasm/tigtag.js
diff --git a/wasm/tigtag_bg.wasm b/wasm/tigtag_bg.wasm
