moved Coordinate into util packaging, make Rect use Coordinate

ProgressionGame · Oct 13, 2019 · 8cdbfe5 · 8cdbfe5
1 parent 54d6d60
commit 8cdbfe5
Show file tree

Hide file tree

Showing 20 changed files with 24 additions and 10 deletions.
diff --git a/ProgressionCore/City/CityManager.cs b/ProgressionCore/City/CityManager.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Progression.Engine.Core.City.Updates;
 using Progression.Engine.Core.World;
+using Progression.Util;
 using Progression.Util.Keys;
 
 namespace Progression.Engine.Core.City

diff --git a/ProgressionCore/City/Updates/AddCityUpdate.cs b/ProgressionCore/City/Updates/AddCityUpdate.cs
@@ -1,5 +1,6 @@
 using Progression.Engine.Core.World;
 using Progression.Engine.Core.World.Threading;
+using Progression.Util;
 
 namespace Progression.Engine.Core.City.Updates
 {

diff --git a/ProgressionCore/ProgressionCore.csproj b/ProgressionCore/ProgressionCore.csproj
@@ -98,7 +98,6 @@
     <Compile Include="World\ChangeState\IChangeState.cs" />
     <Compile Include="World\ChangeState\RectChangeState.cs" />
     <Compile Include="World\ChangeState\TransformableChangeStateBase.cs" />
-    <Compile Include="World\Coordinate.cs" />
     <Compile Include="World\DataLocation.cs" />
     <Compile Include="World\Features\Base\DataIdentifier.cs" />
     <Compile Include="World\Features\Base\FeatureWorld.cs" />

diff --git a/ProgressionCore/World/ChangeState/ChangeStateBase.cs b/ProgressionCore/World/ChangeState/ChangeStateBase.cs
@@ -1,5 +1,6 @@
 using Progression.Engine.Core.Civilization;
 using Progression.Engine.Core.World.Threading;
+using Progression.Util;
 
 namespace Progression.Engine.Core.World.ChangeState
 {

diff --git a/ProgressionCore/World/ChangeState/RectChangeState.cs b/ProgressionCore/World/ChangeState/RectChangeState.cs
@@ -18,7 +18,7 @@ public RectChangeState(ITileWorld parent, Rect affectedRect) : base(parent)
 
         protected override Coordinate transform(Coordinate coord)
         {
-            return new Coordinate((ushort) (coord.X - AffectedRect.Top), (ushort) (coord.Y - AffectedRect.Left));
+            return new Coordinate((ushort) (coord.X - AffectedRect.Base.X), (ushort) (coord.Y - AffectedRect.Base.Y));
         }
 
         protected override bool IsContained(Coordinate coord)

diff --git a/ProgressionCore/World/ChangeState/TransformableChangeStateBase.cs b/ProgressionCore/World/ChangeState/TransformableChangeStateBase.cs
@@ -1,6 +1,7 @@
 using System;
 using Progression.Engine.Core.World.Features.Base;
 using Progression.Engine.Core.World.Threading;
+using Progression.Util;
 
 namespace Progression.Engine.Core.World.ChangeState
 {

diff --git a/ProgressionCore/World/ITileWorld.cs b/ProgressionCore/World/ITileWorld.cs
@@ -1,6 +1,7 @@
 using Progression.Engine.Core.Civilization;
 using Progression.Engine.Core.World.Features.Base;
 using Progression.Engine.Core.World.Threading;
+using Progression.Util;
 
 namespace Progression.Engine.Core.World {
     public interface ITileWorld {

diff --git a/ProgressionCore/World/Threading/CivilisationOwnershipUpdate.cs b/ProgressionCore/World/Threading/CivilisationOwnershipUpdate.cs
@@ -1,3 +1,5 @@
+using Progression.Util;
+
 namespace Progression.Engine.Core.World.Threading
 {
     public class CivilisationOwnershipUpdate : TileUpdateBase

diff --git a/ProgressionCore/World/Threading/CivilisationVisionUpdate.cs b/ProgressionCore/World/Threading/CivilisationVisionUpdate.cs
@@ -1,4 +1,5 @@
 using Progression.Engine.Core.Civilization;
+using Progression.Util;
 
 namespace Progression.Engine.Core.World.Threading
 {

diff --git a/ProgressionCore/World/Threading/SimpleFeatureUpdate.cs b/ProgressionCore/World/Threading/SimpleFeatureUpdate.cs
@@ -1,5 +1,6 @@
 using Progression.Engine.Core.World.Features.Base;
 using Progression.Engine.Core.World.Features.Simple;
+using Progression.Util;
 
 namespace Progression.Engine.Core.World.Threading
 {

diff --git a/ProgressionCore/World/Threading/TileUpdateBase.cs b/ProgressionCore/World/Threading/TileUpdateBase.cs
@@ -1,4 +1,5 @@
-using Progression.Util.Threading;
+using Progression.Util;
+using Progression.Util.Threading;
 
 namespace Progression.Engine.Core.World.Threading
 {

diff --git a/ProgressionCore/World/Threading/WorldInterface.cs b/ProgressionCore/World/Threading/WorldInterface.cs
@@ -3,6 +3,7 @@
 using Progression.Engine.Core.World.Features.Simple;
 using Progression.Util.Threading;
 using Progression.Engine.Core.Civilization;
+using Progression.Util;
 
 namespace Progression.Engine.Core.World.Threading
 {

diff --git a/ProgressionCore/World/Tile.cs b/ProgressionCore/World/Tile.cs
@@ -2,6 +2,7 @@
 using Progression.Engine.Core.World.Features.Base;
 using Progression.Engine.Core.World.Features.Simple;
 using Progression.Engine.Core.World.Threading;
+using Progression.Util;
 
 namespace Progression.Engine.Core.World
 {

diff --git a/ProgressionCore/World/TileWorld.cs b/ProgressionCore/World/TileWorld.cs
@@ -3,6 +3,7 @@
 using Progression.Engine.Core.World.Features.Base;
 using Progression.Engine.Core.World.Features.Yield;
 using Progression.Engine.Core.World.Threading;
+using Progression.Util;
 
 namespace Progression.Engine.Core.World
 {

diff --git a/ProgressionCore/World/TileWorldBase.cs b/ProgressionCore/World/TileWorldBase.cs
@@ -1,6 +1,7 @@
 using Progression.Engine.Core.Civilization;
 using Progression.Engine.Core.World.Features.Base;
 using Progression.Engine.Core.World.Threading;
+using Progression.Util;
 
 namespace Progression.Engine.Core.World
 {

diff --git a/ProgressionUI/TileUI/TileUI.cs b/ProgressionUI/TileUI/TileUI.cs
@@ -1,4 +1,5 @@
 using Progression.Engine.Core.World;
+using Progression.Util;
 
 namespace Progression.UI.TileUI
 {

diff --git a/ProgressionUtil/ProgressionUtil.csproj b/ProgressionUtil/ProgressionUtil.csproj
@@ -52,6 +52,7 @@
     <Compile Include="Util\BinPacking\Bin.cs" />
     <Compile Include="Util\BinPacking\BinPackingSolvers.cs" />
     <Compile Include="Util\BinPacking\Packet.cs" />
+    <Compile Include="Util\Coordinate.cs" />
     <Compile Include="Util\Extension\ExtensionInspectorHelper.cs" />
     <Compile Include="Util\Extension\ExtensionManager.cs" />
     <Compile Include="Util\Extension\ExtensionValidator.cs" />

diff --git a/ProgressionCore/World/Coordinate.cs → ProgressionUtil/Util/Coordinate.cs b/ProgressionCore/World/Coordinate.cs → ProgressionUtil/Util/Coordinate.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Progression.Engine.Core.World
+namespace Progression.Util
 {
     public struct Coordinate : IEquatable<Coordinate>
     {

diff --git a/ProgressionUtil/Util/Rect.cs b/ProgressionUtil/Util/Rect.cs
@@ -2,22 +2,20 @@ namespace Progression.Util
 {
     public struct Rect
     {
-        public Rect(ushort left, ushort top, ushort width, ushort height)
+        public Rect(Coordinate @base, ushort width, ushort height)
         {
-            Left = left;
-            Top = top;
+            Base = @base;
             Width = width;
             Height = height;
         }
 
-        public ushort Left { get; }
-        public ushort Top { get; }
+        public Coordinate Base { get; }
         public ushort Width { get; }
         public ushort Height { get; }
 
         public bool IsInside(ushort x, ushort y)
         {
-            return x >= Top && x < Top + Height && y >= Left && y < Left + Width;
+            return x >= Base.X && x < Base.X + Height && y >= Base.Y && y < Base.Y + Width;
         }
     }
 }
diff --git a/TerminalRenderer/WorldView.cs b/TerminalRenderer/WorldView.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Progression.Engine.Core.World;
+using Progression.Util;
 
 namespace Progression.TerminalRenderer
 {