update to bevy-0.13 (#16)

* update to bevy-0.13 * fix more build issues nothing visible atm though * update render asset usages now we get validation errors, so making progress? * fix material * fix doctests * remove unused uuid literals * switch to bind group 2 for custom shader bindings
jabuwu · Mar 5, 2024 · ff0b74c · ff0b74c
1 parent d562da1
commit ff0b74c
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 53 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,13 +13,13 @@ exclude = [
 
 [dependencies]
 rusty_spine = "0.7"
-bevy = { version = "0.12", default-features = false, features = [ "bevy_render", "bevy_asset", "bevy_sprite" ] }
-glam = { version = "0.24", features = [ "mint" ] }
+bevy = { version = "0.13", default-features = false, features = [ "bevy_render", "bevy_asset", "bevy_sprite" ] }
+glam = { version = "0.25", features = [ "mint" ] }
 thiserror = "1.0.50"
 
 [dev-dependencies]
-lerp = "0.4"
-bevy = { version = "0.12", default-features = true }
+lerp = "0.5"
+bevy = { version = "0.13", default-features = true }
 
 [workspace]
 resolver = "2"

diff --git a/assets/shaders/custom.wgsl b/assets/shaders/custom.wgsl
@@ -40,12 +40,12 @@ fn vertex(vertex: Vertex) -> VertexOutput {
     return out;
 }
 
-@group(1) @binding(0)
+@group(2) @binding(0)
 var texture: texture_2d<f32>;
-@group(1) @binding(1)
+@group(2) @binding(1)
 var texture_sampler: sampler;
 
-@group(1) @binding(2)
+@group(2) @binding(2)
 var<uniform> time: f32;
 
 @fragment

diff --git a/examples/3d.rs b/examples/3d.rs
@@ -46,8 +46,8 @@ fn setup(
 ) {
     // plane
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         ..default()
     });
 
@@ -107,8 +107,8 @@ fn controls(
     mut window_query: Query<&mut Window, With<PrimaryWindow>>,
     mut mouse_motion_events: EventReader<MouseMotion>,
     mut orbit_query: Query<(&mut Orbit, &mut Transform)>,
-    mouse_buttons: Res<Input<MouseButton>>,
-    keys: Res<Input<KeyCode>>,
+    mouse_buttons: Res<ButtonInput<MouseButton>>,
+    keys: Res<ButtonInput<KeyCode>>,
 ) {
     let mut window = window_query.single_mut();
     if mouse_buttons.just_pressed(MouseButton::Left) {

diff --git a/examples/custom_material.rs b/examples/custom_material.rs
@@ -1,7 +1,7 @@
 use bevy::{
     ecs::system::{StaticSystemParam, SystemParam},
     prelude::*,
-    reflect::{TypePath, TypeUuid},
+    reflect::TypePath,
     render::{
         mesh::MeshVertexBufferLayout,
         render_resource::{
@@ -85,8 +85,7 @@ fn on_spawn(
 #[derive(Component)]
 pub struct MySpine;
 
-#[derive(Asset, AsBindGroup, TypeUuid, TypePath, Clone, Default)]
-#[uuid = "2e85f9ae-049a-4bb5-9f5d-ebaaa208df60"]
+#[derive(Asset, AsBindGroup, TypePath, Clone, Default)]
 pub struct MyMaterial {
     #[texture(0)]
     #[sampler(1)]

diff --git a/examples/events.rs b/examples/events.rs
@@ -70,7 +70,7 @@ fn on_spine_event(
                             color: Color::WHITE,
                         },
                     )
-                    .with_alignment(TextAlignment::Center),
+                    .with_justify(JustifyText::Center),
                     transform: Transform::from_xyz(0., -200., 1.),
                     ..Default::default()
                 })

diff --git a/examples/spineboy/player.rs b/examples/spineboy/player.rs
@@ -1,6 +1,5 @@
 use bevy::prelude::*;
 use bevy_spine::prelude::*;
-use lerp::Lerp;
 
 use crate::bullet::{BulletSpawnEvent, BulletSystem};
 
@@ -225,7 +224,8 @@ fn player_aim(
                     spine.animation_state.track_at_index_mut(PLAYER_TRACK_AIM)
                 {
                     let alpha = aim_track.alpha() * 2.5;
-                    aim_track.set_alpha(alpha.lerp(1., time.delta_seconds()).clamp(0., 1.));
+                    aim_track
+                        .set_alpha(lerp::Lerp::lerp(alpha, 1., time.delta_seconds()).clamp(0., 1.));
                 }
             }
         }
@@ -237,7 +237,7 @@ fn player_shoot(
     mut spine_query: Query<(&mut Spine, &Transform)>,
     mut bullet_spawn_events: EventWriter<BulletSpawnEvent>,
     global_transform_query: Query<&GlobalTransform>,
-    mouse_buttons: Res<Input<MouseButton>>,
+    mouse_buttons: Res<ButtonInput<MouseButton>>,
     time: Res<Time>,
 ) {
     for (mut shoot, player) in shoot_query.iter_mut() {
@@ -265,16 +265,16 @@ fn player_shoot(
 
 fn player_move(
     mut player_query: Query<(&mut Player, &mut Transform, &mut Spine)>,
-    keys: Res<Input<KeyCode>>,
+    keys: Res<ButtonInput<KeyCode>>,
     time: Res<Time>,
 ) {
     for (mut player, mut player_transform, mut player_spine) in player_query.iter_mut() {
         if player.spawned {
             let mut movement = 0.;
-            if keys.pressed(KeyCode::A) {
+            if keys.pressed(KeyCode::KeyA) {
                 movement -= 1.;
             }
-            if keys.pressed(KeyCode::D) {
+            if keys.pressed(KeyCode::KeyD) {
                 movement += 1.;
             }
             player.movement_velocity =
@@ -295,7 +295,7 @@ fn player_move(
     }
 }
 
-fn player_jump(mut player_query: Query<(&mut Spine, &Player)>, keys: Res<Input<KeyCode>>) {
+fn player_jump(mut player_query: Query<(&mut Spine, &Player)>, keys: Res<ButtonInput<KeyCode>>) {
     for (mut spine, player) in player_query.iter_mut() {
         if !player.spawned {
             continue;

diff --git a/src/assets.rs b/src/assets.rs
@@ -3,7 +3,7 @@ use std::{path::Path, sync::Arc};
 use bevy::{
     asset::{io::Reader, AssetLoader, AsyncReadExt, LoadContext},
     prelude::*,
-    reflect::{TypePath, TypeUuid},
+    reflect::TypePath,
     utils::BoxedFuture,
 };
 use rusty_spine::SpineError;
@@ -20,8 +20,7 @@ pub enum SpineLoaderError {
 /// Bevy asset for [`rusty_spine::Atlas`], loaded from `.atlas` files.
 ///
 /// For loading a complete skeleton, see [`SkeletonData`].
-#[derive(Asset, Debug, TypeUuid, TypePath)]
-#[uuid = "e58e872a-9d35-41bf-b561-95f843686004"]
+#[derive(Asset, Debug, TypePath)]
 pub struct Atlas {
     pub atlas: Arc<rusty_spine::Atlas>,
 }
@@ -63,8 +62,7 @@ impl AssetLoader for AtlasLoader {
 /// Bevy asset for [`rusty_spine::SkeletonJson`], loaded from `.json` files.
 ///
 /// For loading a complete skeleton, see [`SkeletonData`].
-#[derive(Asset, Debug, TypeUuid, TypePath)]
-#[uuid = "8637cf16-90c4-4825-bdf2-277e38788365"]
+#[derive(Asset, Debug, TypePath)]
 pub struct SkeletonJson {
     pub json: Vec<u8>,
 }
@@ -100,8 +98,7 @@ impl AssetLoader for SkeletonJsonLoader {
 /// Bevy asset for [`rusty_spine::SkeletonBinary`], loaded from `.skel` files.
 ///
 /// For loading a complete skeleton, see [`SkeletonData`].
-#[derive(Asset, Debug, TypeUuid, TypePath)]
-#[uuid = "2a2a342a-29ae-4417-adf5-06ea7f0732d0"]
+#[derive(Asset, Debug, TypePath)]
 pub struct SkeletonBinary {
     pub binary: Vec<u8>,
 }
@@ -138,8 +135,7 @@ impl AssetLoader for SkeletonBinaryLoader {
 /// skeleton (either [`SkeletonJson`] or [`SkeletonBinary`]).
 ///
 /// See [`SkeletonData::new_from_json`] or [`SkeletonData::new_from_binary`].
-#[derive(Asset, Debug, TypeUuid, TypePath)]
-#[uuid = "7796a37b-37a4-49ea-bf4e-fb7344aa6015"]
+#[derive(Asset, Debug, TypePath)]
 pub struct SkeletonData {
     pub atlas_handle: Handle<Atlas>,
     pub kind: SkeletonDataKind,

diff --git a/src/lib.rs b/src/lib.rs
@@ -13,6 +13,7 @@ use bevy::{
     prelude::*,
     render::{
         mesh::{Indices, MeshVertexAttribute},
+        render_asset::RenderAssetUsages,
         render_resource::{PrimitiveTopology, VertexFormat},
         texture::{ImageAddressMode, ImageFilterMode, ImageSampler, ImageSamplerDescriptor},
     },
@@ -418,7 +419,7 @@ impl Default for SpineSettings {
 ///     mut spine_ready_events: EventReader<SpineReadyEvent>,
 ///     mut spine_query: Query<&mut Spine, With<MySpine>>
 /// ) {
-///     for spine_ready_event in spine_ready_events.iter() {
+///     for spine_ready_event in spine_ready_events.read() {
 ///         if let Ok(mut spine) = spine_query.get_mut(spine_ready_event.entity) {
 ///             // the skeleton will start playing the animation the same frame it spawns on
 ///             spine.animation_state.set_animation_by_name(0, "animation", true);
@@ -465,7 +466,7 @@ pub struct SpineReadyEvent {
 ///     mut commands: Commands,
 ///     asset_server: Res<AssetServer>,
 /// ) {
-///     for event in spine_events.iter() {
+///     for event in spine_events.read() {
 ///         if let SpineEvent::Event { name, entity, .. } = event {
 ///             println!("spine event fired: {}", name);
 ///             println!("from entity: {:?}", entity);
@@ -714,8 +715,11 @@ fn spine_spawn(
                                     .with_children(|parent| {
                                         let mut z = 0.;
                                         for (index, _) in controller.skeleton.slots().enumerate() {
-                                            let mut mesh =
-                                                Mesh::new(PrimitiveTopology::TriangleList);
+                                            let mut mesh = Mesh::new(
+                                                PrimitiveTopology::TriangleList,
+                                                RenderAssetUsages::MAIN_WORLD
+                                                    | RenderAssetUsages::RENDER_WORLD,
+                                            );
                                             empty_mesh(&mut mesh);
                                             let mesh_handle = meshes.add(mesh);
                                             parent.spawn((
@@ -990,7 +994,7 @@ fn spine_update_meshes(
                     for _ in 0..vertices.len() {
                         normals.push([0., 0., 0.]);
                     }
-                    mesh.set_indices(Some(Indices::U16(indices)));
+                    mesh.insert_indices(Indices::U16(indices));
                     mesh.insert_attribute(
                         MeshVertexAttribute::new("Vertex_Position", 0, VertexFormat::Float32x2),
                         vertices,
@@ -1022,15 +1026,13 @@ fn spine_update_meshes(
 }
 
 fn empty_mesh(mesh: &mut Mesh) {
-    let indices = Indices::U32(vec![]);
-
     let positions: Vec<[f32; 3]> = vec![];
     let normals: Vec<[f32; 3]> = vec![];
     let uvs: Vec<[f32; 2]> = vec![];
     let colors: Vec<[f32; 4]> = vec![];
     let dark_colors: Vec<[f32; 4]> = vec![];
 
-    mesh.set_indices(Some(indices));
+    mesh.remove_indices();
     mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, positions);
     mesh.insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals);
     mesh.insert_attribute(Mesh::ATTRIBUTE_UV_0, uvs);

diff --git a/src/materials.rs b/src/materials.rs
@@ -8,7 +8,7 @@ use bevy::{
     asset::Asset,
     ecs::system::{StaticSystemParam, SystemParam},
     prelude::*,
-    reflect::{TypePath, TypeUuid},
+    reflect::TypePath,
     render::{
         mesh::{MeshVertexAttribute, MeshVertexBufferLayout},
         render_resource::{
@@ -129,10 +129,9 @@ pub struct SpineSettingsQuery<'w, 's> {
 }
 
 macro_rules! material {
-    ($(#[$($attrss:tt)*])* $uuid:literal, $name:ident, $blend_mode:expr, $premultiplied_alpha:expr, $blend_state:expr) => {
+    ($(#[$($attrss:tt)*])* $name:ident, $blend_mode:expr, $premultiplied_alpha:expr, $blend_state:expr) => {
         $(#[$($attrss)*])*
-        #[derive(Asset, Default, AsBindGroup, TypeUuid, TypePath, Clone)]
-        #[uuid = $uuid]
+        #[derive(Asset, Default, AsBindGroup, TypePath, Clone)]
         pub struct $name {
             #[texture(0)]
             #[sampler(1)]
@@ -203,7 +202,6 @@ macro_rules! material {
 
 material!(
     /// Normal blend mode material, non-premultiplied-alpha
-    "22413663-46b0-4b9b-b714-d72fb87dc7ef",
     SpineNormalMaterial,
     BlendMode::Normal,
     false,
@@ -223,7 +221,6 @@ material!(
 
 material!(
     /// Additive blend mode material, non-premultiplied-alpha
-    "092d3b15-c3b4-45d6-95fd-3a24a86e08d7",
     SpineAdditiveMaterial,
     BlendMode::Additive,
     false,
@@ -243,7 +240,6 @@ material!(
 
 material!(
     /// Multiply blend mode material, non-premultiplied-alpha
-    "ec4d2018-ad8f-4ff8-bbf7-33f13dab7ef3",
     SpineMultiplyMaterial,
     BlendMode::Multiply,
     false,
@@ -263,7 +259,6 @@ material!(
 
 material!(
     /// Screen blend mode material, non-premultiplied-alpha
-    "5d357844-6a06-4238-aaef-9da95186590b",
     SpineScreenMaterial,
     BlendMode::Screen,
     false,
@@ -283,7 +278,6 @@ material!(
 
 material!(
     /// Normal blend mode material, premultiplied-alpha
-    "296e2f58-f5f0-4a51-9f4b-dbcec06ddc04",
     SpineNormalPmaMaterial,
     BlendMode::Normal,
     true,
@@ -303,7 +297,6 @@ material!(
 
 material!(
     /// Additive blend mode material, premultiplied-alpha
-    "0f546186-4e05-434b-a0e1-3e1454b2cc7a",
     SpineAdditivePmaMaterial,
     BlendMode::Additive,
     true,
@@ -323,7 +316,6 @@ material!(
 
 material!(
     /// Multiply blend mode material, premultiplied-alpha
-    "d8ef56cf-88b9-46f8-971b-7583baf8c20b",
     SpineMultiplyPmaMaterial,
     BlendMode::Multiply,
     true,
@@ -343,7 +335,6 @@ material!(
 
 material!(
     /// Screen blend mode material, premultiplied-alpha
-    "1cd4d391-e106-4585-928f-124f998f28b6",
     SpineScreenPmaMaterial,
     BlendMode::Screen,
     true,

diff --git a/src/spine.wgsl b/src/spine.wgsl
@@ -40,9 +40,9 @@ fn vertex(vertex: Vertex) -> VertexOutput {
     return out;
 }
 
-@group(1) @binding(0)
+@group(2) @binding(0)
 var texture: texture_2d<f32>;
-@group(1) @binding(1)
+@group(2) @binding(1)
 var texture_sampler: sampler;
 
 @fragment

diff --git a/src/test.rs b/src/test.rs
@@ -21,6 +21,7 @@ pub fn test_app() -> App {
                     ..default()
                 }
                 .into(),
+                ..default()
             })
             .build()
             .disable::<WinitPlugin>(),