still can't fucking see anything....

Author: alphastrata

Diff for: assets/shaders/myshader.wgsl

@@ -2,26 +2,23 @@
 //! The default 3d Shader.
 //!
 #import bevy_pbr::forward_io::VertexOutput, FragmentOutput
-#import bevy_pbr::mesh_view_bindings::globals;
+#import bevy_pbr::mesh_view_bindings::globals, View
 #import bevy_pbr::utils PI
 #import shadplay::shader_utils::common NEG_HALF_PI, shader_toy_default, rotate2D
 
 @group(0) @binding(0) var<uniform> view: View;
-@group(1) @binding(100)var<uniform> color: vec4f;
+@group(1) @binding(1)var<uniform> color: vec4f;
 
-@group(1) @binding(101) var texture: texture_2d<f32>;
-@group(1) @binding(102) var texture_sampler: sampler;
+@group(1) @binding(2) var texture: texture_2d<f32>;
+@group(1) @binding(3) var texture_sampler: sampler;
 
 const SPEED:f32 = 1.0;
 
 @fragment
-fn fragment(in: VertexOutput) -> @location(0) vec4<f32> {
+fn fragment(in: VertexOutput) -> @location(0) vec4f {
     // 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?
-
-    // return tex;
-    return color;
+    return tex;
 
 }

Diff for: assets/shaders/myshader_2d.wgsl

@@ -22,6 +22,6 @@ fn fragment(mesh: VertexOutput) -> @location(0) vec4<f32> {
     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);
 }    
 

Diff for: src/main.rs

@@ -1,7 +1,7 @@
 ///
 /// ShadPlay
 ///
-use bevy::{input::keyboard::KeyboardInput, prelude::*, window::WindowResized};
+use bevy::{prelude::*, window::WindowResized};
 
 use shadplay::{plugin::ShadPlayPlugin, system::config::UserSession};
 

Diff for: src/plugin.rs

