add ImageSettings as a setup resource

Author: mockersf

crates/bevy_render/src/texture/image.rs

@@ -160,7 +160,7 @@ impl ImageSampler {
 
 /// Global resource for [`Image`] settings.
 ///
-/// Can be set via `insert_resource` during app initialization to change the default settings.
+/// Can be set via `insert_setup_resource` during app initialization to change the default settings.
 #[derive(Resource)]
 pub struct ImageSettings {
     /// The default image sampler to use when [`ImageSampler`] is set to `Default`.

crates/bevy_render/src/texture/mod.rs

@@ -67,10 +67,9 @@ impl Plugin for ImagePlugin {
             .set_untracked(DEFAULT_IMAGE_HANDLE, Image::default());
 
         let default_sampler = app
-            .world
-            .get_resource_or_insert_with(ImageSettings::default)
-            .default_sampler
-            .clone();
+            .consume_setup_resource::<ImageSettings>()
+            .unwrap_or_default()
+            .default_sampler;
         if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
             let default_sampler = {
                 let device = render_app.world.resource::<RenderDevice>();

examples/2d/sprite_sheet.rs

@@ -5,7 +5,7 @@ use bevy::prelude::*;
 
 fn main() {
     App::new()
-        .insert_resource(ImageSettings::default_nearest()) // prevents blurry sprites
+        .insert_setup_resource(ImageSettings::default_nearest()) // prevents blurry sprites
         .add_plugins(DefaultPlugins)
         .add_startup_system(setup)
         .add_system(animate_sprite)

examples/2d/texture_atlas.rs

@@ -6,7 +6,7 @@ use bevy::{asset::LoadState, prelude::*};
 fn main() {
     App::new()
         .init_resource::<RpgSpriteHandles>()
-        .insert_resource(ImageSettings::default_nearest()) // prevents blurry sprites
+        .insert_setup_resource(ImageSettings::default_nearest()) // prevents blurry sprites
         .add_plugins(DefaultPlugins)
         .add_state(AppState::Setup)
         .add_system_set(SystemSet::on_enter(AppState::Setup).with_system(load_textures))

examples/3d/shapes.rs

@@ -10,7 +10,7 @@ use bevy::{
 
 fn main() {
     App::new()
-        .insert_resource(ImageSettings::default_nearest())
+        .insert_setup_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_startup_system(setup)
         .add_system(rotate)