Update deps

Author: alphastrata

Cargo.lock

@@ -21,9 +21,9 @@ ui = []
 
 [dependencies]
 # Bump-a-lots
-bevy = { version = "0.15.0", features = ["file_watcher", "jpeg"] }
-bevy_egui = { version = "0.31.1" }
-bevy_panorbit_camera = "0.21.1"
+bevy = { version = "0.15.3", features = ["file_watcher", "jpeg"] }
+bevy_egui = { version = "0.33.0" }
+bevy_panorbit_camera = "0.23.0"
 
 
 # usually not bumped with bevy versions

Cargo.toml

@@ -10,7 +10,7 @@ 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 = texture_sample(texture, texture_sampler, texture_uvs); 
+    let tex: vec4f = textureSample(texture, texture_sampler, texture_uvs); 
 
     return tex;
 }    

assets/shaders/howto-texture.wgsl

@@ -1,12 +1,12 @@
 //!
 //! The default 3d Shader.
 //!
-#import bevy_pbr::forward_io::VertexOutput, FragmentOutput
-#import bevy_pbr::mesh_view_bindings::globals
+#import bevy_pbr::forward_io::VertexOutput
+#import bevy_pbr::mesh_view_bindings::globals;
 #import bevy_pbr::utils PI
-#import bevy_render::view::View
 #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;
 
 @group(2) @binding(100)var<uniform> color: vec4f;
@@ -16,9 +16,11 @@
 const SPEED:f32 = 1.0;
 
 @fragment
-fn fragment(in: VertexOutput) -> @location(0) vec4f {
+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); 
+
+    let tex: vec4f = textureSample(texture, texture_sampler, texture_uvs); // textureSample is provided by wgsl?
     return tex;
-    // return vec4f(1.0);
-}
+
+}

assets/shaders/myshader.wgsl

@@ -13,9 +13,9 @@
 const SPEED:f32 = 1.0;
 
 @fragment
-fn fragment(mesh: VertexOutput) -> @location(0) vec4<f32> {
+fn fragment(in: VertexOutput) -> @location(0) vec4<f32> {
     // ensure our uv coords match shadertoy/the-lil-book-of-shaders
-    var uv = mesh.uv;
+    var uv = in.uv;
     uv = (uv * 2.0) - 1.0;
     let resolution = view.viewport.zw;
     let t = globals.time * SPEED;

assets/shaders/myshader_2d.wgsl

@@ -80,7 +80,8 @@ fn setup(
             num_cascades: 1,
             maximum_distance: 1.6,
             ..default()
-        }.build(),
+        }
+        .build(),
     ));
 
     // ground plane
@@ -176,4 +177,3 @@ fn quit_listener(input: Res<ButtonInput<KeyCode>>) {
         std::process::exit(0)
     }
 }
-

examples/might/src/main.rs

@@ -6,7 +6,7 @@
 #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_pbr::forward_io::VertexOutput;
+#import bevy_sprite::mesh2d_vertex_output::VertexOutput
 
 @group(0) @binding(0) var<uniform> view: View;
 
@@ -15,13 +15,14 @@
 @fragment
 fn fragment(in: VertexOutput) -> @location(0) vec4<f32> {
     // ensure our uv coords match shadertoy/the-lil-book-of-shaders
-    var uv = (in.uv * 2.0) - 1.0;
+    var uv = in.uv;
+    uv = (uv * 2.0) - 1.0;
     let resolution = view.viewport.zw;
     let t = globals.time * SPEED;
     uv.x *= resolution.x / resolution.y;
     uv *= rotate2D(NEG_HALF_PI);
 
-    return vec4f(shader_toy_default(t, uv), 1.0);
+    return vec4f(shader_toy_default(t, uv), 0.3);
 }    
     
 """

scripts/reset-2d.py

@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use bevy_egui::egui::epaint::Shadow;
-use bevy_egui::egui::{Align2, Color32, RichText, Rounding, Vec2};
+use bevy_egui::egui::{Align2, Color32, CornerRadius, RichText, Rounding, Vec2};
 use bevy_egui::{egui, EguiContexts, EguiPlugin};
 
 use crate::system::clipboard::SystemClipboard;
@@ -55,18 +55,18 @@ impl ColourPickerTool {
             .resizable(false)
             .frame(egui::Frame {
                 inner_margin: egui::Margin {
-                    left: 3.0,
-                    right: 3.0,
-                    top: 3.0,
-                    bottom: 3.0,
+                    left: 3,
+                    right: 3,
+                    top: 3,
+                    bottom: 3,
                 },
                 outer_margin: egui::Margin {
-                    left: 0.0,
-                    right: 0.0,
-                    top: 0.0,
-                    bottom: 0.0,
+                    left: 0,
+                    right: 0,
+                    top: 0,
+                    bottom: 0,
                 },
-                rounding: Rounding::same(2.0),
+                corner_radius: CornerRadius::default(),
                 shadow: Shadow::NONE,
                 fill: Color32::from_black_alpha(2),
                 stroke: egui::Stroke::NONE,

src/ui/colour_picker_plugin.rs

@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use bevy_egui::egui::epaint::Shadow;
-use bevy_egui::egui::{Align2, Color32, RichText, Rounding, Vec2};
+use bevy_egui::egui::{Align2, Color32, CornerRadius, RichText, Rounding, Vec2};
 use bevy_egui::{egui, EguiContexts};
 
 /// Plugin:
@@ -53,18 +53,18 @@ fn help_window(mut ctx: EguiContexts) {
         .resizable(false)
         .frame(egui::Frame {
             inner_margin: egui::Margin {
-                left: 3.0,
-                right: 3.0,
-                top: 3.0,
-                bottom: 3.0,
+                left: 3,
+                right: 3,
+                top: 3,
+                bottom: 3,
             },
             outer_margin: egui::Margin {
-                left: 0.0,
-                right: 0.0,
-                top: 0.0,
-                bottom: 0.0,
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0,
             },
-            rounding: Rounding::same(2.0),
+            corner_radius: CornerRadius::default(),
             shadow: Shadow::NONE,
             fill: Color32::from_black_alpha(2),
             stroke: egui::Stroke::NONE,