alphastrata · alphastrata · May 31, 2024 · May 31, 2024 · Jun 9, 2024 · Jun 9, 2024
diff --git a/.cargo/config.toml b/.cargo/config.toml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/refactor-.md b/.github/ISSUE_TEMPLATE/refactor-.md
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -16,7 +16,7 @@ jobs:
 
  steps:
  - uses: actions/checkout@v4
- - uses: dtolnay/rust-toolchain@stable
+ - uses: dtolnay/rust-toolchain@nightly
  with:
  targets: x86_64-unknown-linux-gnu
  - name: install dependencies

diff --git a/.gitignore b/.gitignore
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
@@ -111,6 +111,13 @@ then:
 
 ______________________________________________________________________
 
+## Stability:
+
+The shaders in `assets/shaders/shadertoy-ports` _should_ usually work with the latest bevy.
+With _other_ shaders, for example those prefaced with `BROKEN_...` your mileage will vary, I cannot update all the shaders every single time `wgsl/bevy/naga/wgpu` change stuff :(, if _you_ can than see below:
+
+______________________________________________________________________
+
 ## Contributing:
 
 See the [guide](./CONTRIBUTING.md)

diff --git a/all_wgsl.wgsl b/all_wgsl.wgsl
diff --git a/assets/Gallery/README.md b/assets/Gallery/README.md
diff --git a/assets/Gallery/cosmic/README.md b/assets/Gallery/cosmic/README.md
diff --git a/assets/Gallery/cosmic/screenshot.png b/assets/Gallery/cosmic/screenshot.png
diff --git a/assets/Gallery/cyber-anim-arrowX/cyber-anim-arrowX.png b/assets/Gallery/cyber-anim-arrowX/cyber-anim-arrowX.png
diff --git a/assets/Gallery/fbmCloud/fmb_cloud.wgsl b/assets/Gallery/fbmCloud/fmb_cloud.wgsl
diff --git a/assets/Gallery/fbmCloud/screenshot.png b/assets/Gallery/fbmCloud/screenshot.png
diff --git a/assets/Gallery/flame/README.md b/assets/Gallery/flame/README.md
diff --git a/assets/Gallery/flame/screenshot.png b/assets/Gallery/flame/screenshot.png
diff --git a/assets/Gallery/kishimisu-palette/README.md b/assets/Gallery/kishimisu-palette/README.md
diff --git a/assets/Gallery/kishimisu-palette/screenshot.png b/assets/Gallery/kishimisu-palette/screenshot.png
diff --git a/assets/Gallery/light-spirals/README.md b/assets/Gallery/light-spirals/README.md
diff --git a/assets/Gallery/light-spirals/screenshot.png b/assets/Gallery/light-spirals/screenshot.png
diff --git a/assets/Gallery/lines/README.md b/assets/Gallery/lines/README.md
diff --git a/assets/Gallery/lines/dotted_line.wgsl b/assets/Gallery/lines/dotted_line.wgsl
diff --git a/assets/Gallery/lines/screenshot.png b/assets/Gallery/lines/screenshot.png
diff --git a/assets/Gallery/perlin-waves/perlin-waves.wgsl b/assets/Gallery/perlin-waves/perlin-waves.wgsl
diff --git a/assets/Gallery/perlin-waves/screenshot.png b/assets/Gallery/perlin-waves/screenshot.png
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-48-16/README.md b/assets/Gallery/playing-with-builtin-maths-functions/21-48-16/README.md
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-48-16/screenshot.png b/assets/Gallery/playing-with-builtin-maths-functions/21-48-16/screenshot.png
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-48-43/README.md b/assets/Gallery/playing-with-builtin-maths-functions/21-48-43/README.md
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-48-43/screenshot.png b/assets/Gallery/playing-with-builtin-maths-functions/21-48-43/screenshot.png
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-48-52/README.md b/assets/Gallery/playing-with-builtin-maths-functions/21-48-52/README.md
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-48-52/screenshot.png b/assets/Gallery/playing-with-builtin-maths-functions/21-48-52/screenshot.png
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-48-58/README.md b/assets/Gallery/playing-with-builtin-maths-functions/21-48-58/README.md
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-48-58/screenshot.png b/assets/Gallery/playing-with-builtin-maths-functions/21-48-58/screenshot.png
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-49-02/README.md b/assets/Gallery/playing-with-builtin-maths-functions/21-49-02/README.md
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-49-02/screenshot.png b/assets/Gallery/playing-with-builtin-maths-functions/21-49-02/screenshot.png
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-49-07/README.md b/assets/Gallery/playing-with-builtin-maths-functions/21-49-07/README.md
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-49-07/screenshot.png b/assets/Gallery/playing-with-builtin-maths-functions/21-49-07/screenshot.png
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-49-23/README.md b/assets/Gallery/playing-with-builtin-maths-functions/21-49-23/README.md
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-49-23/screenshot.png b/assets/Gallery/playing-with-builtin-maths-functions/21-49-23/screenshot.png
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-49-33/README.md b/assets/Gallery/playing-with-builtin-maths-functions/21-49-33/README.md
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-49-33/screenshot.png b/assets/Gallery/playing-with-builtin-maths-functions/21-49-33/screenshot.png
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-49-38/README.md b/assets/Gallery/playing-with-builtin-maths-functions/21-49-38/README.md
diff --git a/assets/Gallery/playing-with-builtin-maths-functions/21-49-38/screenshot.png b/assets/Gallery/playing-with-builtin-maths-functions/21-49-38/screenshot.png
diff --git a/assets/Gallery/sailing-beyond/README.md b/assets/Gallery/sailing-beyond/README.md
diff --git a/assets/Gallery/sailing-beyond/screenshot.png b/assets/Gallery/sailing-beyond/screenshot.png
diff --git a/assets/Gallery/semi-circle-waves/README.md b/assets/Gallery/semi-circle-waves/README.md
diff --git a/assets/Gallery/semi-circle-waves/screenshot.png b/assets/Gallery/semi-circle-waves/screenshot.png
diff --git a/assets/Gallery/slug-ring/README.md b/assets/Gallery/slug-ring/README.md
diff --git a/assets/Gallery/slug-ring/screenshot.png b/assets/Gallery/slug-ring/screenshot.png
diff --git a/assets/Gallery/smoothstep-colouring-a-2dCircle/README.md b/assets/Gallery/smoothstep-colouring-a-2dCircle/README.md
diff --git a/assets/Gallery/smoothstep-colouring-a-2dCircle/screenshot.png b/assets/Gallery/smoothstep-colouring-a-2dCircle/screenshot.png
diff --git a/assets/Gallery/using-textures/screenshot.png b/assets/Gallery/using-textures/screenshot.png
diff --git a/assets/Gallery/w10/README.md b/assets/Gallery/w10/README.md
diff --git a/assets/Gallery/w10/screenshot.png b/assets/Gallery/w10/screenshot.png
diff --git a/assets/Gallery/warp/README.md b/assets/Gallery/warp/README.md
diff --git a/assets/Gallery/warp/screenshot.png b/assets/Gallery/warp/screenshot.png
diff --git a/assets/Gallery/water-caustics/README.md b/assets/Gallery/water-caustics/README.md
diff --git a/assets/Gallery/water-caustics/screenshot.png b/assets/Gallery/water-caustics/screenshot.png
diff --git a/assets/environment_maps/info.txt b/assets/environment_maps/info.txt
diff --git a/assets/fonts/FiraMono-LICENSE b/assets/fonts/FiraMono-LICENSE
diff --git a/assets/logo/shadplay_logo.png b/assets/logo/shadplay_logo.png
diff --git a/assets/shaders/WIP-black-hole.wgsl b/assets/shaders/WIP-black-hole.wgsl
diff --git a/assets/shaders/WIP-total_noob.wgsl b/assets/shaders/WIP-total_noob.wgsl
diff --git a/assets/shaders/WIP-waterPool.wgsl b/assets/shaders/WIP-waterPool.wgsl
diff --git a/assets/shaders/aura.wgsl b/assets/shaders/aura.wgsl
diff --git a/assets/shaders/common/notes.wgsl b/assets/shaders/common/notes.wgsl
diff --git a/assets/shaders/electro_cube.wgsl b/assets/shaders/electro_cube.wgsl
diff --git a/assets/shaders/fast_dots.wgsl b/assets/shaders/fast_dots.wgsl
diff --git a/assets/shaders/four_to_the_floor.wgsl b/assets/shaders/four_to_the_floor.wgsl
diff --git a/assets/shaders/grid_with_colours.wgsl b/assets/shaders/grid_with_colours.wgsl
diff --git a/assets/shaders/howto-mouse.wgsl b/assets/shaders/howto-mouse.wgsl
diff --git a/assets/shaders/howto-texture.wgsl b/assets/shaders/howto-texture.wgsl
diff --git a/assets/shaders/indexing_into_vec_with_loop.wgsl b/assets/shaders/indexing_into_vec_with_loop.wgsl
diff --git a/assets/shaders/myshader.wgsl b/assets/shaders/myshader.wgsl
diff --git a/assets/shaders/myshader_2d.wgsl b/assets/shaders/myshader_2d.wgsl
diff --git a/assets/shaders/rain_generator.wgsl b/assets/shaders/rain_generator.wgsl
diff --git a/assets/shaders/shadertoy-ports/BROKEN_fbm_lightning.wgsl b/assets/shaders/shadertoy-ports/BROKEN_fbm_lightning.wgsl
diff --git a/assets/shaders/shadertoy-ports/BROKEN_tuesday_tinkering.wgsl b/assets/shaders/shadertoy-ports/BROKEN_tuesday_tinkering.wgsl
diff --git a/assets/shaders/shadertoy-ports/cosmic.wgsl b/assets/shaders/shadertoy-ports/cosmic.wgsl
diff --git a/assets/shaders/shadertoy-ports/cyber-anim-arrowX.wgsl b/assets/shaders/shadertoy-ports/cyber-anim-arrowX.wgsl
diff --git a/assets/shaders/shadertoy-ports/discoteq2.wgsl b/assets/shaders/shadertoy-ports/discoteq2.wgsl
diff --git a/assets/shaders/shadertoy-ports/flame.wgsl b/assets/shaders/shadertoy-ports/flame.wgsl
diff --git a/assets/shaders/shadertoy-ports/kishimisu.wgsl b/assets/shaders/shadertoy-ports/kishimisu.wgsl
diff --git a/assets/shaders/shadertoy-ports/light-spirals.wgsl b/assets/shaders/shadertoy-ports/light-spirals.wgsl
diff --git a/assets/shaders/shadertoy-ports/octagon_fun.wgsl b/assets/shaders/shadertoy-ports/octagon_fun.wgsl
diff --git a/assets/shaders/shadertoy-ports/polar-coords-experiments.wgsl b/assets/shaders/shadertoy-ports/polar-coords-experiments.wgsl
diff --git a/assets/shaders/shadertoy-ports/sailing-beyond.wgsl b/assets/shaders/shadertoy-ports/sailing-beyond.wgsl
diff --git a/assets/shaders/shadertoy-ports/semi-circle-wave.wgsl b/assets/shaders/shadertoy-ports/semi-circle-wave.wgsl
diff --git a/assets/shaders/shadertoy-ports/shadertoy.wgsl b/assets/shaders/shadertoy-ports/shadertoy.wgsl
diff --git a/assets/shaders/shadertoy-ports/star.wgsl b/assets/shaders/shadertoy-ports/star.wgsl
diff --git a/assets/shaders/shadertoy-ports/universe_within.wgsl b/assets/shaders/shadertoy-ports/universe_within.wgsl
diff --git a/assets/shaders/shadertoy-ports/voronoi_simple.wgsl b/assets/shaders/shadertoy-ports/voronoi_simple.wgsl
diff --git a/assets/shaders/shadertoy-ports/w10.wgsl b/assets/shaders/shadertoy-ports/w10.wgsl
diff --git a/assets/shaders/shadertoy-ports/warp.wgsl b/assets/shaders/shadertoy-ports/warp.wgsl
diff --git a/assets/shaders/shadertoy-ports/water-caustic-tileable.wgsl b/assets/shaders/shadertoy-ports/water-caustic-tileable.wgsl
diff --git a/assets/textures/space.jpg b/assets/textures/space.jpg
diff --git a/bevy-shader-book.md b/bevy-shader-book.md
diff --git a/bevy-shaders-cheatsheet.md b/bevy-shaders-cheatsheet.md
diff --git a/build.rs b/build.rs
diff --git a/examples/README.md b/examples/README.md
diff --git a/examples/might/Cargo.lock b/examples/might/Cargo.lock
diff --git a/examples/might/Cargo.toml b/examples/might/Cargo.toml
diff --git a/examples/might/LICENSE b/examples/might/LICENSE
diff --git a/examples/might/README.md b/examples/might/README.md
diff --git a/examples/might/src/main.rs b/examples/might/src/main.rs
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -0,0 +1,71 @@
+{
+ description = "Rust dev shell for Shadplay...";
+
+ inputs = {
+ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+ rust-overlay.url = "github:oxalica/rust-overlay";
+ };
+
+ outputs = { self, nixpkgs, rust-overlay }:
+ let
+ overlays = [
+ (import rust-overlay)
+ (self: super: {
+ rustToolchain = super.rust-bin.nightly.latest.default;
+ })
+ ];
+
+ allSystems = [
+ "x86_64-linux"
+ "aarch64-linux"
+ "x86_64-darwin"
+ "aarch64-darwin"
+ ];
+
+ forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f {
+ pkgs = import nixpkgs { inherit overlays system; };
+ });
+ in
+ {
+ devShells = forAllSystems ({ pkgs }: {
+ default = pkgs.mkShell {
+ packages = (with pkgs; [
+ alsa-lib
+ cargo-nextest
+ clang
+ fontconfig
+ fontconfig.dev
+ freetype.dev
+ libxkbcommon
+ lld
+ openssl
+ pkg-config
+ rustToolchain
+ udev
+ vulkan-headers
+ vulkan-loader
+ vulkan-tools
+ vulkan-validation-layers
+ wayland
+ xorg.libX11
+ xorg.libXcursor
+ xorg.libXi
+ xorg.libXrandr
+ ]) ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ libiconv ]);
+
+ shellHook = ''
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.lib.makeLibraryPath [
+ pkgs.alsaLib
+ pkgs.udev
+ pkgs.vulkan-loader
+ pkgs.openssl
+ pkgs.alsa-lib
+ pkgs.libxkbcommon
+
+ ]}"
+ rustup default nightly
+ '';
+ };
+ });
+ };
+}
diff --git a/hitlist.txt b/hitlist.txt
@@ -0,0 +1,26 @@
+https://www.shadertoy.com/view/X3sSDB
+
+https://www.shadertoy.com/view/lXXXWr
+
+https://www.shadertoy.com/view/lXsSRs
+
+https://www.shadertoy.com/view/4XlXW7
+
+https://www.shadertoy.com/view/43XSRf
+
+https://www.shadertoy.com/view/M32GW3
+
+https://www.shadertoy.com/view/MXSGWV
+
+https://www.shadertoy.com/view/43BGRV
+
+
+
+
+
+
+
+
+
+
+
diff --git a/readme_assets/banner-art.png b/readme_assets/banner-art.png
diff --git a/readme_assets/ferris-adam.png b/readme_assets/ferris-adam.png
diff --git a/readme_assets/shadertoy-default-gif-example.gif b/readme_assets/shadertoy-default-gif-example.gif
diff --git a/readme_assets/smootstep-concept.png b/readme_assets/smootstep-concept.png
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
diff --git a/scripts/README.md b/scripts/README.md
diff --git a/scripts/file-and-func.py b/scripts/file-and-func.py
diff --git a/scripts/make-bevy-shaderdoc.py b/scripts/make-bevy-shaderdoc.py
diff --git a/scripts/reset-2d.py b/scripts/reset-2d.py
diff --git a/scripts/reset-3d.py b/scripts/reset-3d.py
diff --git a/scripts/screenshots-to-gallery.py b/scripts/screenshots-to-gallery.py
diff --git a/scripts/update-gallery.py b/scripts/update-gallery.py
diff --git a/scripts/wgsl-case-changer.py b/scripts/wgsl-case-changer.py
diff --git a/src/lib.rs b/src/lib.rs
diff --git a/src/main.rs b/src/main.rs
diff --git a/src/plugin.rs b/src/plugin.rs
diff --git a/src/shader_utils/common.rs b/src/shader_utils/common.rs
diff --git a/src/shader_utils/common.wgsl b/src/shader_utils/common.wgsl
diff --git a/src/shader_utils/mod.rs b/src/shader_utils/mod.rs
diff --git a/src/shader_utils/texture_tooling.rs b/src/shader_utils/texture_tooling.rs
diff --git a/src/system/clipboard.rs b/src/system/clipboard.rs
diff --git a/src/system/config.rs b/src/system/config.rs
diff --git a/src/system/drag_n_drop.rs b/src/system/drag_n_drop.rs
diff --git a/src/system/gif_maker.rs b/src/system/gif_maker.rs
diff --git a/src/system/mod.rs b/src/system/mod.rs
diff --git a/src/system/screenshot.rs b/src/system/screenshot.rs
diff --git a/src/ui/colour_picker_plugin.rs b/src/ui/colour_picker_plugin.rs
diff --git a/src/ui/help_ui.rs b/src/ui/help_ui.rs
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
diff --git a/src/utils.rs b/src/utils.rs
@@ -300,16 +300,24 @@ pub fn setup_3d(mut commands: Commands, shape_options: Res<ShapeOptions>) {
 }
 
 /// System: Cleans up the 3d camera. Called on exit of [`AppState::ThreeD`]
