Skip to content

Commit

Permalink
Merge pull request #10 from TheNullicorn/main
Browse files Browse the repository at this point in the history
Update to bevy 0.13
  • Loading branch information
johanhelsing authored Feb 23, 2024
2 parents 2dac617 + f34d19a commit e6de99f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
21 changes: 10 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,18 @@ repository = "https://github.com/johanhelsing/noisy_bevy"
version = "0.5.0"

[dependencies]
bevy = { version = "0.12", default-features = false, features = [
"bevy_asset",
"bevy_render"
] }
bevy = { version = "0.13", default-features = false, features = [
"bevy_asset",
"bevy_render"
] }

[dev-dependencies]
bevy = { version = "0.12", default-features = false, features = [
"bevy_sprite",
"bevy_winit",
"x11", # github actions runners don't have libxkbcommon installed, so can't use wayland
bevy = { version = "0.13", default-features = false, features = [
"bevy_sprite",
"bevy_winit",
"x11", # github actions runners don't have libxkbcommon installed, so can't use wayland
] }
rand = "0.8"
bevy_egui = { version = "0.23", default-features = false, features = ["default_fonts"] }
# bevy-inspector-egui = {version = "0.19.1", default-features = false}
bevy_pancam = { version = "0.10", features = ["bevy_egui"] }
bevy_egui = { version = "0.25", default-features = false, features = ["default_fonts"] }
bevy_pancam = { version = "0.11", features = ["bevy_egui"] }
insta = "1.21"
2 changes: 1 addition & 1 deletion assets/examples/asteroid_background.wgsl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ struct AsteroidMaterial {
params: vec4<f32>
}

@group(1) @binding(0) var<uniform> material: AsteroidMaterial;
@group(2) @binding(0) var<uniform> material: AsteroidMaterial;

struct Vertex {
@builtin(instance_index) instance_index: u32,
Expand Down
2 changes: 1 addition & 1 deletion examples/asteroids.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ fn expand_asteroids(
),
});

let quad_handle = meshes.add(Mesh::from(shape::Quad::new(Vec2::new(100.0, 100.0))));
let quad_handle = meshes.add(Mesh::from(Rectangle::from_size(Vec2::new(100.0, 100.0))));

asteroid.spawn(MaterialMesh2dBundle {
mesh: quad_handle.into(),
Expand Down

0 comments on commit e6de99f

Please sign in to comment.