Fix several bugs where cell lighting values were not updated on cell …

…level change
CnCNet · Jun 23, 2024 · f0a2837 · f0a2837
1 parent 2a6a224
commit f0a2837
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 29 deletions.
diff --git a/src/TSMapEditor/Mutations/Classes/DrawCliffMutation.cs b/src/TSMapEditor/Mutations/Classes/DrawCliffMutation.cs
@@ -176,6 +176,7 @@ private void PlaceTile(TileImage tile, Point2D targetCellCoords)
 
                     mapTile.ChangeTileIndex(tile.TileID, (byte)i);
                     mapTile.Level = (byte)Math.Min(originLevel + image.TmpImage.Height, Constants.MaxMapHeightLevel);
+                    mapTile.RefreshLighting(Map.Lighting, MutationTarget.LightingPreviewState);
                 }
             }
         }
@@ -191,6 +192,7 @@ public override void Undo()
                 {
                     mapTile.ChangeTileIndex(data.TileIndex, data.SubTileIndex);
                     mapTile.Level = data.Level;
+                    mapTile.RefreshLighting(Map.Lighting, MutationTarget.LightingPreviewState);
                 }
             }
 

diff --git a/src/TSMapEditor/Mutations/Classes/HeightMutations/AlterElevationMutationBase.cs b/src/TSMapEditor/Mutations/Classes/HeightMutations/AlterElevationMutationBase.cs
@@ -92,6 +92,8 @@ protected void Process()
 
             ApplyRamps();
 
+            RefreshLighting();
+
             MutationTarget.InvalidateMap();
         }
 
@@ -118,13 +120,24 @@ protected void ProcessCells()
 
         protected abstract void ApplyRamps();
 
+        private void RefreshLighting()
+        {
+            for (int i = 0; i < totalProcessedCells.Count; i++)
+            {
+                var cellCoords = totalProcessedCells[i];
+                var cell = Map.GetTile(cellCoords);
+                cell.RefreshLighting(Map.Lighting, MutationTarget.LightingPreviewState);
+            }
+        }
+
         public override void Undo()
         {
             foreach (var entry in undoData)
             {
                 var cell = Map.GetTile(entry.CellCoords);
                 cell.ChangeTileIndex(entry.TileIndex, (byte)entry.SubTileIndex);
                 cell.Level = (byte)entry.HeightLevel;
+                cell.RefreshLighting(Map.Lighting, MutationTarget.LightingPreviewState);
             }
 
             MutationTarget.InvalidateMap();

diff --git a/src/TSMapEditor/Mutations/Classes/HeightMutations/LowerCellsMutation.cs b/src/TSMapEditor/Mutations/Classes/HeightMutations/LowerCellsMutation.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using TSMapEditor.GameMath;
+using TSMapEditor.Models;
 using TSMapEditor.Rendering;
 using TSMapEditor.UI;
 
@@ -32,38 +33,38 @@ public override void Perform()
                     Point2D cellCoords = targetCellCoords + offset;
 
                     var cell = MutationTarget.Map.GetTile(cellCoords);
-                    if (cell == null)
-                        return;
-
-                    if (cell.Level > 0)
-                    {
-                        cell.Level--;
-                        affectedCells.Add(cellCoords);
-                    }
+                    LowerCellLevel(cell);
                 });
             }
             else
             {
                 var targetTile = MutationTarget.Map.GetTile(targetCellCoords);
-
-                if (targetTile == null || targetTile.Level <= 0)
-                    return;
-
                 var tilesToProcess = Helpers.GetFillAreaTiles(targetTile, MutationTarget.Map, MutationTarget.TheaterGraphics);
 
                 // Process tiles
                 foreach (Point2D cellCoords in tilesToProcess)
                 {
                     var cell = MutationTarget.Map.GetTile(cellCoords);
-
-                    cell.Level--;
-                    affectedCells.Add(cellCoords);
+                    LowerCellLevel(cell);
                 }
             }
 
             MutationTarget.AddRefreshPoint(targetCellCoords);
         }
 
+        private void LowerCellLevel(MapTile cell)
+        {
+            if (cell == null)
+                return;
+
+            if (cell.Level > 0)
+            {
+                cell.Level--;
+                affectedCells.Add(cell.CoordsToPoint());
+                cell.RefreshLighting(Map.Lighting, MutationTarget.LightingPreviewState);
+            }
+        }
+
         public override void Undo()
         {
             foreach (Point2D cellCoords in affectedCells)
@@ -73,7 +74,10 @@ public override void Undo()
                     return;
 
                 if (cell.Level < Constants.MaxMapHeight)
+                {
                     cell.Level++;
+                    cell.RefreshLighting(Map.Lighting, MutationTarget.LightingPreviewState);
+                }
             }
 
             MutationTarget.AddRefreshPoint(targetCellCoords);

