refactor chunk loading

Author: aratama

Diff for: src/level/chunk.rs

@@ -39,7 +39,7 @@ impl Bounds {
 pub struct LevelChunk {
     pub level: GameLevel,
     pub tiles: Vec<Tile>,
-    pub loading_index: usize,
+    pub loading_index: i32,
     pub entities: HashMap<(i32, i32), SpawnEntityProps>,
     pub bounds: Bounds,
     pub dirty: Option<Bounds>,
@@ -68,6 +68,8 @@ impl LevelChunk {
         let max_y =
             ((ldtk_level.world_y + ldtk_level.px_hei) / ldtk.coordinate.default_grid_size) as i32;
 
+        let height = max_y - min_y;
+
         // タイル読み込み
 
         let int_grid_layer = ldtk_level.get_layer("Tiles").unwrap();
@@ -87,8 +89,6 @@ impl LevelChunk {
             });
         }
 
-        let tiles_length = tiles.len();
-
         // エンティティ読み込み
 
         let entity_layer = ldtk_level.get_layer("Entities").unwrap();
@@ -146,7 +146,7 @@ impl LevelChunk {
                 min_y,
                 max_y,
             },
-            loading_index: if lazy_loading { 0 } else { tiles_length },
+            loading_index: if lazy_loading { 0 } else { height },
             dirty: if lazy_loading {
                 None
             } else {
@@ -160,6 +160,15 @@ impl LevelChunk {
         };
     }
 
+    #[allow(dead_code)]
+    pub fn width(&self) -> i32 {
+        self.bounds.max_x - self.bounds.min_x
+    }
+
+    pub fn height(&self) -> i32 {
+        self.bounds.max_y - self.bounds.min_y
+    }
+
     pub fn get_level_tile(&self, x: i32, y: i32) -> &Tile {
         if !self.bounds.contains(x, y) {
             static BLANK_TILE: LazyLock<Tile> = LazyLock::new(|| Tile::default());

Diff for: src/page/in_game.rs

@@ -415,7 +415,7 @@ fn update_lazy_tile_sprites(
     tiles_query: Query<(Entity, &TileSprite)>,
 ) {
     // チャンクごとに更新すべきインデックス列を保持
-    let mut tile_spawning_indices: HashMap<String, Vec<(i32, i32)>> = HashMap::new();
+    let mut tile_spawning_indices: HashMap<String, Vec<i32>> = HashMap::new();
 
     // ハッシュマップにチャンクごとVecを生成
     for chunk in &world.chunks {
@@ -428,32 +428,25 @@ fn update_lazy_tile_sprites(
         let indiceis_to_spawn = tile_spawning_indices.get_mut(&chunk.level.0).unwrap();
 
         // loading_index の続きを一部更新
-        for _ in 0..50 {
-            if chunk.tiles.len() <= chunk.loading_index {
-                break;
-            }
-
-            let w = chunk.bounds.max_x - chunk.bounds.min_x;
-            let lx = chunk.loading_index as i32 % w;
-            let ly = chunk.loading_index as i32 / w;
-            let x = chunk.bounds.min_x + lx as i32;
-            let y = chunk.bounds.min_y + ly as i32;
-            indiceis_to_spawn.push((x, y));
-
-            // todo これが重い？
-            // clear_tiles_by_bounds(
-            //     &mut commands,
-            //     &tiles_query,
-            //     Bounds {
-            //         min_x: x,
-            //         max_x: x + 1,
-            //         min_y: y,
-            //         max_y: y + 1,
-            //     },
-            // );
-
-            chunk.loading_index += 1;
+        if chunk.height() <= chunk.loading_index {
+            continue;
         }
+
+        indiceis_to_spawn.push(chunk.bounds.min_y + chunk.loading_index);
+
+        // todo これが重い？
+        clear_tiles_by_bounds(
+            &mut commands,
+            &tiles_query,
+            Bounds {
+                min_x: chunk.bounds.min_x,
+                max_x: chunk.bounds.max_x,
+                min_y: chunk.bounds.min_y + chunk.loading_index,
+                max_y: chunk.bounds.min_y + chunk.loading_index + 1,
+            },
+        );
+
+        chunk.loading_index += 1;
     }
 
     // 予約されたインデックスに応じてスプライトを生成
@@ -466,8 +459,10 @@ fn update_lazy_tile_sprites(
             .unwrap();
 
         // スプライトを再生成
-        for (x, y) in indices.iter() {
-            spawn_world_tile(&mut commands, &registry, &world, &chunk, *x, *y);
+        for y in indices.iter() {
+            for x in chunk.bounds.min_x..chunk.bounds.max_x {
+                spawn_world_tile(&mut commands, &registry, &world, &chunk, x, *y);
+            }
         }
     }
 }