Merge pull request #209 from StarArawn/force_copy_src

Removed copy_src requirement and remove TilemapTextureSize component.
StarArawn · Aug 6, 2022 · f69316a · f69316a
2 parents 673764e + 6f08f10
commit f69316a
Show file tree

Hide file tree

Showing 27 changed files with 109 additions and 123 deletions.
diff --git a/examples/accessing_tiles.rs b/examples/accessing_tiles.rs
@@ -1,4 +1,4 @@
-use bevy::prelude::*;
+use bevy::{prelude::*, render::texture::ImageSettings};
 use bevy_ecs_tilemap::prelude::*;
 
 mod helpers;
@@ -81,7 +81,6 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size: TilemapGridSize { x: 16.0, y: 16.0 },
             size: tilemap_size,
             storage: tile_storage,
-            texture_size: TilemapTextureSize { x: 96.0, y: 16.0 },
             texture: TilemapTexture(texture_handle),
             tile_size,
             transform: bevy_ecs_tilemap::helpers::get_centered_transform_2d(
@@ -144,11 +143,11 @@ fn main() {
             title: String::from("Basic Example"),
             ..Default::default()
         })
+        .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(TilemapPlugin)
         .add_startup_system(startup)
         .add_system(helpers::camera::movement)
-        .add_system(helpers::texture::set_texture_filters_to_nearest)
         .add_system(update_map)
         .run();
 }
diff --git a/examples/animation.rs b/examples/animation.rs
@@ -1,6 +1,7 @@
 use bevy::{
     diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
     prelude::*,
+    render::texture::ImageSettings,
 };
 use bevy_ecs_tilemap::prelude::*;
 use bevy_ecs_tilemap::tiles::{AnimatedTile, TileBundle, TilePos, TileStorage, TileTexture};
