Merge pull request #4 from johanhelsing/bevy-0.10

Port to bevy 0.10

Author: johanhelsing

Cargo.toml

@@ -10,18 +10,21 @@ repository = "https://github.com/johanhelsing/noisy_bevy"
 version = "0.2.0"
 
 [dependencies]
-bevy = {version = "0.9", features = ["bevy_asset", "render"], default-features = false}
+bevy = { version = "0.10", features = ["bevy_asset", "bevy_render"], default-features = false }
 
 [dev-dependencies]
-bevy = {version = "0.9", default-features = false, features = [
-  "render",
+bevy = { version = "0.10", default-features = false, features = [
+  "bevy_render",
+  "bevy_sprite",
   "bevy_asset",
   "bevy_winit",
   "filesystem_watcher",
   "x11", # github actions runners don't have libxkbcommon installed, so can't use wayland
-]}
+] }
 rand = "0.8"
-bevy_egui = {version = "0.17", default-features = false, features = ["default_fonts"]}
-bevy-inspector-egui = {version = "0.14", default-features = false}
-bevy_pancam = { version = "0.7", features = ["bevy-inspector-egui", "bevy_egui"] }
+# bevy_egui = {version = "0.17", default-features = false, features = ["default_fonts"]}
+bevy_egui = {git = "https://github.com/mvlabat/bevy_egui", branch = "bevy-0.10", default-features = false, features = ["default_fonts"]}
+# bevy-inspector-egui = {version = "0.14", default-features = false}
+# bevy_pancam = { version = "0.7", features = ["bevy-inspector-egui", "bevy_egui"] }
+bevy_pancam = { git = "https://github.com/johanhelsing/bevy_pancam", branch = "bevy-0.10", features = ["bevy_egui"] }
 insta = "1.21"

assets/examples/asteroid_background.wgsl

@@ -1,5 +1,4 @@
-#import bevy_pbr::mesh_view_bindings
-#import bevy_pbr::utils
+#import bevy_render::view
 #import noisy_bevy::prelude
 // #import bevy_pbr::mesh_functions
 #import bevy_sprite::mesh2d_bindings
@@ -17,9 +16,9 @@ fn fragment(
     #import bevy_sprite::mesh2d_vertex_output
 ) -> @location(0) vec4<f32> {
     // perf: better to do in vertex shader!
-    let p = world_position.xy - vec2(mesh.model[3].x, mesh.model[3].y); // ignoring rotation
+    var p = world_position.xy - vec2(mesh.model[3].x, mesh.model[3].y); // ignoring rotation
     // sample noise
-    let p = p.xy;
+    p = p.xy;
     let params = material.params;
     let freq_scale = params.x;
     let amp_scale = params.y;
@@ -35,8 +34,8 @@ fn fragment(
     // ...or add some extra turbulence to the "atmosphere"
     let n = fbm_simplex_2d_seeded(p * freq_scale, 7, 2.0, 0.5, seed) * amp_scale;
 
-    let v = d - n;
-    let v = pow(-v * 0.1 + 0.3, 2.1);
+    var v = d - n;
+    v = pow(-v * 0.1 + 0.3, 2.1);
 
     return vec4(v, v, v, 1.);
 }

examples/asteroids.rs

@@ -5,7 +5,7 @@ use bevy::{
     render::{camera::ScalingMode, render_resource::AsBindGroup},
     sprite::{Material2d, Material2dPlugin, MaterialMesh2dBundle},
 };
-use bevy_inspector_egui::WorldInspectorPlugin;
+// use bevy_inspector_egui::WorldInspectorPlugin;
 use bevy_pancam::{PanCam, PanCamPlugin};
 use noisy_bevy::{simplex_noise_2d_seeded, NoisyShaderPlugin};
 
@@ -20,7 +20,7 @@ fn main() {
         .add_plugin(NoisyShaderPlugin)
         .add_plugin(PanCamPlugin::default())
         .add_plugin(Material2dPlugin::<AsteroidBackgroundMaterial>::default())
-        .add_plugin(WorldInspectorPlugin::default())
+        // .add_plugin(WorldInspectorPlugin::default())
         .add_startup_system(setup)
         .add_system(expand_asteroids)
         .run();