Smooth a zone (#369)

* smooth the whole zone * parallelize smoother for whole zone * oof
OpenPerpetuum · Aug 8, 2021 · 2447282 · 2447282
1 parent 9e84f1a
commit 2447282
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 7 deletions.
diff --git a/src/Perpetuum.Bootstrapper/PerpetuumBootstrapper.cs b/src/Perpetuum.Bootstrapper/PerpetuumBootstrapper.cs
@@ -2809,6 +2809,7 @@ private void RegisterZoneRequestHandlers()
             RegisterZoneRequestHandler<PBSSetReinforceOffset>(Commands.PBSSetReinforceOffset);
             RegisterZoneRequestHandler<PBSSetEffect>(Commands.PBSSetEffect);
             RegisterZoneRequestHandler<ZoneDrawRamp>(Commands.ZoneDrawRamp);
+            RegisterZoneRequestHandler<ZoneSmooth>(Commands.ZoneSmooth);
 
         }
 

diff --git a/src/Perpetuum.RequestHandlers/Perpetuum.RequestHandlers.csproj b/src/Perpetuum.RequestHandlers/Perpetuum.RequestHandlers.csproj
@@ -629,6 +629,7 @@
     <Compile Include="Zone\ZoneSetRuntimeZoneEntityName.cs" />
     <Compile Include="Zone\ZoneSwitchDegrade.cs" />
     <Compile Include="Zone\ZoneTerraformTest.cs" />
+    <Compile Include="Zone\ZoneSmooth.cs" />
     <Compile Include="Zone\ZoneUploadScanResult.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Perpetuum.RequestHandlers/Zone/ZoneDrawRamp.cs b/src/Perpetuum.RequestHandlers/Zone/ZoneDrawRamp.cs
@@ -1,15 +1,9 @@
-using Perpetuum.Accounting.Characters;
-using Perpetuum.Host.Requests;
+using Perpetuum.Host.Requests;
 using Perpetuum.Players;
 using Perpetuum.Zones;
-using Perpetuum.Zones.Beams;
-using Perpetuum.Zones.NpcSystem.Reinforcements;
 using Perpetuum.Zones.Terrains;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Perpetuum.RequestHandlers.Zone
 {

diff --git a/src/Perpetuum.RequestHandlers/Zone/ZoneSmooth.cs b/src/Perpetuum.RequestHandlers/Zone/ZoneSmooth.cs
@@ -0,0 +1,53 @@
+using Perpetuum.Host.Requests;
+using Perpetuum.Zones;
+using Perpetuum.Zones.Terrains;
+using System.Threading.Tasks;
+
+namespace Perpetuum.RequestHandlers.Zone
+{
+    public class ZoneSmooth : IRequestHandler<IZoneRequest>
+    {
+        private int CalculateBufferOffset(int x, int y, Area area)
+        {
+            return (x - area.X1) + (y - area.Y1) * area.Width;
+        }
+        public void HandleRequest(IZoneRequest request)
+        {
+            var zone = request.Zone;
+            zone.IsLayerEditLocked.ThrowIfTrue(ErrorCodes.TileTerraformProtected);
+            var area = Area.FromRectangle(0, 0, zone.Size.Width, zone.Size.Height);
+            var altBuffer = new ushort[area.Ground];
+            var workAreas = area.Slice(32);
+            Parallel.ForEach(workAreas, (workArea) =>
+            {
+                foreach (var p in workArea.GetPositions())
+                {
+                    var sum = 0.0;
+                    var count = 0;
+                    foreach (var n in p.EightNeighbours)
+                    {
+                        if (zone.IsValidPosition(n.intX, n.intY))
+                        {
+                            sum += zone.Terrain.Altitude.GetAltitudeAsDouble(n.intX, n.intY);
+                            count++;
+                        }
+                    }
+                    if (count > 0)
+                    {
+                        var smoothed = sum / count;
+                        var shortAlt = System.Convert.ToUInt16(smoothed * 32);
+                        altBuffer[CalculateBufferOffset(p.intX, p.intY, area)] = shortAlt;
+                    }
+                }
+            });
+            Parallel.ForEach(workAreas, (workArea) =>
+            {
+                foreach (var p in workArea.GetPositions())
+                {
+                    zone.Terrain.Altitude.SetValue(p.intX, p.intY, altBuffer[CalculateBufferOffset(p.intX, p.intY, area)]);
+                }
+                zone.Terrain.Slope.UpdateSlopeByArea(workArea);
+            });
+        }
+    }
+}
diff --git a/src/Perpetuum/Commands.cs b/src/Perpetuum/Commands.cs
@@ -98,6 +98,12 @@ public static Command GetCommandByText(string commandText)
             }
         };
 
+        public static readonly Command ZoneSmooth = new Command
+        {
+            Text = "zoneSmooth",
+            AccessLevel = AccessLevel.admin,
+        };
+
         public static readonly Command ZoneDisplayMissionSpots = new Command
         {
             Text = "zoneDisplayMissionSpots",

diff --git a/src/Perpetuum/Services/Channels/ChatCommands/AdminCommandHandlers.cs b/src/Perpetuum/Services/Channels/ChatCommands/AdminCommandHandlers.cs
@@ -1288,6 +1288,33 @@ public static void ZoneRandomFillGroundType(AdminCommandData data)
             HandleLocalRequest(data, cmd);
             SendMessageToAll(data, $"Command completed");
         }
+        [ChatCommand("ZoneSmoothAll")]
+        public static void ZoneUpdateSlope(AdminCommandData data)
+        {
+            if (!IsDevModeEnabled(data))
+                return;
+
+            int zoneId = data.Sender.ZoneId ?? -1;
+
+            try
+            {
+                if(data.Command.Args.Length > 0)
+                    zoneId = int.Parse(data.Command.Args[0]);
+            }
+            catch (Exception ex)
+            {
+                SendMessageToAll(data, "Bad args");
+                if (ex is ArgumentNullException)
+                    throw PerpetuumException.Create(ErrorCodes.RequiredArgumentIsNotSpecified);
+                throw;
+            }
+
+            CheckZoneId(data, zoneId);
+            var cmd = string.Format("{0}:zone_{1}:null", Commands.ZoneSmooth.Text, zoneId);
+            SendMessageToAll(data, $"Sending: {cmd}");
+            HandleLocalRequest(data, cmd);
+            SendMessageToAll(data, $"Command completed");
+        }
         [ChatCommand("ZoneLockLayers")]
         public static void ZoneLockLayers(AdminCommandData data)
         {