Skip to content

WIP migrate to 0.12 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP migrate to 0.12 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ exclude = ["assets/**/*", ".github/**/*", "screenshots/**/*"]
members = ["bevy_tileset_core", "bevy_tileset_tiles"]

[dependencies]
bevy_tileset_tiles = { path = "./bevy_tileset_tiles", version = "0.8" }
bevy_tileset_core = { path = "./bevy_tileset_core", version = "0.8" }
bevy_tileset_tiles = { path = "./bevy_tileset_tiles", version = "0.9" }
bevy_tileset_core = { path = "./bevy_tileset_core", version = "0.9" }

[dev-dependencies]
bevy = "0.11"
bevy = "0.12"
ron = "0.8"

[features]
Expand Down
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Add one of the following lines to your `Cargo.toml`.

```toml
[dependencies]
bevy_tileset_tiles = "0.8" # For the base tile definitions
bevy_tileset = "0.8" # For general tileset usage (includes above)
bevy_tileset_tiles = "0.9" # For the base tile definitions
bevy_tileset = "0.9" # For general tileset usage (includes above)
```

## ✨ Usage
Expand Down Expand Up @@ -239,6 +239,7 @@ texture atlas). Other solutions may need to be adapted in order to work with thi

| bevy | bevy_tileset |
|------|--------------|
| 0.12 | 0.9 |
| 0.11 | 0.8 |
| 0.10 | 0.7 |
| 0.9 | 0.6 |
Expand Down
8 changes: 4 additions & 4 deletions bevy_tileset_core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_tileset_core"
version = "0.8.0"
version = "0.9.0"
edition = "2021"
authors = ["Gino Valente <[email protected]>"]
description = "Core of bevy_tileset"
Expand All @@ -12,9 +12,9 @@ readme = "../README.md"
exclude = ["assets/**/*", ".github/**/*", "screenshots/**/*"]

[dependencies]
bevy_tileset_tiles = { path = "../bevy_tileset_tiles", version = "0.8" }
bevy = { version = "0.11", default-features = false, features = ["bevy_render", "png", "bevy_asset", "bevy_sprite"] }
bevy_tile_atlas = { path = "../../bevy_tile_atlas", version = "0.7" }
bevy_tileset_tiles = { path = "../bevy_tileset_tiles", version = "0.9" }
bevy = { version = "0.12", default-features = false, features = ["bevy_render", "png", "bevy_asset", "bevy_sprite"] }
bevy_tile_atlas = { path = "../../bevy_tile_atlas", version = "0.8" }
ron = "0.8.0"
serde = "1.0"
anyhow = "1.0"
Expand Down
21 changes: 13 additions & 8 deletions bevy_tileset_core/src/plugin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ pub struct TilesetPlugin {}

impl Plugin for TilesetPlugin {
fn build(&self, app: &mut App) {
app.add_asset::<Tileset>()
.init_asset_loader::<TilesetAssetLoader>()
app.init_asset_loader::<TilesetAssetLoader>()
.init_asset::<Tileset>()
.init_resource::<TilesetMap>()
.add_systems(Update, tileset_event_sys);
}
Expand All @@ -19,16 +19,21 @@ fn tileset_event_sys(
mut event_reader: EventReader<AssetEvent<Tileset>>,
mut map: ResMut<TilesetMap>,
tilesets: Res<Assets<Tileset>>,
asset_server: ResMut<AssetServer>,
) {
for event in event_reader.iter() {
for event in event_reader.read() {
match event {
AssetEvent::<Tileset>::Created { handle } => {
if let Some(tileset) = tilesets.get(handle) {
map.register_tileset(tileset, &handle);
AssetEvent::<Tileset>::Added { id } => {
if let Some(handle) = asset_server.get_id_handle(*id) {
if let Some(tileset) = tilesets.get(handle.clone()) {
map.register_tileset(tileset, &handle);
}
}
},
AssetEvent::<Tileset>::Removed { handle } => {
map.deregister_tileset(&handle);
AssetEvent::<Tileset>::Removed { id } => {
if let Some(handle) = asset_server.get_id_handle(*id) {
map.deregister_tileset(&handle);
}
},
_ => {},
}
Expand Down
Loading