Fully integrated bevy_ecs_tilemap and restored most of the existing func

Author: StarArawn

Cargo.toml

@@ -9,8 +9,8 @@ edition = "2018"
 [dependencies]
 bevy = "0.5"
 bevy_egui = "0.4"
-bevy_tilemap = { git="https://github.com/StarArawn/bevy_tilemap.git", branch="fix-precision" }
+bevy_ecs_tilemap = { path="../bevy_ecs_tilemap" } #{ git="https://github.com/StarArawn/bevy_ecs_tilemap", rev="13adc2e4405115a8243249cdae38d796cc70149b" }
 big-brain = "0.5"
 noise = "0.7"
 pathfinding = "2.1"
-rand = "0.8"
+fastrand = "1.3.4"

examples/visual_ai.rs

@@ -1,9 +1,8 @@
 use bevy::{prelude::*};
 use big_brain::prelude::*;
-use rand::{thread_rng, Rng};
 
-const HALF_WIDTH: f32 = (1270.0 / 2.0) - 32.0;
-const HALF_HEIGHT: f32 = (720.0 / 2.0) - 32.0;
+const HALF_WIDTH: i32 = (1270 / 2) - 32;
+const HALF_HEIGHT: i32 = (720 / 2) - 32;
 
 struct Moving;
 
