[#821] MapTile getTileSheet function added.

Doc fixed. Code refactored.
b3dgs · Aug 13, 2024 · b199805 · b199805
1 parent 0515a3b
commit b199805
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/lionengine-game/src/main/java/com/b3dgs/lionengine/game/feature/tile/map/MapTile.java b/lionengine-game/src/main/java/com/b3dgs/lionengine/game/feature/tile/map/MapTile.java
@@ -68,7 +68,7 @@ public interface MapTile extends FeatureProvider, SurfaceTile
     void loadSheets(Media sheetsConfig);
 
     /**
-     * Remove all tiles from map and clear internal data.
+     * Remove all tiles from map.
      */
     void clear();
 
@@ -186,6 +186,15 @@ public interface MapTile extends FeatureProvider, SurfaceTile
      */
     SpriteTiled getSheet(int sheetId);
 
+    /**
+     * Get sheet from tile number.
+     * 
+     * @param tileNumber The tile number.
+     * @return The sheet found.
+     * @throws LionEngineException If sheet not found.
+     */
+    SpriteTiled getTileSheet(int tileNumber);
+
     /**
      * Get the number of used sheets.
      * 

diff --git a/lionengine-game/src/main/java/com/b3dgs/lionengine/game/feature/tile/map/MapTileGame.java b/lionengine-game/src/main/java/com/b3dgs/lionengine/game/feature/tile/map/MapTileGame.java
@@ -248,6 +248,12 @@ public SpriteTiled getSheet(int sheetId)
         return mapSurface.getSheet(sheetId);
     }
 
+    @Override
+    public SpriteTiled getTileSheet(int tileNumber)
+    {
+        return mapSurface.getTileSheet(tileNumber);
+    }
+
     @Override
     public int getSheetsNumber()
     {

diff --git a/...ne-game/src/main/java/com/b3dgs/lionengine/game/feature/tile/map/MapTileSurfaceModel.java b/...ne-game/src/main/java/com/b3dgs/lionengine/game/feature/tile/map/MapTileSurfaceModel.java
@@ -239,13 +239,13 @@ public void clear()
     {
         if (tiles != null)
         {
-            for (final List<TileGame> list : tiles)
+            for (int v = 0; v < heightInTile; v++)
             {
-                list.clear();
+                for (int h = 0; h < widthInTile; h++)
+                {
+                    tiles.get(v).set(h, null);
+                }
             }
-            tiles.clear();
-            widthInTile = 0;
-            heightInTile = 0;
         }
     }
 
@@ -399,6 +399,12 @@ public SpriteTiled getSheet(int sheetId)
         return sheets[sheetId];
     }
 
+    @Override
+    public SpriteTiled getTileSheet(int tileNumber)
+    {
+        return getSheet((int) Math.floor(tileNumber / (double) tilesPerSheet));
+    }
+
     @Override
     public int getSheetsNumber()
     {