cleanup

Author: ecoskey

crates/bevy_pbr/src/atmosphere/environment.rs

@@ -29,8 +29,6 @@ use bevy_render::{
 use bevy_utils::default;
 use tracing::warn;
 
-use super::Atmosphere;
-
 // Render world representation of an environment map light for the atmosphere
 #[derive(Component, ExtractComponent, Clone)]
 pub struct AtmosphereEnvironmentMap {

crates/bevy_pbr/src/atmosphere/mod.rs

@@ -42,9 +42,7 @@ use bevy_asset::{embedded_asset, AssetId, Assets, Handle};
 use bevy_camera::Camera3d;
 use bevy_core_pipeline::core_3d::graph::Node3d;
 use bevy_ecs::{
-    archetype::Archetype,
-    component::{Component, Components},
-    entity::Entity,
+    component::Component,
     query::{Changed, QueryItem, With},
     resource::Resource,
     schedule::IntoScheduleConfigs,
@@ -77,7 +75,7 @@ use resources::{
     prepare_atmosphere_transforms, queue_render_sky_pipelines, AtmosphereTransforms,
     RenderSkyBindGroupLayouts,
 };
-use tracing::{debug, warn};
+use tracing::warn;
 
 use crate::{
     resources::{prepare_atmosphere_uniforms, GpuAtmosphere},

crates/bevy_pbr/src/atmosphere/node.rs

@@ -8,7 +8,6 @@ use bevy_render::{
     renderer::RenderContext,
     view::{ViewTarget, ViewUniformOffset},
 };
-use tracing::warn;
 
 use crate::{resources::GpuAtmosphere, ViewLightsUniformOffset};
 
@@ -17,7 +16,7 @@ use super::{
         AtmosphereBindGroups, AtmosphereLutPipelines, AtmosphereTransformsOffset,
         RenderSkyPipelineId,
     },
-    Atmosphere, GpuAtmosphereSettings,
+    GpuAtmosphereSettings,
 };
 
 #[derive(PartialEq, Eq, Debug, Copy, Clone, Hash, RenderLabel)]

crates/bevy_pbr/src/atmosphere/resources.rs

@@ -532,12 +532,8 @@ pub struct GpuAtmosphere {
 pub fn prepare_atmosphere_uniforms(
     mut commands: Commands,
     atmospheres: Query<(Entity, &ExtractedAtmosphere)>,
-    gpu_media: Res<RenderAssets<GpuScatteringMedium>>,
 ) -> Result<(), BevyError> {
     for (entity, atmosphere) in atmospheres {
-        let gpu_medium = gpu_media
-            .get(atmosphere.medium)
-            .ok_or(ScatteringMediumMissingError(atmosphere.medium))?;
         commands.entity(entity).insert(GpuAtmosphere {
             ground_albedo: atmosphere.ground_albedo,
             bottom_radius: atmosphere.bottom_radius,

crates/bevy_pbr/src/medium.rs

@@ -1,17 +1,13 @@
+use alloc::{borrow::Cow, sync::Arc};
 use core::f32::{self, consts::PI};
-use std::{borrow::Cow, fs::canonicalize, mem, sync::Arc};
 
 use bevy_app::{App, Plugin};
-use bevy_asset::{Asset, AssetApp, AssetId, Assets, Handle};
-use bevy_color::{Color, LinearRgba};
+use bevy_asset::{Asset, AssetApp, AssetId};
 use bevy_ecs::{
     resource::Resource,
     system::{Commands, Res, SystemParamItem},
 };
-use bevy_math::{
-    curve::{EaseFunction, EasingCurve, Interval},
-    ops, Curve, FloatPow, U8Vec3, Vec3, Vec4, VectorSpace,
-};
+use bevy_math::{ops, Curve, FloatPow, Vec3, Vec4};
 use bevy_reflect::TypePath;
 use bevy_render::{
     render_asset::{PrepareAssetError, RenderAsset, RenderAssetPlugin},
@@ -23,7 +19,7 @@ use bevy_render::{
     renderer::{RenderDevice, RenderQueue},
     RenderApp, RenderStartup,
 };
-use smallvec::{smallvec_inline, SmallVec};
+use smallvec::SmallVec;
 
 #[doc(hidden)]
 pub struct ScatteringMediumPlugin;
@@ -143,13 +139,13 @@ impl ScatteringMedium {
                 ScatteringTerm {
                     absorption: Vec3::ZERO,
                     scattering: Vec3::new(5.802e-6, 13.558e-6, 33.100e-6),
-                    falloff: Falloff::Exponential { scale: 12.5 }, //TODO: check if matches reference
+                    falloff: Falloff::Exponential { scale: 12.5 },
                     phase: PhaseFunction::Rayleigh,
                 },
                 ScatteringTerm {
                     absorption: Vec3::splat(3.996e-6),
                     scattering: Vec3::splat(0.444e-6),
-                    falloff: Falloff::Exponential { scale: 83.5 }, //TODO: check if matches reference
+                    falloff: Falloff::Exponential { scale: 83.5 },
                     phase: PhaseFunction::Mie { bias: 0.8 },
                 },
                 ScatteringTerm {

examples/3d/atmosphere.rs

@@ -6,7 +6,7 @@ use bevy::{
     camera::Exposure,
     core_pipeline::{bloom::Bloom, tonemapping::Tonemapping},
     light::{light_consts::lux, AtmosphereEnvironmentMapLight, CascadeShadowConfigBuilder},
-    pbr::{Atmosphere, AtmosphereSettings, EarthAtmosphere},
+    pbr::{AtmosphereSettings, EarthAtmosphere},
     prelude::*,
 };