@@ -11,23 +12,20 @@ use rand::thread_rng;
 mod helpers;
 
 struct TilemapMetadata {
-    texture_size: TilemapTextureSize,
     size: TilemapSize,
     tile_size: TilemapTileSize,
     grid_size: TilemapGridSize,
 }
 
 const BACKGROUND: &'static str = "tiles.png";
 const BACKGROUND_METADATA: TilemapMetadata = TilemapMetadata {
-    texture_size: TilemapTextureSize { x: 96.0, y: 16.0 },
     size: TilemapSize { x: 20, y: 20 },
     tile_size: TilemapTileSize { x: 16.0, y: 16.0 },
     grid_size: TilemapGridSize { x: 16.0, y: 16.0 },
 };
 
 const FLOWERS: &'static str = "flower_sheet.png";
 const FLOWERS_METADATA: TilemapMetadata = TilemapMetadata {
-    texture_size: TilemapTextureSize { x: 32.0, y: 448.0 },
     size: TilemapSize { x: 10, y: 10 },
     tile_size: TilemapTileSize { x: 32.0, y: 32.0 },
     grid_size: TilemapGridSize { x: 16.0, y: 16.0 },
@@ -39,7 +37,6 @@ fn create_background(mut commands: Commands, asset_server: Res<AssetServer>) {
     let tilemap_entity = commands.spawn().id();
 
     let TilemapMetadata {
-        texture_size,
         size,
         grid_size,
         tile_size,
@@ -68,7 +65,6 @@ fn create_background(mut commands: Commands, asset_server: Res<AssetServer>) {
         .insert_bundle(TilemapBundle {
             size,
             grid_size,
-            texture_size,
             tile_size,
             storage: tilemap_storage,
             texture: TilemapTexture(texture_handle.clone()),
@@ -81,7 +77,6 @@ fn create_animated_flowers(mut commands: Commands, asset_server: Res<AssetServer
     let texture_handle: Handle<Image> = asset_server.load(FLOWERS);
 
     let TilemapMetadata {
-        texture_size,
         size,
         grid_size,
         tile_size,
@@ -126,7 +121,6 @@ fn create_animated_flowers(mut commands: Commands, asset_server: Res<AssetServer
             grid_size,
             size,
             storage: tilemap_storage,
-            texture_size,
             texture: TilemapTexture(texture_handle.clone()),
             tile_size,
             transform: bevy_ecs_tilemap::helpers::get_centered_transform_2d(&size, &tile_size, 1.0),
@@ -146,6 +140,7 @@ fn main() {
             title: String::from("Animated Map Example"),
             ..Default::default()
         })
+        .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(LogDiagnosticsPlugin::default())
         .add_plugin(FrameTimeDiagnosticsPlugin::default())
@@ -154,6 +149,5 @@ fn main() {
         .add_startup_system(create_background)
         .add_startup_system(create_animated_flowers)
         .add_system(helpers::camera::movement)
-        .add_system(helpers::texture::set_texture_filters_to_nearest)
         .run();
 }
diff --git a/examples/basic.rs b/examples/basic.rs
@@ -1,4 +1,4 @@
-use bevy::prelude::*;
+use bevy::{prelude::*, render::texture::ImageSettings};
 use bevy_ecs_tilemap::prelude::*;
 mod helpers;
 
@@ -46,7 +46,6 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size: TilemapGridSize { x: 16.0, y: 16.0 },
             size: tilemap_size,
             storage: tile_storage,
-            texture_size: TilemapTextureSize { x: 96.0, y: 16.0 },
             texture: TilemapTexture(texture_handle),
             tile_size,
             transform: bevy_ecs_tilemap::helpers::get_centered_transform_2d(
@@ -95,11 +94,11 @@ fn main() {
             ),
             ..Default::default()
         })
+        .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(TilemapPlugin)
         .add_startup_system(startup)
         .add_system(helpers::camera::movement)
-        .add_system(helpers::texture::set_texture_filters_to_nearest)
         .add_system(swap_texture_or_hide)
         .run();
 }
diff --git a/examples/bench.rs b/examples/bench.rs
@@ -1,6 +1,7 @@
 use bevy::{
     diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
     prelude::*,
+    render::texture::ImageSettings,
 };
 use bevy_ecs_tilemap::prelude::*;
 
@@ -31,7 +32,6 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size: TilemapGridSize { x: 16.0, y: 16.0 },
             size: tilemap_size,
             storage: tile_storage,
-            texture_size: TilemapTextureSize { x: 96.0, y: 16.0 },
             texture: TilemapTexture(texture_handle),
             tile_size,
             transform: bevy_ecs_tilemap::helpers::get_centered_transform_2d(
@@ -51,12 +51,12 @@ fn main() {
             title: String::from("Benchmark Example"),
             ..Default::default()
         })
+        .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(LogDiagnosticsPlugin::default())
         .add_plugin(FrameTimeDiagnosticsPlugin::default())
         .add_plugin(TilemapPlugin)
         .add_startup_system(startup)
         .add_system(helpers::camera::movement)
-        .add_system(helpers::texture::set_texture_filters_to_nearest)
         .run();
 }
diff --git a/examples/chunking.rs b/examples/chunking.rs
@@ -1,9 +1,8 @@
-use bevy::{math::Vec3Swizzles, prelude::*, utils::HashSet};
+use bevy::{math::Vec3Swizzles, prelude::*, render::texture::ImageSettings, utils::HashSet};
 use bevy_ecs_tilemap::prelude::*;
 mod helpers;
 
 const TILE_SIZE: TilemapTileSize = TilemapTileSize { x: 16.0, y: 16.0 };
-const TEXTURE_SIZE: TilemapTextureSize = TilemapTextureSize { x: 96.0, y: 16.0 };
 const CHUNK_SIZE: TilemapSize = TilemapSize { x: 32, y: 32 };
 
 fn spawn_chunk(commands: &mut Commands, asset_server: &AssetServer, chunk_pos: IVec2) {
@@ -37,7 +36,6 @@ fn spawn_chunk(commands: &mut Commands, asset_server: &AssetServer, chunk_pos: I
             grid_size: TILE_SIZE.into(),
             size: CHUNK_SIZE,
             storage: tile_storage,
-            texture_size: TEXTURE_SIZE,
             texture: TilemapTexture(texture_handle),
             tile_size: TILE_SIZE,
             transform,
@@ -108,12 +106,12 @@ fn main() {
             title: String::from("Basic Chunking Example"),
             ..Default::default()
         })
+        .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(TilemapPlugin)
         .insert_resource(ChunkManager::default())
         .add_startup_system(startup)
         .add_system(helpers::camera::movement)
-        .add_system(helpers::texture::set_texture_filters_to_nearest)
         .add_system(spawn_chunks_around_camera)
         .add_system(despawn_outofrange_chunks)
         .run();

diff --git a/examples/colors.rs b/examples/colors.rs
@@ -1,4 +1,4 @@
-use bevy::prelude::*;
+use bevy::{prelude::*, render::texture::ImageSettings};
 use bevy_ecs_tilemap::prelude::*;
 
 mod helpers;
@@ -88,7 +88,6 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size: TilemapGridSize { x: 16.0, y: 16.0 },
             size: tilemap_size,
             storage: tile_storage,
-            texture_size: TilemapTextureSize { x: 96.0, y: 16.0 },
             texture: TilemapTexture(texture_handle),
             tile_size,
             mesh_type: TilemapMeshType::Square,
@@ -104,10 +103,10 @@ fn main() {
             title: String::from("Iso Diamond Example"),
             ..Default::default()
         })
+        .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(TilemapPlugin)
         .add_startup_system(startup)
         .add_system(helpers::camera::movement)
-        .add_system(helpers::texture::set_texture_filters_to_nearest)
         .run();
 }
diff --git a/examples/game_of_life.rs b/examples/game_of_life.rs
@@ -1,4 +1,4 @@
-use bevy::prelude::*;
+use bevy::{prelude::*, render::texture::ImageSettings};
 use bevy_ecs_tilemap::prelude::*;
 
 mod helpers;
@@ -38,7 +38,6 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size: TilemapGridSize { x: 16.0, y: 16.0 },
             size: tilemap_size,
             storage: tile_storage,
-            texture_size: TilemapTextureSize { x: 96.0, y: 16.0 },
             texture: TilemapTexture(texture_handle),
             tile_size,
             transform: bevy_ecs_tilemap::helpers::get_centered_transform_2d(
@@ -107,11 +106,11 @@ fn main() {
             title: String::from("Game of Life Example"),
             ..Default::default()
         })
+        .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(TilemapPlugin)
         .add_startup_system(startup)
         .add_system(helpers::camera::movement)
-        .add_system(helpers::texture::set_texture_filters_to_nearest)
         .add_system(update)
         .run();
 }
diff --git a/examples/helpers/mod.rs b/examples/helpers/mod.rs
@@ -1,3 +1,2 @@
 pub mod camera;
-pub mod texture;
 pub mod tiled;
diff --git a/examples/helpers/texture.rs b/examples/helpers/texture.rs
diff --git a/examples/helpers/tiled.rs b/examples/helpers/tiled.rs
@@ -160,11 +160,6 @@ pub fn process_loaded_maps(
                             y: tiled_map.map.height,
                         };
 
-                        let texture_size = TilemapTextureSize {
-                            x: tileset.images[0].width as f32,
-                            y: tileset.images[0].height as f32,
-                        };
-
                         let grid_size = TilemapGridSize {
                             x: tiled_map.map.tile_width as f32,
                             y: tiled_map.map.tile_height as f32,
@@ -231,7 +226,6 @@ pub fn process_loaded_maps(
                             grid_size,
                             size: map_size,
                             storage: tile_storage,
-                            texture_size,
                             texture: TilemapTexture(
                                 tiled_map
                                     .tilesets

diff --git a/examples/hexagon_column.rs b/examples/hexagon_column.rs
@@ -1,4 +1,4 @@
-use bevy::prelude::*;
+use bevy::{prelude::*, render::texture::ImageSettings};
 use bevy_ecs_tilemap::prelude::*;
 
 mod helpers;
@@ -57,7 +57,6 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size: tile_size.into(),
             size: tilemap_size,
             storage: tile_storage,
-            texture_size: TilemapTextureSize { x: 17.0, y: 105.0 },
             texture: TilemapTexture(texture_handle),
             tile_size,
             mesh_type: TilemapMeshType::Hexagon(HexType::Column),
@@ -92,11 +91,11 @@ fn main() {
             title: String::from("Hexagon Column Example"),
             ..Default::default()
         })
+        .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(TilemapPlugin)
         .add_startup_system(startup)
         .add_system(helpers::camera::movement)
-        .add_system(helpers::texture::set_texture_filters_to_nearest)
         .add_system(swap_mesh_type)
         .run();
 }
diff --git a/examples/hexagon_row.rs b/examples/hexagon_row.rs
@@ -1,4 +1,4 @@
-use bevy::prelude::*;
+use bevy::{prelude::*, render::texture::ImageSettings};
 use bevy_ecs_tilemap::prelude::*;
 mod helpers;
 
@@ -56,7 +56,6 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size: tile_size.into(),
             size: tilemap_size,
             storage: tile_storage,
-            texture_size: TilemapTextureSize { x: 105.0, y: 17.0 },
             texture: TilemapTexture(texture_handle),
             tile_size,
             mesh_type: TilemapMeshType::Hexagon(HexType::Row),
@@ -91,11 +90,11 @@ fn main() {
             title: String::from("Hexagon Row Example"),
             ..Default::default()
         })
+        .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(TilemapPlugin)
         .add_startup_system(startup)
         .add_system(helpers::camera::movement)
-        .add_system(helpers::texture::set_texture_filters_to_nearest)
         .add_system(swap_mesh_type)
         .run();
 }
diff --git a/examples/iso_diamond.rs b/examples/iso_diamond.rs
@@ -1,4 +1,4 @@
-use bevy::prelude::*;
+use bevy::{prelude::*, render::texture::ImageSettings};
 use bevy_ecs_tilemap::prelude::*;
 mod helpers;
 
@@ -56,7 +56,6 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size: TilemapGridSize { x: 64.0, y: 32.0 },
             size: tilemap_size,
             storage: tile_storage,
-            texture_size: TilemapTextureSize { x: 384.0, y: 32.0 },
             texture: TilemapTexture(texture_handle),
             tile_size,
             mesh_type: TilemapMeshType::Isometric(IsoType::Diamond),
@@ -72,10 +71,10 @@ fn main() {
             title: String::from("Iso Diamond Example"),
             ..Default::default()
         })
+        .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(TilemapPlugin)
         .add_startup_system(startup)
         .add_system(helpers::camera::movement)
-        .add_system(helpers::texture::set_texture_filters_to_nearest)
         .run();
 }
diff --git a/examples/iso_staggered.rs b/examples/iso_staggered.rs
@@ -1,4 +1,4 @@
-use bevy::prelude::*;
+use bevy::{prelude::*, render::texture::ImageSettings};
 use bevy_ecs_tilemap::prelude::*;
 
 mod helpers;
@@ -57,7 +57,6 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size: TilemapGridSize { x: 64.0, y: 32.0 },
             size: tilemap_size,
             storage: tile_storage,
-            texture_size: TilemapTextureSize { x: 384.0, y: 32.0 },
             texture: TilemapTexture(texture_handle),
             tile_size,
             mesh_type: TilemapMeshType::Isometric(IsoType::Staggered),
@@ -73,10 +72,10 @@ fn main() {
             title: String::from("Iso Staggered Example"),
             ..Default::default()
         })
+        .insert_resource(ImageSettings::default_nearest())
         .add_plugins(DefaultPlugins)
         .add_plugin(TilemapPlugin)
         .add_startup_system(startup)
         .add_system(helpers::camera::movement)
-        .add_system(helpers::texture::set_texture_filters_to_nearest)
         .run();
 }