@@ -12,6 +12,7 @@ pub struct ShadPlayPlugin;
 impl Plugin for ShadPlayPlugin {
     fn build(&self, app: &mut bevy::prelude::App) {
         app.insert_state(AppState::TwoD) // we start always in 2d mode
+            // .insert_state(AppState::ThreeD)
             .add_plugins(ShadplayShaderLibrary) // Something of a library with common functions.
             .add_plugins(crate::system::ScreenshotPlugin) //NOTE: this is not Bevy's one!
             .add_plugins(ColourPickerPlugin)

Diff for: src/shader_utils/mod.rs

@@ -18,13 +18,12 @@ pub struct DragNDropShader {
 // ************************************ //
 /// The 3D shader.
 #[derive(Asset, AsBindGroup, TypePath, Debug, Clone)]
-// #[uuid = "a3d71c04-d054-4946-80f8-ba6cfbc90cad"]
 pub struct YourShader {
-    #[uniform(100)]
+    #[uniform(0)]
     pub color: LinearRgba, //RGBA
 
-    #[texture(101, dimension = "2d")]
-    #[sampler(102)]
+    #[texture(1, dimension = "2d")]
+    #[sampler(2)]
     pub img: Handle<Image>,
 }
 // 3d impl
@@ -39,13 +38,12 @@ impl Material for YourShader {
 // ************************************ //
 /// The 2D shadertoy like shader
 #[derive(Asset, AsBindGroup, TypePath, Debug, Clone)]
-// #[uuid = "f528511f-dcf2-4b0b-9522-a9df3a1a795b"]
 pub struct YourShader2D {
-    #[uniform(100)]
+    #[uniform(0)]
     pub(crate) mouse_pos: MousePos,
 
-    #[texture(101, dimension = "2d")]
-    #[sampler(102)]
+    #[texture(1, dimension = "2d")]
+    #[sampler(2)]
     pub img: Handle<Image>,
 }
 

Diff for: src/system/config.rs

@@ -100,8 +100,10 @@ impl UserSession {
         Window {
             title: "shadplay".into(),
             resolution: self.window_dims.into(),
-            transparent: true,
-            decorations: self.decorations,
+            // transparent: true,
+            // decorations: self.decorations,
+            transparent: false,
+            decorations: true,
             // Mac only
             #[cfg(target_os = "macos")]
             composite_alpha_mode: CompositeAlphaMode::PostMultiplied,

Diff for: src/utils.rs

@@ -5,7 +5,7 @@ use bevy::{
 };
 use bevy_panorbit_camera::PanOrbitCamera;
 
-use crate::prelude::*;
+use crate::{prelude::*, shader_utils::YourShader};
 /// State: Used to transition between 2d and 3d mode.    
 /// Used by: cam_switch_system, screenshot
 #[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]
@@ -186,7 +186,6 @@ pub fn switch_shape(
     mut commands: Commands,
     query: Query<Entity, With<Shape>>,
 ) {
-    info!("Switch shape system is running...");
     if input.just_pressed(KeyCode::KeyS) {
         info!("Shape change requested...");
         // Old
@@ -241,41 +240,41 @@ pub fn init_shapes(
 ) {
     let texture: Handle<Image> = asset_server.load("textures/space.jpg");
     user_textures.insert(0, texture.clone());
-    let mat = materials.add(crate::shader_utils::YourShader {
+    let mat = materials.add(YourShader {
         color: Color::default().into(),
         img: texture.clone(),
     });
     info!("{texture:#?} (space.jpg) texture added!");
 
-    shape_options.0.push((
-        false,
-        Mesh3d(meshes.add(Mesh::from(Torus {
-            major_radius: 2.,
-            minor_radius: 0.2,
-        }))),
-        MeshMaterial3d(mat.clone_weak()),
-        Transform::from_xyz(0.0, 0.3, 0.0),
-        Shape,
-    ));
-    info!("Torus added");
+    // shape_options.0.push((
+    //     false,
+    //     Mesh3d(meshes.add(Mesh::from(Torus {
+    //         major_radius: 2.,
+    //         minor_radius: 0.2,
+    //     }))),
+    //     MeshMaterial3d(mat.clone()),
+    //     Transform::from_xyz(0.0, 0.3, 0.0),
+    //     Shape,
+    // ));
+    // info!("Torus added");
 
     shape_options.0.push((
         true,
-        Mesh3d(meshes.add(Mesh::from(Cuboid::new(1.85, 1.85, 1.85)))),
-        MeshMaterial3d(mat.clone_weak()),
+        Mesh3d(meshes.add(Mesh::from(Cuboid::default()))),
+        MeshMaterial3d(mat.clone()),
         Transform::from_xyz(0.0, 0.3, 0.0),
         Shape,
     ));
     info!("Cube added");
 
-    shape_options.0.push((
-        false,
-        Mesh3d(meshes.add(Sphere { radius: 1.40 })),
-        MeshMaterial3d(mat.clone_weak()),
-        Transform::from_xyz(0.0, 0.3, 0.0),
-        Shape,
-    ));
-    info!("Sphere added");
+    // shape_options.0.push((
+    //     false,
+    //     Mesh3d(meshes.add(Sphere { radius: 1.40 })),
+    //     MeshMaterial3d(mat.clone()),
+    //     Transform::from_xyz(0.0, 0.3, 0.0),
+    //     Shape,
+    // ));
+    // info!("Sphere added");
 
     info!("Shapes initialised!");
 }
@@ -286,7 +285,7 @@ pub fn setup_3d(mut commands: Commands, shape_options: Res<ShapeOptions>) {
     commands.spawn((
         Name::new("Cam3D"),
         Camera3d::default(),
-        Transform::from_translation(Vec3::new(0.0, 1.5, 5.0)).looking_at(Vec3::ZERO, Vec3::Y),
+        Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
     ));
     info!("Spawned Cam3d");