bump to 2.1 with shader used internally

Author: hacknus

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_voxel_plot"
-version = "2.0.1"
+version = "2.1.0"
 edition = "2021"
 authors = ["Linus Leo Stöckli"]
 repository = "https://github.com/hacknus/bevy_voxel_plot"

README.md

@@ -43,6 +43,8 @@ low alpha.
 | 0.16 | 2.0             |
 | 0.15 | 1.0             |
 
+Note: version 1.0 requires the shader to be copied in your directory (did only fix that from 2.1+ )
+
 ## Credits
 
 - [Bevy](https://bevyengine.org)

examples/bevy_egui.rs

@@ -292,7 +292,9 @@ fn main() {
     App::new()
         .add_plugins((
             DefaultPlugins,
-            EguiPlugin { enable_multipass_for_primary_context: false },
+            EguiPlugin {
+                enable_multipass_for_primary_context: false,
+            },
             VoxelMaterialPlugin,
             PanOrbitCameraPlugin,
         ))

examples/bevy_pointcloud_bunny.rs

@@ -49,11 +49,11 @@ fn load_pcd_file(path: &Path) -> (Vec<InstanceData>, f32, f32, f32) {
             let y: f32 = parts[1].parse().unwrap_or(0.0);
             let z: f32 = parts[2].parse().unwrap_or(0.0);
 
-            let (r,g,b) = jet_colormap(z*10.0);
+            let (r, g, b) = jet_colormap(z * 10.0);
 
             let instance = InstanceData {
                 pos_scale: [x, y, z, 1.0], // position + uniform scale
-                color: LinearRgba::from(Color::srgba(r,g,b, 0.01)).to_f32_array(), // you can set color later if needed
+                color: LinearRgba::from(Color::srgba(r, g, b, 0.01)).to_f32_array(), // you can set color later if needed
             };
 
             instances.push(instance);

src/bevy_voxel_plot.rs

@@ -7,6 +7,7 @@
 //! implementation using Bevy's low level rendering API.
 //! It's generally recommended to try the built-in instancing before going with this approach.
 
+use bevy::asset::{load_internal_asset, weak_handle};
 use bevy::{
     core_pipeline::core_3d::Transparent3d,
     ecs::{
@@ -36,9 +37,6 @@ use bevy::{
 };
 use bytemuck::{Pod, Zeroable};
 
-/// Path to the WGSL shader asset used for custom instancing rendering.
-const SHADER_ASSET_PATH: &str = "shaders/instancing.wgsl";
-
 /// Component holding per-instance data for custom rendering.
 #[derive(Component)]
 pub struct InstanceMaterialData {
@@ -61,6 +59,7 @@ impl ExtractComponent for InstanceMaterialData {
 /// Plugin that sets up the custom voxel material pipeline.
 pub struct VoxelMaterialPlugin;
 
+pub const SHADER_HANDLE: Handle<Shader> = weak_handle!("123e4567-e89b-12d3-a456-426614174000");
 impl Plugin for VoxelMaterialPlugin {
     fn build(&self, app: &mut App) {
         app.add_plugins(ExtractComponentPlugin::<InstanceMaterialData>::default());
@@ -74,6 +73,12 @@ impl Plugin for VoxelMaterialPlugin {
                     prepare_instance_buffers.in_set(RenderSet::PrepareResources),
                 ),
             );
+        load_internal_asset!(
+            app,
+            SHADER_HANDLE,
+            "../assets/shaders/instancing.wgsl",
+            Shader::from_wgsl
+        );
     }
 
     fn finish(&self, app: &mut App) {
@@ -206,11 +211,11 @@ struct CustomPipeline {
 
 impl FromWorld for CustomPipeline {
     fn from_world(world: &mut World) -> Self {
-        let mesh_pipeline = world.resource::<MeshPipeline>();
+        let mesh_pipeline = world.resource::<MeshPipeline>().clone();
 
         CustomPipeline {
-            shader: world.load_asset(SHADER_ASSET_PATH),
-            mesh_pipeline: mesh_pipeline.clone(),
+            shader: SHADER_HANDLE.clone(),
+            mesh_pipeline,
         }
     }
 }