Skip to content
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.

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

Update to Bevy 0.12 #278

Merged
merged 38 commits into from
Jan 22, 2024
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
21fd9fd
Update crates
janhohenheim Jan 21, 2024
2830a3e
Migrate https://bevyengine.org/learn/migration-guides/0.10-0.11/#remo…
janhohenheim Jan 21, 2024
96cdbfd
Migrate https://bevyengine.org/learn/migration-guides/0.10-0.11/#sche…
janhohenheim Jan 21, 2024
f7c892b
Migrate https://bevyengine.org/learn/migration-guides/0.10-0.11/#from…
janhohenheim Jan 21, 2024
c81ef1c
Migrate https://bevyengine.org/learn/migration-guides/0.10-0.11/#from…
janhohenheim Jan 21, 2024
64aee2a
Remove deprecated import
janhohenheim Jan 21, 2024
d1ce117
Rename HandleUntyped to UntypedHandle
janhohenheim Jan 21, 2024
68119b7
Add Eq to Actionlikes
janhohenheim Jan 21, 2024
c8107a9
Add Hash to Actionlikes
janhohenheim Jan 21, 2024
897e616
Rename HandleId to UntypedAssetId
janhohenheim Jan 21, 2024
b79cac5
Update material derives
janhohenheim Jan 21, 2024
3b56102
Migrate https://bevyengine.org/learn/migration-guides/0.10-0.11/#requ…
janhohenheim Jan 21, 2024
5c5a959
Convert UntypedHandles to Handle<T>
janhohenheim Jan 21, 2024
d24d341
Remove line rendering plugin because it does not support Bevy 0.12. S…
janhohenheim Jan 21, 2024
068ef2f
Migrate https://bevyengine.org/learn/migration-guides/0.10-0.11/#sche…
janhohenheim Jan 21, 2024
e0a395e
Migrate https://bevyengine.org/learn/migration-guides/0.10-0.11/#sche…
janhohenheim Jan 21, 2024
481fabc
Migrate Hanabi
janhohenheim Jan 21, 2024
01f1de3
Migrate Hanabi
janhohenheim Jan 21, 2024
b979fd3
Migrate some trivial things
janhohenheim Jan 21, 2024
918f46b
Migrate asset event variants
janhohenheim Jan 21, 2024
fb1ad07
Move systems to startup
janhohenheim Jan 21, 2024
606568f
Migrate https://bevyengine.org/learn/migration-guides/0.11-0.12/#asse…
janhohenheim Jan 21, 2024
f306325
Migrate some settings
janhohenheim Jan 21, 2024
fb9c67c
Remove warbler grass until it supports Bevy 0.12. See https://github.…
janhohenheim Jan 21, 2024
0f6b2db
Update Asset Event variants
janhohenheim Jan 21, 2024
e612c86
Fix some warnings
janhohenheim Jan 21, 2024
b418479
Fix warnings
janhohenheim Jan 21, 2024
11fd317
Fix some crashes
janhohenheim Jan 21, 2024
764f346
Fix some shader issues
janhohenheim Jan 21, 2024
7af4b9d
Fix some file loading issues
janhohenheim Jan 21, 2024
4d3303e
Fix lints
janhohenheim Jan 21, 2024
6a3d05b
Remove repeated tiling shader
janhohenheim Jan 22, 2024
98a9a0d
Fix missing particle module
janhohenheim Jan 22, 2024
845b494
Yeet Wasm
janhohenheim Jan 22, 2024
f4f23ba
Add debug draws
janhohenheim Jan 22, 2024
38c5925
Draw navmesh
janhohenheim Jan 22, 2024
54233dd
Shift navigation path up
janhohenheim Jan 22, 2024
3355ade
Fix scene issues in blender
janhohenheim Jan 22, 2024
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
Prev Previous commit
Next Next commit
Update material derives
janhohenheim committed Jan 21, 2024
commit b79cac5d7c4aa8d5f22bea6b985d686079140f82
3 changes: 1 addition & 2 deletions src/file_system_interaction/config.rs
Original file line number Diff line number Diff line change
@@ -2,9 +2,8 @@ use bevy::prelude::*;
use bevy::reflect::TypeUuid;
use serde::{Deserialize, Serialize};