@@ -122,10 +121,9 @@ fn move_system(
         match *state {
             ActionState::Requested => {
                 if let Ok(mut target) = target_query.get_mut(actor.0) {
-                    let mut random = thread_rng();
                     let random_target = Vec2::new(
-                        random.gen_range(-HALF_WIDTH..HALF_WIDTH),
-                        random.gen_range(-HALF_HEIGHT..HALF_HEIGHT),
+                        fastrand::i32(-HALF_WIDTH..HALF_WIDTH) as f32,
+                        fastrand::i32(-HALF_HEIGHT..HALF_HEIGHT) as f32,
                     );
                     if target.value == Vec2::ZERO {
                         target.value = random_target;
@@ -242,11 +240,9 @@ fn startup(
     let potion_texture = asset_server.load("textures/health_potion.png");
     let potion_material = materials.add(potion_texture.into());
 
-    let mut random = thread_rng();
-
     for _ in 0..500 {
-        let x = random.gen_range(-HALF_WIDTH..HALF_WIDTH);
-        let y = random.gen_range(-HALF_HEIGHT..HALF_HEIGHT);
+        let x = fastrand::i32(-HALF_WIDTH..HALF_WIDTH) as f32;
+        let y = fastrand::i32(-HALF_HEIGHT..HALF_HEIGHT) as f32;
         commands.spawn_bundle(SpriteBundle {
             material: potion_material.clone(),
             transform: Transform::from_xyz(x, y, 0.0),

src/game/camera/input.rs

@@ -1,8 +1,5 @@
 use crate::game::GameState;
-use bevy::{
-    prelude::*,
-    render::camera::Camera,
-};
+use bevy::{prelude::*, render::camera::{Camera, OrthographicProjection}};
 
 use super::CustomOrthographicProjection;
 
@@ -32,7 +29,7 @@ pub fn camera_movement(
     mut query: Query<(
         &mut Camera,
         &mut Transform,
-        &mut CustomOrthographicProjection,
+        &mut OrthographicProjection,
     )>,
     time: Res<Time>,
     _windows: Res<Windows>,
@@ -50,7 +47,7 @@ pub fn camera_movement(
 
     for (mut _camera, mut transform, mut projection) in query.iter_mut() {
         let mut direction = Vec3::ZERO;
-        let scale = projection.scale;
+        let scale = transform.scale.x;
 
         if keyboard_input.pressed(KeyCode::A) {
             direction -= Vec3::new(1.0, 0.0, 0.0);
@@ -70,16 +67,14 @@ pub fn camera_movement(
 
         if keyboard_input.pressed(KeyCode::Z) && scale < 6.0 {
             let scale = ((scale + (time.delta_seconds() * 1.5)) * 100.0).round() / 100.0;
-            projection.scale = scale;
+            transform.scale = Vec3::splat(scale);
         }
 
         if keyboard_input.pressed(KeyCode::X) && scale > 0.5 {
             let scale = ((scale - (time.delta_seconds() * 1.5)) * 100.0).round() / 100.0;
-            projection.scale = scale;
+            transform.scale = Vec3::splat(scale);
         }
 
-
-
         transform.translation += time.delta_seconds() * direction * 1000.;
     }
 }

src/game/game_state.rs

@@ -1,7 +1,9 @@
 #[derive(Clone, Eq, PartialEq, Debug, Hash)]
 pub enum GameState {
     Loading,
-    Generating,
+    SpawnMap,
+    GenerateMap,
+    GenerateRoads,
     MapView,
     BattleView,
 }

src/game/gameplay/attributes/mod.rs

@@ -1,4 +1,3 @@
-use std::collections::HashMap;
 use bevy::prelude::*;
 
 #[derive(Debug, Clone, Copy)]

src/game/gameplay/camera/movement.rs

@@ -1,4 +1,4 @@
-use bevy::{prelude::*, render::camera::{Camera, CameraProjection}};
+use bevy::{prelude::*, render::camera::{Camera, CameraProjection, OrthographicProjection}};
 
 use crate::game::{camera::{CameraData, CustomOrthographicProjection}, gameplay::character::PlayerSprite};
 
@@ -10,7 +10,7 @@ pub fn movement(
         &mut CameraData,
         &mut Camera,
         &mut Transform,
-        &mut CustomOrthographicProjection,
+        &mut OrthographicProjection,
     )>,
 ) {
     let mut player_position = Vec3::ZERO;
@@ -20,7 +20,7 @@ pub fn movement(
     for (mut camera_data, mut camera, mut camera_transform, mut projection) in camera_query.iter_mut() {
         let camera_z = camera_transform.translation.z;
 
-        camera_transform.translation = camera_transform.translation.truncate().lerp(player_position.truncate(), 0.01).extend(camera_z);
+        // camera_transform.translation = camera_transform.translation.truncate().lerp(player_position.truncate(), 0.01).extend(camera_z);
 
         projection.update(
             windows.get_primary().unwrap().width(),

src/game/gameplay/character/movement.rs

@@ -1,11 +1,11 @@
-use crate::game::map::Map;
+use crate::game::map::MapData;
 use bevy::prelude::*;
 
 use super::PlayerSprite;
 
 pub fn movement(
     time: Res<Time>,
-    map: Res<Map>,
+    map: Res<MapData>,
     mut player_query: Query<(&mut PlayerSprite, &mut Transform)>,
 ) {
     if map.road_path.len() > 0 {

src/game/gameplay/enemy/spawner.rs

@@ -1,6 +1,4 @@
 use bevy::prelude::*;
-use rand::{thread_rng, Rng};
-
 use crate::game::GameState;
 use super::spawn_enemy;
 
@@ -55,12 +53,10 @@ pub fn tick(
         Vec2::new(0.0, -16.0),
     ];
 
-    let mut random = thread_rng();
-
     for (transform, mut spawner) in spawner_query.iter_mut() {
         let spawner_elapsed_time = current_time - spawner.last_time;
         if spawner_elapsed_time > spawner.wait_time && spawner.current < spawner.limit {
-            let offset = spawn_pos[random.gen_range(0..4)];
+            let offset = spawn_pos[fastrand::usize(0..4)];
             spawn_enemy(
                 &mut commands,
                 &asset_server,

src/game/gameplay/scenes/map_view.rs

@@ -1,56 +1,56 @@
 use bevy::{prelude::*, render::camera::RenderLayers};
-use bevy_tilemap::prelude::*;
+use bevy_ecs_tilemap::prelude::*;
 
-use crate::game::{camera::{CameraData, CurrentCamera, CustomOrthographicCameraBundle}};
+use crate::game::{camera::{CameraData, CurrentCamera}};
 
 pub fn spawn(
     mut commands: Commands,
     mut current_camera: ResMut<CurrentCamera>,
-    mut tilemap_query: Query<&mut Tilemap>,
+    mut tilemap_query: Query<&mut Map>,
 ) {
-    let mut ortho = CustomOrthographicCameraBundle::new_2d();
+    let mut ortho = OrthographicCameraBundle::new_2d();
     ortho.orthographic_projection.scale = 0.5;
 
     let camera_entity = commands
         .spawn()
         .insert_bundle(ortho)
         .insert(CameraData::default())
-        .insert(RenderLayers::layer(0))
+        // .insert(RenderLayers::layer(0))
         .id();
 
     current_camera.camera = Some(camera_entity);
 
     for mut tilemap in tilemap_query.iter_mut() {
-        let map_width = tilemap.width().unwrap() as i32;
-        let map_height = tilemap.height().unwrap() as i32;
-        let half_map_width = map_width / 2;
-        let half_map_height = map_height / 2;
-
-        for x in -half_map_width..half_map_width {
-            for y in -half_map_height..half_map_height {
-                tilemap.spawn_chunk((x, y)).unwrap();
-            }
-        }
+        // let map_width = tilemap.width().unwrap() as i32;
+        // let map_height = tilemap.height().unwrap() as i32;
+        // let half_map_width = map_width / 2;
+        // let half_map_height = map_height / 2;
+
+        // for x in -half_map_width..half_map_width {
+        //     for y in -half_map_height..half_map_height {
+        //         tilemap.spawn_chunk((x, y)).unwrap();
+        //     }
+        // }
     }
 }
 
 pub fn destroy(
     mut commands: Commands,
     mut current_camera: ResMut<CurrentCamera>,
-    mut tilemap_query: Query<&mut Tilemap>,
+    mut tilemap_query: Query<&mut Map>,
 ) {
     commands.entity(current_camera.camera.take().unwrap()).despawn_recursive();
 
     for mut tilemap in tilemap_query.iter_mut() {
-        let map_width = tilemap.width().unwrap() as i32;
-        let map_height = tilemap.height().unwrap() as i32;
-        let half_map_width = map_width / 2;
-        let half_map_height = map_height / 2;
-
-        for x in -half_map_width..half_map_width {
-            for y in -half_map_height..half_map_height {
-                tilemap.despawn_chunk((x, y)).unwrap();
-            }
-        }
+        // let map_width = tilemap.width().unwrap() as i32;
+        // let map_height = tilemap.height().unwrap() as i32;
+        // let half_map_width = map_width / 2;
+        // let half_map_height = map_height / 2;
+
+        // for x in -half_map_width..half_map_width {
+        //     for y in -half_map_height..half_map_height {
+        //         tilemap.despawn_chunk((x, y)).unwrap();
+        //     }
+        // }
     }
 }

src/game/loading.rs

@@ -14,6 +14,6 @@ pub fn loading(
     if asset_server.get_group_load_state(textures.iter().map(|(handle_id, _)| handle_id)) == LoadState::Loaded &&
         get_has_map_assets(asset_server, tilemap_atlas_handles)
     {
-        game_state.set(GameState::Generating).unwrap();
+        game_state.set(GameState::SpawnMap).unwrap();
     }
 }