still can't fucking see anything....

Author: alphastrata

Diff for: src/main.rs

@@ -23,13 +23,23 @@ fn main() {
             ShadPlayPlugin,
         ))
         .add_systems(
-            Update,
+            PostUpdate,
             (
-                UserSession::runtime_updater.run_if(on_event::<KeyboardInput>),
-                UserSession::runtime_updater.run_if(on_event::<WindowResized>),
+                UserSession::runtime_updater
+                    .run_if(on_event::<WindowResized>)
+                    .run_if(time_passed(1.0)), // Rate limit the speed at which we write to the config file...
+
+                                               //
             ),
-            //
         );
 
     shadplay.run();
 }
+
+// https://github.com/bevyengine/bevy/blob/b9123e74b6838b58c33badff73d176441f8a33cc/examples/ecs/run_conditions.rs
+fn time_passed(t: f32) -> impl FnMut(Local<f32>, Res<Time>) -> bool {
+    move |mut timer: Local<f32>, time: Res<Time>| {
+        *timer += time.delta_secs();
+        *timer >= t
+    }
+}

Diff for: src/plugin.rs

@@ -11,7 +11,7 @@ pub struct ShadPlayPlugin;
 
 impl Plugin for ShadPlayPlugin {
     fn build(&self, app: &mut bevy::prelude::App) {
-        app.insert_state(AppState::TwoD)
+        app.insert_state(AppState::TwoD) // we start always in 2d mode
             .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

@@ -1,12 +1,11 @@
 //!
 //! Most of the boilerplate to make a custom shader work lives here.
 //!
-use std::path::PathBuf;
-pub mod texture_tooling;
-
 use bevy::{prelude::*, reflect::TypePath, render::render_resource::*, sprite::Material2d};
+use std::path::PathBuf;
 
 pub mod common;
+pub mod texture_tooling;
 
 /// Event: for facilitating the drag-n-drop of a .wgsl shader onto Shadplay.
 #[derive(Event, Debug, Deref, DerefMut)]
@@ -18,7 +17,7 @@ pub struct DragNDropShader {
 //                3D                    //
 // ************************************ //
 /// The 3D shader.
-#[derive(Asset, AsBindGroup, TypePath, Debug, Clone, Component)]
+#[derive(Asset, AsBindGroup, TypePath, Debug, Clone)]
 // #[uuid = "a3d71c04-d054-4946-80f8-ba6cfbc90cad"]
 pub struct YourShader {
     #[uniform(100)]
@@ -39,7 +38,7 @@ impl Material for YourShader {
 //                2D                    //
 // ************************************ //
 /// The 2D shadertoy like shader
-#[derive(Asset, AsBindGroup, TypePath, Debug, Clone, Component)]
+#[derive(Asset, AsBindGroup, TypePath, Debug, Clone)]
 // #[uuid = "f528511f-dcf2-4b0b-9522-a9df3a1a795b"]
 pub struct YourShader2D {
     #[uniform(100)]

Diff for: src/shader_utils/texture_tooling.rs

@@ -111,6 +111,6 @@ pub fn swap_2d_tex_from_idx(
                 }
             }
         });
-        break; // Exit after processing the first shader.
+        return; // Exit after processing the first shader.
     }
 }

Diff for: src/utils.rs

@@ -112,13 +112,14 @@ pub struct ShapeOptions(
 );
 
 /// Resource: Tracking whether or not we're rotating our shapes. 3d only.
-#[derive(Resource, Default, PartialEq)]
+#[derive(Debug, Resource, Default, PartialEq)]
 pub struct Rotating(pub bool);
 
 /// System: to toggle on/off the rotating, 3d only.
 pub fn toggle_rotate(input: Res<ButtonInput<KeyCode>>, mut toggle: ResMut<Rotating>) {
     if input.just_pressed(KeyCode::KeyR) {
         toggle.0 = !toggle.0;
+        info!("Togling rotate to {toggle:#?}");
     }
 }
 
@@ -185,7 +186,9 @@ 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
         let Some(idx) = shape_options.0.iter().position(|v| v.0) else {
             return;
@@ -197,6 +200,7 @@ pub fn switch_shape(
         let next = (idx + 1) % shape_options.0.len();
         commands.spawn(shape_options.0[next].1.clone());
         shape_options.0[next].0 = true;
+        info!("shape change complete");
     }
 }
 
@@ -250,7 +254,7 @@ pub fn init_shapes(
             minor_radius: 0.2,
         }))),
         MeshMaterial3d(mat.clone_weak()),
-        Transform::from_xyz(0.0, 0.0, 0.0),
+        Transform::from_xyz(0.0, 0.3, 0.0),
         Shape,
     ));
     info!("Torus added");