merge shading.rs into load.rs

src/commands.rs

@@ -15,7 +15,7 @@ use bevy::prelude::*;
 use bevy_xpbd_3d::prelude::*;
 use bevy::math::DVec3;
 use bevy::pbr::{NotShadowCaster, NotShadowReceiver};
-use crate::{actor, camera, chat, hud, load, nature, shading, var, world};
+use crate::{actor, camera, chat, hud, load, nature, var, world};
 use regex::Regex;
 use std::f32::consts::PI;
 use std::f64::consts::PI as PI64;
@@ -518,7 +518,7 @@ fn spawn_entities(
     asset_server: Res<AssetServer>,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
-    mut materials_jupiter: ResMut<Assets<shading::JupitersRing>>,
+    mut materials_jupiter: ResMut<Assets<load::JupitersRing>>,
     mut id2pos: ResMut<actor::Id2Pos>,
     settings: Res<var::Settings>,
 ) {
@@ -818,7 +818,7 @@ fn spawn_entities(
                     world::DespawnOnPlayerDeath,
                     MaterialMeshBundle {
                         mesh: meshes.add(Mesh::from(Cylinder::new(nature::JUPITER_RING_RADIUS as f32, 1.0))),
-                        material: materials_jupiter.add(shading::JupitersRing {
+                        material: materials_jupiter.add(load::JupitersRing {
                             alpha_mode: AlphaMode::Blend,
                             ring_radius: nature::JUPITER_RING_RADIUS as f32,
                             jupiter_radius: nature::JUPITER_RADIUS as f32,

src/load.rs

@@ -11,8 +11,19 @@
 // This module manages asset loading.
 
 use bevy::ecs::system::EntityCommands;
+use bevy::render::render_resource::{AsBindGroup, ShaderRef};
+use bevy::pbr::{ExtendedMaterial, MaterialExtension, OpaqueRendererMethod};
 use bevy::prelude::*;
 
+pub struct LoadPlugin;
+impl Plugin for LoadPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugins(MaterialPlugin::<JupitersRing>::default());
+        app.add_plugins(MaterialPlugin::<SkyBox>::default());
+        app.add_plugins(MaterialPlugin::<ExtendedMaterial<StandardMaterial, AsteroidSurface, >>::default());
+    }
+}
+
 pub fn asset_name_to_path(name: &str) -> &'static str {
     match name {
         "suitv2" => "models/suit_v2/suit_v2.glb#Scene0",
@@ -64,3 +75,68 @@ pub fn load_scene_by_path(
         asset_server.load(&path_string)
     }
 }
+
+// Jupiter's Ring
+#[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
+pub struct JupitersRing {
+    pub alpha_mode: AlphaMode,
+    #[uniform(0)]
+    pub ring_radius: f32,
+    #[uniform(1)]
+    pub jupiter_radius: f32,
+}
+
+impl Material for JupitersRing {
+    fn fragment_shader() -> ShaderRef {
+        "shaders/jupiters_rings.wgsl".into()
+    }
+    fn alpha_mode(&self) -> AlphaMode {
+        self.alpha_mode
+    }
+}
+
+// Sky Box
+#[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
+pub struct SkyBox {}
+impl Material for SkyBox {
+    fn fragment_shader() -> ShaderRef {
+        "shaders/skybox.wgsl".into()
+    }
+}
+
+// Asteroid Surface
+#[derive(Asset, Reflect, AsBindGroup, Debug, Clone)]
+pub struct AsteroidSurface {
+    #[uniform(100)]
+    quantize_steps: u32
+}
+
+impl MaterialExtension for AsteroidSurface {
+    fn fragment_shader() -> ShaderRef {
+        "shaders/material_asteroid.wgsl".into()
+    }
+    fn deferred_fragment_shader() -> ShaderRef {
+        "shaders/material_asteroid.wgsl".into()
+    }
+}
+
+impl AsteroidSurface {
+    pub fn material() -> ExtendedMaterial<StandardMaterial, AsteroidSurface> {
+        ExtendedMaterial {
+            base: StandardMaterial {
+                base_color: Color::rgb(0.29, 0.255, 0.208),
+                perceptual_roughness: 1.0,
+                opaque_render_method: OpaqueRendererMethod::Auto,
+                ..default()
+            },
+            extension: Self::default(),
+        }
+    }
+}
+impl Default for AsteroidSurface {
+    fn default() -> Self {
+        Self {
+            quantize_steps: 3,
+        }
+    }
+}

src/main.rs

@@ -18,7 +18,6 @@ mod chat;
 mod commands;
 mod effects;
 mod hud;
-mod shading;
 mod load;
 mod var;
 mod world;
@@ -131,7 +130,7 @@ impl Plugin for OutFlyPlugin {
             commands::CommandsPlugin,
             effects::EffectsPlugin,
             hud::HudPlugin,
-            shading::ShadingPlugin,
+            load::LoadPlugin,
             world::WorldPlugin,
         ));
     }
@@ -183,7 +182,7 @@ fn debug(
     settings: Res<var::Settings>,
     keyboard_input: Res<ButtonInput<KeyCode>>,
     mut commands: Commands,
-    mut extended_materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, shading::AsteroidSurface>>>,
+    mut extended_materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, load::AsteroidSurface>>>,
     materials: Query<(Entity, Option<&Name>, &Handle<Mesh>)>,
 ) {
     if settings.dev_mode && keyboard_input.pressed(KeyCode::KeyP) {
@@ -191,7 +190,7 @@ fn debug(
             dbg!(mesh);
             let mut entity = commands.entity(entity);
             entity.remove::<Handle<StandardMaterial>>();
-            let material = extended_materials.add(shading::AsteroidSurface::material());
+            let material = extended_materials.add(load::AsteroidSurface::material());
             entity.insert(material);
         }
     }

src/shading.rs

@@ -1,89 +0,0 @@
-//   ▄████████▄      +        ███ +  ▄█████████ ███     +
-//  ███▀    ▀███ +         +  ███    ███▀  +    ███ +       +
-//  ███  +   ███ ███   ███ █████████ ███        ███  ███   ███
-//  ███     +███ ███   ███    ███    ███▐██████ ███  ███   ███
-//  ███ +    ███ ███+  ███   +███    ███     +  ███  ███ + ███
-//  ███▄    ▄███ ███▄  ███    ███ +  ███  +     ███  ███▄  ███
-//   ▀████████▀ + ▀███████    ███▄   ███▄       ▀████ ▀███████
-//       +                  +                +             ███
-//  +   ▀████████████████████████████████████████████████████▀
-//
-// This module manages graphics shaders.
-
-use bevy::prelude::*;
-use bevy::render::render_resource::{AsBindGroup, ShaderRef};
-use bevy::pbr::{ExtendedMaterial, MaterialExtension, OpaqueRendererMethod};
-
-pub struct ShadingPlugin;
-impl Plugin for ShadingPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugins(MaterialPlugin::<JupitersRing>::default());
-        app.add_plugins(MaterialPlugin::<SkyBox>::default());
-        app.add_plugins(MaterialPlugin::<ExtendedMaterial<StandardMaterial, AsteroidSurface, >>::default());
-    }
-}
-
-// Jupiter's Ring
-#[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
-pub struct JupitersRing {
-    pub alpha_mode: AlphaMode,
-    #[uniform(0)]
-    pub ring_radius: f32,
-    #[uniform(1)]
-    pub jupiter_radius: f32,
-}
-
-impl Material for JupitersRing {
-    fn fragment_shader() -> ShaderRef {
-        "shaders/jupiters_rings.wgsl".into()
-    }
-    fn alpha_mode(&self) -> AlphaMode {
-        self.alpha_mode
-    }
-}
-
-// Sky Box
-#[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
-pub struct SkyBox {}
-impl Material for SkyBox {
-    fn fragment_shader() -> ShaderRef {
-        "shaders/skybox.wgsl".into()
-    }
-}
-
-// Asteroid Surface
-#[derive(Asset, Reflect, AsBindGroup, Debug, Clone)]
-pub struct AsteroidSurface {
-    #[uniform(100)]
-    quantize_steps: u32
-}
-
-impl MaterialExtension for AsteroidSurface {
-    fn fragment_shader() -> ShaderRef {
-        "shaders/material_asteroid.wgsl".into()
-    }
-    fn deferred_fragment_shader() -> ShaderRef {
-        "shaders/material_asteroid.wgsl".into()
-    }
-}
-
-impl AsteroidSurface {
-    pub fn material() -> ExtendedMaterial<StandardMaterial, AsteroidSurface> {
-        ExtendedMaterial {
-            base: StandardMaterial {
-                base_color: Color::rgb(0.29, 0.255, 0.208),
-                perceptual_roughness: 1.0,
-                opaque_render_method: OpaqueRendererMethod::Auto,
-                ..default()
-            },
-            extension: Self::default(),
-        }
-    }
-}
-impl Default for AsteroidSurface {
-    fn default() -> Self {
-        Self {
-            quantize_steps: 3,
-        }
-    }
-}

src/world.rs

@@ -10,7 +10,7 @@
 //
 // This module populates the world with stars and asteroids.
 
-use crate::{actor, hud, load, nature, shading};
+use crate::{actor, hud, load, nature};
 use bevy::prelude::*;
 use bevy::math::{DVec3, I64Vec3};
 use bevy::scene::{InstanceId, SceneInstance};
@@ -74,7 +74,7 @@ pub fn setup(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
-    mut materials_skybox: ResMut<Assets<shading::SkyBox>>,
+    mut materials_skybox: ResMut<Assets<load::SkyBox>>,
 ) {
     // Generate starmap
     let sphere_handle = meshes.add(Sphere::new(1.0).mesh().uv(16, 16));
@@ -158,7 +158,7 @@ pub fn setup(
         }
         commands.spawn(MaterialMeshBundle {
             mesh: meshes.add(mesh),
-            material: materials_skybox.add(shading::SkyBox {}),
+            material: materials_skybox.add(load::SkyBox {}),
             transform: Transform::from_translation(Vec3::new(0.0, 0.0, 0.0)),
             ..default()
         });