Skip to content

Commit

Permalink
V0.9.0 bevy prep (#65)
Browse files Browse the repository at this point in the history
- Set Bevy version
- Set our version
- Update compatibility table
- Clippy
- Minor bugfix of flip not checking passthrough

Signed-off-by: Torstein Grindvik <torstein.grindvik@nordicsemi.no>
  • Loading branch information
torsteingrindvik committed Nov 13, 2022
1 parent 7906a03 commit cdce822
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 10 deletions.
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "bevy-vfx-bag"
version = "0.1.0-dev"
version = "0.1.0"
edition = "2021"
description = "An assorted bag of visual effects for Bevy"
categories = ["graphics", "game-development", "rendering"]
keywords = [
"vfx",
Expand All @@ -17,8 +18,7 @@ license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/torsteingrindvik/bevy-vfx-bag"

# TODO: Figure this out before release
# exclude = []
exclude = [".github/", "scripts/"]

[features]
# For local development.
Expand All @@ -33,7 +33,7 @@ dev = []
# "tga",
# ] }

bevy = { git = "https://github.com/bevyengine/bevy", default-features = false, features = [
bevy = { version = "0.9.0", default-features = false, features = [
"bevy_asset",
"render",
"png",
Expand All @@ -45,7 +45,7 @@ bevy = { git = "https://github.com/bevyengine/bevy", default-features = false, f
alsa = "=0.6.0"

[dev-dependencies]
bevy = { git = "https://github.com/bevyengine/bevy", features = ["tga"] }
bevy = { version = "0.9.0", features = ["tga"] }
# bevy = { path = "../bevy", features = ["tga"] }

color-eyre = "0.6"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ following table:

|bevy-vfx-bag|bevy|
|---|---|
|0.1 (unreleased)|0.9 (unreleased)|
|0.1.0|0.9.0|

## Getting started

Expand Down
2 changes: 1 addition & 1 deletion examples/wave/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ fn update(
let num_presets = presets.0.len() as isize;
*preset_index = preset_index.clamp(0, num_presets - 1);

let preset = (*presets).0[*preset_index as usize];
let preset = presets.0[*preset_index as usize];

*wave = preset.into();

Expand Down
9 changes: 7 additions & 2 deletions src/image/flip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,18 @@ impl FromWorld for FlipMaterial {
}
}

fn update_flip(mut flip_materials: ResMut<Assets<FlipMaterial>>, flip: Res<Flip>) {
if !flip.is_changed() {
fn update_flip(
mut flip_materials: ResMut<Assets<FlipMaterial>>,
passthrough: Res<FlipPassthrough>,
flip: Res<Flip>,
) {
if !flip.is_changed() && !passthrough.is_changed() {
return;
}

for (_, material) in flip_materials.iter_mut() {
material.flip = (*flip).into();
material.passthrough = passthrough.0;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/image/lut/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ impl FromWorld for LutNeutral {

let data = include_bytes!("../../../assets/luts/neutral.png");

Self(Lut3d::new(&mut *images, data))
Self(Lut3d::new(&mut images, data))
}
}

Expand Down

0 comments on commit cdce822

Please sign in to comment.