diff --git a/src/TSMapEditor/Mutations/Classes/HeightMutations/RaiseCellsMutation.cs b/src/TSMapEditor/Mutations/Classes/HeightMutations/RaiseCellsMutation.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using TSMapEditor.GameMath;
+using TSMapEditor.Models;
 using TSMapEditor.Rendering;
 using TSMapEditor.UI;
 
@@ -32,38 +33,39 @@ public override void Perform()
                     Point2D cellCoords = targetCellCoords + offset;
 
                     var cell = MutationTarget.Map.GetTile(cellCoords);
-                    if (cell == null)
-                        return;
 
-                    if (cell.Level < Constants.MaxMapHeightLevel)
-                    {
-                        cell.Level++;
-                        affectedCells.Add(cellCoords);
-                    }
+                    RaiseCellLevel(cell);
                 });
             }
             else
             {
                 var targetTile = MutationTarget.Map.GetTile(targetCellCoords);
-
-                if (targetTile == null || targetTile.Level >= Constants.MaxMapHeightLevel)
-                    return;
-
                 var tilesToProcess = Helpers.GetFillAreaTiles(targetTile, MutationTarget.Map, MutationTarget.TheaterGraphics);
 
                 // Process tiles
                 foreach (Point2D cellCoords in tilesToProcess)
                 {
                     var cell = MutationTarget.Map.GetTile(cellCoords);
-
-                    cell.Level++;
-                    affectedCells.Add(cellCoords);
+                    RaiseCellLevel(cell);
                 }
             }
 
             MutationTarget.AddRefreshPoint(targetCellCoords);
         }
 
+        private void RaiseCellLevel(MapTile cell)
+        {
+            if (cell == null)
+                return;
+
+            if (cell.Level < Constants.MaxMapHeightLevel)
+            {
+                cell.Level++;
+                cell.RefreshLighting(Map.Lighting, MutationTarget.LightingPreviewState);
+                affectedCells.Add(cell.CoordsToPoint());
+            }
+        }
+
         public override void Undo()
         {
             foreach (Point2D cellCoords in affectedCells)
@@ -73,7 +75,10 @@ public override void Undo()
                     return;
 
                 if (cell.Level > 0)
+                {
                     cell.Level--;
+                    cell.RefreshLighting(Map.Lighting, MutationTarget.LightingPreviewState);
+                }
             }
 
             MutationTarget.AddRefreshPoint(targetCellCoords);

diff --git a/src/TSMapEditor/Mutations/Classes/PlaceTerrainTileMutation.cs b/src/TSMapEditor/Mutations/Classes/PlaceTerrainTileMutation.cs
@@ -116,6 +116,7 @@ public override void Perform()
                     {
                         mapTile.ChangeTileIndex(tile.TileID, (byte)i);
                         mapTile.Level = (byte)Math.Min(originLevel + image.TmpImage.Height, Constants.MaxMapHeightLevel);
+                        mapTile.RefreshLighting(Map.Lighting, MutationTarget.LightingPreviewState);
                     }
                 }
             });
@@ -309,6 +310,7 @@ public override void Undo()
                 {
                     mapCell.ChangeTileIndex(originalTerrainData.TileIndex, originalTerrainData.SubTileIndex);
                     mapCell.Level = originalTerrainData.Level;
+                    mapCell.RefreshLighting(Map.Lighting, MutationTarget.LightingPreviewState);
                 }
             }
 

diff --git a/src/TSMapEditor/Rendering/MapView.cs b/src/TSMapEditor/Rendering/MapView.cs
@@ -34,6 +34,7 @@ public interface IMutationTarget
         BrushSize BrushSize { get; }
         Randomizer Randomizer { get; }
         bool AutoLATEnabled { get; }
+        LightingPreviewMode LightingPreviewState { get; }
         bool OnlyPaintOnClearGround { get; }
     }
 
@@ -119,6 +120,7 @@ public MapView(WindowManager windowManager, Map map, TheaterGraphics theaterGrap
         public BrushSize BrushSize { get => EditorState.BrushSize; set => EditorState.BrushSize = value; }
         public bool Is2DMode => EditorState.Is2DMode;
         public DeletionMode DeletionMode => EditorState.DeletionMode;
+        public LightingPreviewMode LightingPreviewState => EditorState.LightingPreviewState;
         public Randomizer Randomizer => EditorState.Randomizer;
         public bool AutoLATEnabled => EditorState.AutoLATEnabled;
         public bool OnlyPaintOnClearGround => EditorState.OnlyPaintOnClearGround;