Merge branch 'main' of https://github.com/cryscan/bevy-hikari into main

cryscan · Oct 16, 2022 · 35d6eb0 · 35d6eb0
2 parents 23c2789 + ada2efe
commit 35d6eb0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/examples/scene.rs b/examples/scene.rs
@@ -18,11 +18,6 @@ use std::f32::consts::PI;
 
 fn main() {
     App::new()
-        .insert_resource(WindowDescriptor {
-            width: 400.,
-            height: 300.,
-            ..Default::default()
-        })
         .insert_resource(Msaa { samples: 4 })
         .insert_resource(LoadTimer(Timer::from_seconds(1.0, true)))
         .add_plugins(DefaultPlugins)

diff --git a/src/shaders/light.wgsl b/src/shaders/light.wgsl
@@ -909,7 +909,7 @@ fn direct_lit(@builtin(global_invocation_id) invocation_id: vec3<u32>) {
         ray.direction = normalize(r.s.sample_position.xyz - ray.origin);
         ray.inv_direction = 1.0 / ray.direction;
 
-        hit = traverse_top(ray, sample_distance + 0.1, sample_distance - 0.1);
+        hit = traverse_top(ray, F32_MAX, sample_distance - 0.1);
         info = hit_info(ray, hit);
 
         let validation_radiance = input_radiance(ray, info, 0u, SAMPLE_ALL_EMISSIVE);

diff --git a/src/transform.rs b/src/transform.rs
@@ -35,6 +35,7 @@ impl ExtractComponent for GlobalTransformQueue {
     }
 }
 
+#[allow(clippy::type_complexity)]
 fn previous_transform_system(
     mut commands: Commands,
     mut queries: ParamSet<(
@@ -58,6 +59,7 @@ fn previous_transform_system(
 #[derive(Component, Debug, Clone, Copy, Deref, DerefMut)]
 pub struct HierarchyVisibility(pub bool);
 
+#[allow(clippy::type_complexity)]
 fn hierarchy_visibility_system(
     mut commands: Commands,
     mut queries: ParamSet<(