Various tweaks and refactor

Author: nibsbin

Core/Simulation/Math/Area.cs

@@ -6,20 +6,24 @@ namespace Lockstep
 [System.Serializable]
 public struct Area
 {
-public Area (long xcorner1, long ycorner1, long xcorner2, long ycorner2) {
-XCorner1 = xcorner1;
-YCorner1 = ycorner1;
-XCorner2 = xcorner2;
-YCorner2 = ycorner2;
+public Area (long c1x, long c1y, long c2x, long c2y)
+{
+Corner1 = new Vector2d (c1x, c1y);
+Corner2 = new Vector2d (c2x, c2y);
+}
+public Area (Vector2d corner1, Vector2d corner2) {
+Corner1 = corner1;
+Corner2 = corner2;
 }
 [FixedNumber]
-public long XCorner1;
-[FixedNumber]
-public long YCorner1;
-[FixedNumber]
-public long XCorner2;
+public Vector2d Corner1;
 [FixedNumber]
-public long YCorner2;
+public Vector2d Corner2;
+
+public long XCorner1 {get {return Corner1.x;}}
+public long XCorner2 {get {return Corner2.x;}}
+public long YCorner1 {get {return Corner1.y;}}
+public long YCorner2 {get {return Corner2.y;}}
 public long XMin {get {return XCorner1 < XCorner2 ? XCorner1 : XCorner2;}}
 public long YMin {get {return YCorner1 < YCorner2 ? YCorner1 : YCorner2;}}
 public long XMax {get {return XCorner1 > XCorner2 ? XCorner1 : XCorner2;}}

Core/Simulation/Math/Coordinate.cs

@@ -17,6 +17,25 @@ public Coordinate(int X, int Y)
  y = Y;
  }
 
+public static Coordinate FloorToCoordinate (Vector2d v2) {
+Coordinate coor;
+coor.x = v2.x.ToInt();
+coor.y = v2.y.ToInt();
+return coor;
+}
+public static Coordinate RoundToCoordinate (Vector2d v2) {
+Coordinate coor;
+coor.x = v2.x.RoundToInt();
+coor.y = v2.y.RoundToInt();
+return coor;
+}
+public static Coordinate CeilToCoordinate (Vector2d v2) {
+Coordinate coor;
+coor.x = v2.x.CeilToInt();
+coor.y = v2.y.CeilToInt();
+return coor;
+}
+
  public override string ToString()
  {
  return "(" + x.ToString() + ", " + y.ToString() + ")";

Core/Utility/Array2D.cs

@@ -83,9 +83,17 @@ private void Initialize (int width, int height)
  }
  }
 
- public bool IsValid (int w, int h) {
+ public bool IsValidIndex (int w, int h) {
  return w >= 0 && w < this.Width && h >= 0 && h < this.Height;
  }
+public bool IsValidX(int x)
+{
+return x >= 0 && x < Width;
+}
+public bool IsValidY(int y)
+{
+return y >= 0 && y < Height;
+}
 
  public static Array2D<T> Clone (T[,] source) {
  Array2D<T> array = new Array2D<T>(source.GetLength(0),source.GetLength(1));

Example/ExampleDatabase/Example_Database.asset

@@ -18,7 +18,7 @@ public HeightMap (short[,] map) {
  public Short2D Map {get {return _map;}}
 
  public long GetHeight (int gridX, int gridY) {
- if (!_map.IsValid(gridX,gridY))
+ if (!_map.IsValidIndex(gridX,gridY))
  return 0;
  return HeightmapSaver.Uncompress(_map[gridX,gridY]);
  }