Fix crudely for bevy 0.13

This commit is contained in:
2024-04-12 15:29:08 +02:00
parent 58d3258448
commit 824231a86b
7 changed files with 916 additions and 935 deletions

View File

@@ -3,7 +3,7 @@ mod tile_light;
use crate::grid;
use bevy::{
prelude::*,
reflect::{TypePath, TypeUuid},
reflect::TypePath,
render::{
render_resource::{encase, AsBindGroup, OwnedBindingResource, ShaderRef, ShaderType},
renderer::RenderQueue,
@@ -30,8 +30,7 @@ impl Plugin for CanvasPlugin {
const CANVAS_COLOR: Color = Color::rgb(0.05, 0.05, 0.05);
#[derive(AsBindGroup, TypeUuid, TypePath, Asset, Clone)]
#[uuid = "24f83f6e-e52d-41a6-bf1d-0e46e57a4995"]
#[derive(AsBindGroup, TypePath, Asset, Clone)]
struct CanvasMaterial {
#[uniform(0)]
ambient_color: Color,
@@ -98,7 +97,7 @@ fn spawn_canvas(
) {
commands
.spawn(MaterialMesh2dBundle {
mesh: mesh_assets.add(Mesh::from(shape::Quad::default())).into(),
mesh: mesh_assets.add(Mesh::from(Rectangle::default())).into(),
material: canvas_material_assets.add(CanvasMaterial::default()),
transform: Transform::from_scale(Vec3::splat(
grid::SEGMENT_SIZE * f32::from(grid::SIZE),

View File

@@ -1,5 +1,4 @@
use bevy::{
math::Vec3Swizzles,
prelude::*,
render::{render_resource::ShaderType, Extract},
};

View File

@@ -89,7 +89,7 @@ fn main() {
..Default::default()
}))
.init_collection::<audio::Assets>()
.add_state::<AppState>()
.init_state::<AppState>()
.add_plugins((
TweeningPlugin,
SnakePlugin,
@@ -132,8 +132,8 @@ fn update_score_system(mut score: ResMut<Score>, mut eaten_event: EventReader<fr
score.0 += eaten_event.read().count() as u32;
}
fn pause_system(keypress: Res<Input<KeyCode>>, mut time: ResMut<Time<Virtual>>) {
if keypress.just_pressed(KeyCode::P) {
fn pause_system(keypress: Res<ButtonInput<KeyCode>>, mut time: ResMut<Time<Virtual>>) {
if keypress.just_pressed(KeyCode::KeyP) {
if time.is_paused() {
time.unpause()
} else {

View File

@@ -161,10 +161,10 @@ fn setup_snake_system(mut commands: Commands) {
.insert(Name::new("Snake"))
.insert(InputManagerBundle::<Direction> {
input_map: InputMap::new([
(KeyCode::Up, Direction::Up),
(KeyCode::Down, Direction::Down),
(KeyCode::Left, Direction::Left),
(KeyCode::Right, Direction::Right),
(Direction::Up, KeyCode::ArrowUp),
(Direction::Down, KeyCode::ArrowDown),
(Direction::Left, KeyCode::ArrowLeft),
(Direction::Right, KeyCode::ArrowRight),
]),
..Default::default()
})
@@ -175,9 +175,9 @@ fn eaten_event_system(
mut eaten_event_reader: EventReader<fruit::EatenEvent>,
mut tail_event_writer: EventWriter<AddTailEvent>,
) {
eaten_event_reader
.read()
.for_each(|_| tail_event_writer.send(AddTailEvent));
eaten_event_reader.read().for_each(|_| {
tail_event_writer.send(AddTailEvent);
});
}
fn add_tail_system(
@@ -302,7 +302,7 @@ mod debug {
use super::*;
pub(super) fn add_tail(
keypress: Res<Input<KeyCode>>,
keypress: Res<ButtonInput<KeyCode>>,
mut tail_event_writer: EventWriter<AddTailEvent>,
) {
if keypress.just_pressed(KeyCode::Space) {