Skip to content

Commit

Permalink
chore: Update deps, mainly to Bevy 0.15 (#88)
Browse files Browse the repository at this point in the history 
Update to bevy 0.15
  • Loading branch information
@Zac8668
Zac8668 authored Jan 28, 2025
1 parent 6e94603 commit 6e002f0
Show file tree
Hide file tree
Showing 18 changed files with 2,480 additions and 1,627 deletions.
3,278 changes: 2,077 additions & 1,201 deletions Cargo.lock
View file

Large diffs are not rendered by default.

23 changes: 11 additions & 12 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,32 @@ license = "PolyForm NonCommercial v1.0"
default-run = "astratomic"

[dependencies]
bevy = {version = "0.13", features =["file_watcher"]}
bevy-inspector-egui = "0.23"
rand = { version = "0.8", features = ["small_rng"] }
bevy = {version = "0.15", features =["file_watcher"]}
bevy-inspector-egui = "0.28.1"
rand = { version = "0.9", features = ["small_rng"] }
fastrand = "2.0"
async-channel = "2.1"
smallvec = "1.12"
itertools = "0.12"
itertools = "0.14"

serde = "1.0"
serde_derive = "1.0"
bincode = "1.3"
serde-big-array = "0.5"
ron = "0.8"
bevy-async-task = "1.4"
bevy_async_task = "0.4.0"

contour = "0.12"
bevy_rapier2d = { version = "0.25", features = [ "simd-stable", "debug-render-2d", "parallel" ] }
geo = "0.28"
contour = "0.13"
bevy_rapier2d = { version = "0.28", features = [ "simd-stable", "debug-render-2d", "parallel" ] }
geo = "0.29"
rotsprite = "0.1"

egui = "0.25"
bevy_egui = "0.25"
puffin = "0.19"
puffin_egui = "0.26"

thiserror = "2.0"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
bevy_dylib = "0.13"
bevy_dylib = "0.15"

# Optimize dependencies even in development
[profile.dev.package."*"]
Expand Down
6 changes: 3 additions & 3 deletions src/actors.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub fn fill_actors(
mut dirty_rects: ResMut<DirtyRects>,
materials: (Res<Assets<Materials>>, Res<MaterialsHandle>),
) {
let materials = materials.0.get(materials.1 .0.clone()).unwrap();
let materials = materials.0.get(&materials.1 .0).unwrap();

for actor in actors.iter() {
for x_off in 0..actor.width as i32 {
Expand All @@ -38,7 +38,7 @@ pub fn unfill_actors(
actors: Query<&Actor>,
materials: (Res<Assets<Materials>>, Res<MaterialsHandle>),
) {
let materials = materials.0.get(materials.1 .0.clone()).unwrap();
let materials = materials.0.get(&materials.1 .0).unwrap();

for actor in actors.iter() {
for x_off in 0..actor.width as i32 {
Expand Down Expand Up @@ -75,7 +75,7 @@ pub fn update_actors(
mut actors: Query<&mut Actor>,
materials: (Res<Assets<Materials>>, Res<MaterialsHandle>),
) {
let materials = materials.0.get(materials.1 .0.clone()).unwrap();
let materials = materials.0.get(&materials.1 .0).unwrap();

for mut actor in actors.iter_mut() {
let mut prev = actor.pos;
Expand Down
22 changes: 12 additions & 10 deletions src/animation.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,20 @@ pub struct AnimationTimer(pub Timer);

fn animate_sprite(
time: Res<Time>,
mut query: Query<(&AnimationIndices, &mut AnimationTimer, &mut TextureAtlas)>,
mut query: Query<(&AnimationIndices, &mut AnimationTimer, &mut Sprite)>,
) {
for (indices, mut timer, mut sprite) in &mut query {
timer.tick(time.delta());
if timer.just_finished() {
sprite.index = if !(indices.first..=indices.last).contains(&sprite.index)
|| sprite.index == indices.last
{
indices.first
} else {
sprite.index + 1
};
if let Some(atlas) = &mut sprite.texture_atlas {
timer.tick(time.delta());
if timer.just_finished() {
atlas.index = if !(indices.first..=indices.last).contains(&atlas.index)
|| atlas.index == indices.last
{
indices.first
} else {
atlas.index + 1
};
}
}
}
}
Expand Down
44 changes: 22 additions & 22 deletions src/atom.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,63 +42,63 @@ impl Atom {
2 => {
//Sand
atom.color = [
(230 + rand::thread_rng().gen_range(-20_i16..20_i16)) as u8,
(197 + rand::thread_rng().gen_range(-20_i16..20_i16)) as u8,
(92 + rand::thread_rng().gen_range(-20_i16..20_i16)) as u8,
(230 + rand::rng().random_range(-20_i16..20_i16)) as u8,
(197 + rand::rng().random_range(-20_i16..20_i16)) as u8,
(92 + rand::rng().random_range(-20_i16..20_i16)) as u8,
255,
];
}
3 => {
//Water
atom.color = [
(20 + rand::thread_rng().gen_range(-20_i16..20_i16)) as u8,
(125 + rand::thread_rng().gen_range(-20_i16..20_i16)) as u8,
(204 + rand::thread_rng().gen_range(-20_i16..20_i16)) as u8,
(20 + rand::rng().random_range(-20_i16..20_i16)) as u8,
(125 + rand::rng().random_range(-20_i16..20_i16)) as u8,
(204 + rand::rng().random_range(-20_i16..20_i16)) as u8,
150,
];
}
4 => {
//Gravel
atom.color = [
(110 + rand::thread_rng().gen_range(-12_i16..12_i16)) as u8,
(110 + rand::thread_rng().gen_range(-12_i16..12_i16)) as u8,
(110 + rand::thread_rng().gen_range(-12_i16..12_i16)) as u8,
(110 + rand::rng().random_range(-12_i16..12_i16)) as u8,
(110 + rand::rng().random_range(-12_i16..12_i16)) as u8,
(110 + rand::rng().random_range(-12_i16..12_i16)) as u8,
255,
];
}
5 => {
//Lava
atom.color = [
(245 + rand::thread_rng().gen_range(-10_i16..10_i16)) as u8,
(140 + rand::thread_rng().gen_range(-20_i16..20_i16)) as u8,
(10 + rand::thread_rng().gen_range(-10_i16..10_i16)) as u8,
(245 + rand::rng().random_range(-10_i16..10_i16)) as u8,
(140 + rand::rng().random_range(-20_i16..20_i16)) as u8,
(10 + rand::rng().random_range(-10_i16..10_i16)) as u8,
255,
];
}
6 => {
//Grass
atom.color = [
(30 + rand::thread_rng().gen_range(-10_i16..10_i16)) as u8,
(170 + rand::thread_rng().gen_range(-10_i16..10_i16)) as u8,
(10 + rand::thread_rng().gen_range(-5_i16..5_i16)) as u8,
(30 + rand::rng().random_range(-10_i16..10_i16)) as u8,
(170 + rand::rng().random_range(-10_i16..10_i16)) as u8,
(10 + rand::rng().random_range(-5_i16..5_i16)) as u8,
255,
];
}
7 => {
//Dirt
atom.color = [
(120 + rand::thread_rng().gen_range(-10_i16..10_i16)) as u8,
(70 + rand::thread_rng().gen_range(-10_i16..10_i16)) as u8,
(40 + rand::thread_rng().gen_range(-5_i16..5_i16)) as u8,
(120 + rand::rng().random_range(-10_i16..10_i16)) as u8,
(70 + rand::rng().random_range(-10_i16..10_i16)) as u8,
(40 + rand::rng().random_range(-5_i16..5_i16)) as u8,
255,
];
}
8 => {
//Rock
atom.color = [
(80 + rand::thread_rng().gen_range(-10_i16..10_i16)) as u8,
(80 + rand::thread_rng().gen_range(-10_i16..10_i16)) as u8,
(80 + rand::thread_rng().gen_range(-5_i16..5_i16)) as u8,
(80 + rand::rng().random_range(-10_i16..10_i16)) as u8,
(80 + rand::rng().random_range(-10_i16..10_i16)) as u8,
(80 + rand::rng().random_range(-5_i16..5_i16)) as u8,
255,
];
}
Expand Down Expand Up @@ -153,7 +153,7 @@ pub fn update_powder(
set_vel(
chunks,
cur_pos,
Vec2::from_angle(rand::thread_rng().gen_range(-PI / 2.0..PI / 2.))
Vec2::from_angle(rand::rng().random_range(-PI / 2.0..PI / 2.))
.rotate(vel * 0.3 * 1. * (1. - inertial_resistance))
.as_ivec2(),
);
Expand Down
2 changes: 1 addition & 1 deletion src/camera.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ pub fn update_camera(
) {
let transform = query.single();
let mut camera_transform = camera_q.single_mut();
let dt = time.delta_seconds_f64();
let dt = time.delta_secs_f64();
tracking.update(transform.translation.xy(), dt);
camera_transform.translation = tracking.position.extend(2.0);
}
Expand Down
2 changes: 1 addition & 1 deletion src/chunk_group.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub struct ChunkGroup<'a> {
pub center_pos: IVec2,
}

impl<'a> ChunkGroup<'a> {
impl ChunkGroup<'_> {
pub fn group_to_chunk(center_pos: IVec2, group_idx: i32) -> IVec2 {
let x_diff = group_idx % 3 - 1;
let y_diff = group_idx / 3 - 1;
Expand Down
Loading

0 comments on commit 6e002f0

Please sign in to comment.