fix: mesh2d_vertex_output is no longer from forward_io for 2d shaders

Author: alphastrata

Diff for: assets/shaders/myshader_2d.wgsl

@@ -6,9 +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
+#import bevy_sprite::mesh2d_vertex_output::VertexOutput
 
 @group(0) @binding(0) var<uniform> view: View;
 
@@ -21,10 +19,9 @@ fn fragment(mesh: VertexOutput) -> @location(0) vec4<f32> {
     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);
+    uv.x *= resolution.x / resolution.y;
+    uv *= rotate2D(NEG_HALF_PI);
 
-    // return vec4f(shader_toy_default(t, uv), 1.0);
-    return vec4f(1.0);
+    return vec4f(shader_toy_default(t, uv), 1.0);
 }    
 

Diff for: src/plugin.rs

@@ -3,7 +3,6 @@ use bevy::{
     sprite::Material2dPlugin, window::WindowResized,
 };
 use bevy_panorbit_camera::PanOrbitCameraPlugin;
-use utils::init_default_state;
 
 use crate::prelude::*;
 
@@ -29,7 +28,6 @@ impl Plugin for ShadPlayPlugin {
             //events:
             .add_event::<UserAddedTexture>()
             .add_event::<DragNDropShader>()
-            .add_systems(Startup, init_default_state)
             // 3D
             .add_systems(OnEnter(AppState::ThreeD), setup_3d)
             .add_systems(OnExit(AppState::ThreeD), cleanup_3d)

Diff for: src/utils.rs

@@ -218,10 +218,6 @@ pub fn toggle_window_passthrough(
     }
 }
 
-pub fn init_default_state(mut app_state: ResMut<NextState<AppState>>) {
-    app_state.set(AppState::TwoD);
-}
-
 /// System: Startup, initialises the scene's geometry. 3d only.
 pub fn init_shapes(
     mut meshes: ResMut<Assets<Mesh>>,