-pub fn cleanup_3d(mut commands: Commands, mut q: Query<(Entity, &mut Camera)>) {
- for (ent, _q) in q.iter_mut() {
+pub fn cleanup_3d(
+ mut commands: Commands,
+ mut cam_q: Query<(Entity, &mut Camera)>,
+ mut shape_q: Query<(Entity, &Transform), With<Shape>>,
+) {
+ for (ent, _cam) in cam_q.iter_mut() {
  commands.entity(ent).despawn_recursive();
  trace!("Despawned 3D camera.")
  }
+ for (ent, _tf) in shape_q.iter_mut() {
+ commands.entity(ent).despawn_recursive();
+ trace!("Despawned shape.")
+ }
 }
 
 /// System: Cleans up the 2d camera. Called on exit of [`AppState::TwoD`]
-pub fn cleanup_2d(mut commands: Commands, mut q: Query<(Entity, &mut Camera)>) {
- for (ent, _q) in q.iter_mut() {
+pub fn cleanup_2d(mut commands: Commands, mut cam_q: Query<(Entity, &mut Camera)>) {
+ for (ent, _q) in cam_q.iter_mut() {
  commands.entity(ent).despawn_recursive();
  trace!("Despawned 2D camera.")
  }

diff --git a/toolchain.toml b/toolchain.toml
@@ -0,0 +1,4 @@
+# toolchain.toml
+[toolchain]
+channel = "nightly"
+components = ["rustfmt", "rust-src", "rust_analyzer"]