#[derive(Debug, Clone, PartialEq, Reflect, TypeUuid, Serialize, Deserialize, Default, Resource)]
#[derive(Debug, Clone, PartialEq, Reflect, Asset, Serialize, Deserialize, Default, Resource)]
#[reflect(Serialize, Deserialize, Resource)]
#[uuid = "93a7c64b-4d6e-4420-b8c1-dfca481d9387"]
pub(crate) struct GameConfig {
pub(crate) camera: Camera,
pub(crate) characters: Characters,
3 changes: 1 addition & 2 deletions src/file_system_interaction/level_serialization.rs
Original file line number Diff line number Diff line change
@@ -164,8 +164,7 @@ fn serialize_world(spawn_query: &Query<(&GameObject, Option<&Transform>)>) -> Re
ron::ser::to_string_pretty(&serialized_level, default()).context("Failed to serialize world")
}

#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, TypeUuid, Deref, DerefMut)]
#[uuid = "eb7cc7bc-5a97-41ed-b0c3-0d4e2137b73b"]
#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Asset, Deref, DerefMut)]
#[reflect(Serialize, Deserialize)]
pub(crate) struct SerializedLevel(pub(crate) Vec<(GameObject, Transform)>);

9 changes: 3 additions & 6 deletions src/shader.rs
Original file line number Diff line number Diff line change
@@ -55,8 +55,7 @@ fn setup_shader(
});
}

#[derive(AsBindGroup, Debug, Clone, TypeUuid)]
#[uuid = "bd5c76fd-6fdd-4de4-9744-4e8beea8daaf"]
#[derive(AsBindGroup, Debug, Clone, Asset, TypePath)]
/// Material for [`glowy.wgsl`](https://github.com/janhohenheim/foxtrot/blob/main/assets/shaders/glowy.wgsl).
pub(crate) struct GlowyMaterial {
#[texture(0)]
@@ -70,8 +69,7 @@ impl Material for GlowyMaterial {
}
}

#[derive(AsBindGroup, Debug, Clone, TypeUuid)]
#[uuid = "8ca95d76-91d6-44c0-a67b-8a4d22cd59b1"]
#[derive(AsBindGroup, Debug, Clone, Asset, TypePath)]
/// Material for [`skydome.wgsl`](https://github.com/janhohenheim/foxtrot/blob/main/assets/shaders/skydome.wgsl).
pub(crate) struct SkydomeMaterial {
#[texture(0)]
@@ -104,8 +102,7 @@ pub(crate) struct Repeats {
pub(crate) _wasm_padding2: u32,
}

#[derive(AsBindGroup, Debug, Clone, TypeUuid)]
#[uuid = "82d336c5-fd6c-41a3-bdd4-267cd4c9be22"]
#[derive(AsBindGroup, Debug, Clone, Asset, TypePath)]
/// Material for [`repeated.wgsl`](https://github.com/janhohenheim/foxtrot/blob/main/assets/shaders/repeated.wgsl).
pub(crate) struct RepeatedMaterial {
#[texture(0)]
3 changes: 1 addition & 2 deletions src/world_interaction/dialog/resources.rs
Original file line number Diff line number Diff line change
@@ -35,8 +35,7 @@ impl CurrentDialog {
}
}

#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, TypeUuid, Default)]
#[uuid = "f7c10043-7196-4ead-a4dd-040c33798a62"]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Asset, TypePath, Default)]
pub(crate) struct Dialog {
pub(crate) initial_page: Vec<InitialPage>,
pub(crate) pages: HashMap<PageId, Page>,