fix merge

bevyengine · Oct 27, 2022 · a3f2121 · a3f2121
1 parent 40591ab
commit a3f2121
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs
@@ -22,12 +22,12 @@ use bevy_render::{
     render_asset::RenderAssets,
     render_phase::{EntityRenderCommand, RenderCommandResult, TrackedRenderPass},
     render_resource::*,
-    renderer::{RenderDevice, RenderQueue, RenderTextureFormat},
+    renderer::{RenderDevice, RenderQueue},
     texture::{
-        DefaultImageSampler, FallbackImagesDepth, FallbackImagesMsaa, GpuImage, Image,
+        BevyDefault, DefaultImageSampler, FallbackImagesDepth, FallbackImagesMsaa, GpuImage, Image,
         ImageSampler, TextureFormatPixelInfo,
     },
-    view::{ComputedVisibility, ViewUniform, ViewUniformOffset, ViewUniforms},
+    view::{ComputedVisibility, ViewTarget, ViewUniform, ViewUniformOffset, ViewUniforms},
     Extract, RenderApp, RenderStage,
 };
 use bevy_transform::components::GlobalTransform;

diff --git a/examples/shader/shader_prepass.rs b/examples/shader/shader_prepass.rs
@@ -10,10 +10,6 @@ use bevy::{
 
 fn main() {
     App::new()
-        .insert_resource(AssetServerSettings {
-            watch_for_changes: true,
-            ..Default::default()
-        })
         .insert_resource(Msaa { samples: 4 })
         // The prepass is enabled per material
         .insert_resource(GlobalMaterialOptions {
@@ -155,8 +151,7 @@ struct Rotates;
 
 fn rotate(mut q: Query<&mut Transform, With<Rotates>>, time: Res<Time>) {
     for mut t in q.iter_mut() {
-        let rot =
-            (time.seconds_since_startup().sin() * 0.5 + 0.5) as f32 * std::f32::consts::PI * 2.0;
+        let rot = (time.elapsed_seconds().sin() * 0.5 + 0.5) as f32 * std::f32::consts::PI * 2.0;
         t.rotation = Quat::from_rotation_z(rot);
     }
 }