Merge pull request #122 from alphastrata/BEVY-SEVENTEEN

Bevy Seventeen

Author: alphastrata

Cargo.lock

@@ -16,13 +16,12 @@ description = "Might, is an attempt to recreate the legendary Pally aura of the
 
 [features]
 default = ["ui"]
-wayland = ["bevy/wayland"]
-ui = []
+ui = ["bevy_egui"]
 
 [dependencies]
 # Bump-a-lots
-bevy = { version = "0.16.1", features = ["file_watcher", "jpeg"] }
-bevy_egui = { version = "0.35.0" }
+bevy = { version = "0.17.0", features = ["file_watcher", "jpeg"] }
+bevy_egui = { version = "0.37.0", optional = true }
 
 # usually not bumped with bevy versions
 anyhow = "1.0.79"
@@ -31,10 +30,10 @@ copypasta = "0.10.0"
 directories = "6.0.0"
 image = "0.25.1"
 serde = { version = "1.0.190", features = ["derive"] }
-toml = "0.8.10"
+toml = "0.9.7"
 
 [dev-dependencies]
-bevy = { version = "0.16.1", features = [
+bevy = { version = "0.17.0", features = [
   "file_watcher",
   "jpeg",
   "dynamic_linking",

Cargo.toml

@@ -8,12 +8,12 @@ struct AuraMaterial {
 }
 
 @group(0) @binding(0)   var<uniform> view: View;
-@group(2) @binding(100) var<uniform> aura_mat: AuraMaterial;
+@group(3) @binding(100) var<uniform> aura_mat: AuraMaterial;
 
 // Colour picker tells us the values of the original..
 // Darkish
 // #CEAA4F
-const GOLD = vec3f(0.807843, 0.666667, 0.309804);
+const GOLD: vec3f = vec3f(0.807843, 0.666667, 0.309804);
 const SPIKE_NUM: f32 = 9.0;
 const SPIKE_LEN: f32 = 1.68;
 const SPIKE_SPEED:f32 = 32.0;

assets/shaders/aura.wgsl

@@ -6,7 +6,7 @@
 #import bevy_render::view  View
 @group(0) @binding(0) var<uniform> view: View;
 
-@group(2) @binding(0) var<uniform> mouse: YourShader2D;
+@group(3) @binding(0) var<uniform> mouse: YourShader2D;
 struct YourShader2D{
     mouse_pos : vec2f,
 }

assets/shaders/howto-mouse.wgsl

@@ -2,8 +2,8 @@
 
 #import bevy_sprite::mesh2d_vertex_output::VertexOutput
 
-@group(2) @binding(1) var texture: texture_2d<f32>;
-@group(2) @binding(2) var texture_sampler: sampler;
+@group(3) @binding(1) var texture: texture_2d<f32>;
+@group(3) @binding(2) var texture_sampler: sampler;
 
 @fragment
 fn fragment(in: VertexOutput) -> @location(0) vec4<f32> {

assets/shaders/howto-texture.wgsl

@@ -1,26 +1,18 @@
-//!
-//! The default 3d Shader.
-//!
 #import bevy_pbr::forward_io::VertexOutput
-#import bevy_pbr::mesh_view_bindings::globals;
-#import bevy_pbr::utils PI
-#import shadplay::shader_utils::common NEG_HALF_PI, shader_toy_default, rotate2D
+#import bevy_pbr::mesh_view_bindings::globals
 #import bevy_render::view::View
- 
+
 @group(0) @binding(0) var<uniform> view: View;
 
-@group(2) @binding(100)var<uniform> color: vec4f;
-@group(2) @binding(101) var texture: texture_2d<f32>;
-@group(2) @binding(102) var texture_sampler: sampler;
+@group(3) @binding(100)var<uniform> color: vec4f;
+@group(3) @binding(101) var texture: texture_2d<f32>;
+@group(3) @binding(102) var texture_sampler: sampler;
 
-const SPEED:f32 = 1.0;
+const SPEED: f32 = 1.0;
 
 @fragment
 fn fragment(in: VertexOutput) -> @location(0) vec4<f32> {
-    // ensure our uv coords match shadertoy/the-lil-book-of-shaders
     let texture_uvs = in.uv;
-
-    let tex: vec4f = textureSample(texture, texture_sampler, texture_uvs); // textureSample is provided by wgsl?
+    let tex: vec4f = textureSample(texture, texture_sampler, texture_uvs);
     return tex;
-
 }

assets/shaders/myshader.wgsl

@@ -1,20 +1,14 @@
-/// ***************************** ///
-/// THIS IS THE DEFAULT 2D SHADER ///
-/// You can always get back to this with `python3 scripts/reset-2d.py` ///
-/// ***************************** ///
-
 #import bevy_sprite::mesh2d_view_bindings::globals
-#import shadplay::shader_utils::common::{NEG_HALF_PI, shader_toy_default, rotate2D, TWO_PI}
-#import bevy_render::view::View
 #import bevy_sprite::mesh2d_vertex_output::VertexOutput
+#import shadplay::shader_utils::common::{NEG_HALF_PI, shader_toy_default, rotate2D}
+#import bevy_render::view::View
 
 @group(0) @binding(0) var<uniform> view: View;
 
 const SPEED: f32 = 1.0;
 
 @fragment
 fn fragment(in: VertexOutput) -> @location(0) vec4<f32> {
-    // ensure our uv coords match shadertoy/the-lil-book-of-shaders
     var uv = in.uv;
     uv = (uv * 2.0) - 1.0;
     let resolution = view.viewport.zw;
@@ -23,4 +17,4 @@ fn fragment(in: VertexOutput) -> @location(0) vec4<f32> {
     uv *= rotate2D(NEG_HALF_PI);
 
     return vec4f(shader_toy_default(t, uv), 0.3);
-}
+}

assets/shaders/myshader_2d.wgsl

@@ -11,8 +11,8 @@
 @group(0) @binding(0) var<uniform> view: View;
 
 const SPEED:f32 = 0.2;    //Global Speed multiplier
-const NUM_ARROWS = 3.0;   // Number of arrows spawned (see the for-loop below)
-const COLOUR_TEMP = 0.02; // The 'intensity' of the red channel in the arrows.
+const NUM_ARROWS: f32 = 3.0;   // Number of arrows spawned (see the for-loop below)
+const COLOUR_TEMP: f32 = 0.02; // The 'intensity' of the red channel in the arrows.
 
 @fragment
 fn fragment(in: VertexOutput) -> @location(0) vec4<f32> {

assets/shaders/shadertoy-ports/cyber-anim-arrowX.wgsl

@@ -11,8 +11,8 @@
 
 const SPEED:f32 = 0.30;
 const PI: f32 = 3.14159265359;
-const TWO_PI = 6.2848;
-const NUM_ITER = 8.0;
+const TWO_PI: f32 = 6.2848;
+const NUM_ITER: f32 = 8.0;
 
 @fragment
 fn fragment(in: VertexOutput) -> @location(0) vec4<f32> {

assets/shaders/shadertoy-ports/light-spirals.wgsl

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-bevy = { version = "0.16.1", features = [
+bevy = { version = "0.17.0", features = [
   "file_watcher",
   "jpeg",
   "dynamic_linking",