feat(Yggdrasil): multiple content

.github/workflows/build-and-test.yml

@@ -5,9 +5,9 @@ name: .NET Build and Test
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "Yggdrasil/newContent0"]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "master", "Yggdrasil/newContent0"]
 
 jobs:
   build-and-test:

Sources/Everglow.Core/Utilities/MathUtils.Geometry.cs

@@ -1,3 +1,5 @@
+using Terraria;
+
 namespace Everglow.Commons.Utilities;
 
 public static partial class MathUtils
@@ -32,6 +34,38 @@ public static float ToRotationSafe(this Vector2 vector, float defaultValue = def
 		}
 	}
 
+	/// <summary>
+	/// 判定2D 圆形与 AABB 是否相交（边界算相交）
+	/// </summary>
+	/// <param name="circleCenter"></param>
+	/// <param name="radius"></param>
+	/// <param name="aabbMin"></param>
+	/// <param name="aabbMax"></param>
+	/// <returns></returns>
+	public static bool IntersectsCircleAABB(Vector2 circleCenter, float radius, Vector2 aabbMin, Vector2 aabbMax)
+	{
+		float closestX = Math.Clamp(circleCenter.X, aabbMin.X, aabbMax.X);
+		float closestY = Math.Clamp(circleCenter.Y, aabbMin.Y, aabbMax.Y);
+
+		float dx = circleCenter.X - closestX;
+		float dy = circleCenter.Y - closestY;
+
+		return (dx * dx + dy * dy) <= (radius * radius);
+	}
+
+	/// <summary>
+	/// 判定2D 圆形与 AABB 是否相交（边界算相交）
+	/// </summary>
+	/// <param name="circleCenter"></param>
+	/// <param name="radius"></param>
+	/// <param name="aabbMin"></param>
+	/// <param name="aabbMax"></param>
+	/// <returns></returns>
+	public static bool IntersectsCircleAABB(Vector2 circleCenter, float radius, Rectangle hitBox)
+	{
+		return IntersectsCircleAABB(circleCenter, radius, hitBox.TopLeft(), hitBox.BottomRight());
+	}
+
 	/// <summary>
 	/// 2D 多边形与 AABB 是否相交
 	/// </summary>
@@ -177,6 +211,23 @@ public static bool IsPointInPolygon(List<Vector2> polygon, Vector2 point)
 		return isInside;
 	}
 
+	// Distance from point pos to line defined by points a and b
+	public static float PointToLineDistance(Vector2 a, Vector2 b, Vector2 pos)
+	{
+		float dx = b.X - a.X;
+		float dy = b.Y - a.Y;
+
+		float numerator = MathF.Abs(dy * pos.X - dx * pos.Y + b.X * a.Y - b.Y * a.X);
+		float denominator = MathF.Sqrt(dx * dx + dy * dy);
+
+		if (denominator < float.Epsilon)
+		{
+			return (pos - a).Length(); // a and b are same point
+		}
+
+		return numerator / denominator;
+	}
+
 	/// <summary>
 	/// 判断点是否在线段上
 	/// </summary>
@@ -303,6 +354,48 @@ public static bool DoLineSegmentsIntersectByAlgebra(Vector2 p1, Vector2 p2, Vect
 		return r >= 0 && r <= 1 && s >= 0 && s <= 1;
 	}
 
+	/// <summary>
+	/// 获取2D多边形包围盒（AABB）
+	/// </summary>
+	/// <param name="polygon"></param>
+	/// <returns></returns>
+	public static Rectangle GetPolygonAABBBound_Rectangle(List<Vector2> polygon)
+	{
+		if (polygon == null || polygon.Count < 3)
+		{
+			return Rectangle.emptyRectangle;
+		}
+
+		Vector4 v4 = GetPolygonAABBBound_Vector4(polygon);
+		return new Rectangle((int)v4.X, (int)v4.Y, (int)(v4.Z - v4.X), (int)(v4.W - v4.Y));
+	}
+
+	/// <summary>
+	/// 获取2D多边形包围盒（AABB）
+	/// </summary>
+	/// <param name="polygon"></param>
+	/// <returns>(minX, minY, maxX, maxY) 的 Vector4 结构</returns>
+	public static Vector4 GetPolygonAABBBound_Vector4(List<Vector2> polygon)
+	{
+		if (polygon == null || polygon.Count < 3)
+		{
+			return Vector4.zero;
+		}
+
+		float minX = float.MaxValue;
+		float minY = float.MaxValue;
+		float maxX = float.MinValue;
+		float maxY = float.MinValue;
+		foreach (Vector2 p in polygon)
+		{
+			minX = MathF.Min(minX, p.X);
+			minY = MathF.Min(minY, p.Y);
+			maxX = MathF.Max(maxX, p.X);
+			maxY = MathF.Max(maxY, p.Y);
+		}
+		return new Vector4(minX, minY, maxX, maxY);
+	}
+
 	/// <summary>
 	/// 校验多边形边是否相交（相邻边除外，避免自相交多边形）(未完成)
 	/// </summary>

Sources/Everglow.Core/VFX/VFXBatch.cs

@@ -12,7 +12,7 @@ public class VFXBatch : IDisposable
 	private const int MAX_INDICES = MAX_VERTICES * 3;
 
 	//numbers Copy from SpriteBatch
-	private const int MAX_VERTICES = 8192;
+	private const int MAX_VERTICES = 1048576;
 
 	private List<IBuffers> buffers = new();
 

Sources/Everglow.Function/DeveloperContent/Items/TileDataReader.cs

@@ -3,6 +3,8 @@
 using Everglow.Commons.Vertex;
 using Everglow.Commons.VFX;
 using Everglow.Commons.VFX.Pipelines;
+using Terraria;
+using Terraria.ObjectData;
 
 namespace Everglow.Commons.DeveloperContent.Items;
 
@@ -54,6 +56,7 @@ public class TileDataReaderSystem : Visual
 	public Point FixPoint;
 	public static List<int> OwnerPlayerWhoAmI = new List<int>();
 	public List<Point> ContinueTiles = new List<Point>();
+	public List<Point> SurfaceTiles = new List<Point>();
 	public List<Point> CheckLiquidTiles = new List<Point>();
 	public Point OldTilePos = new Point(0, 0);
 	public bool EverLasting = false;
@@ -110,7 +113,7 @@ public override void Draw()
 			OwnerPlayerWhoAmI.Remove(player.whoAmI);
 			return;
 		}
-		Tile tile = Main.tile[i, j];
+		Tile tile = TileUtils.SafeGetTile(i, j);
 		int colorType = ItemRarityID.White;
 		Color drawColor = Color.White;
 		if (!tile.HasTile)
@@ -119,20 +122,31 @@ public override void Draw()
 			drawColor = Color.Gray;
 		}
 		DrawBlockBound(i, j, drawColor);
-		if (ContinueTiles.Count < MaxContinueCount)
+		if (tile.HasTile)
 		{
-			var drawContinueColor = new Color(0.12f, 0.24f, 0.4f, 0);
-			foreach (Point point in ContinueTiles)
+			if (ContinueTiles.Count < MaxContinueCount)
+			{
+				var drawContinueColor = new Color(0.12f, 0.24f, 0.4f, 0);
+				foreach (var check_tile in ContinueTiles)
+				{
+					DrawBlockBound(check_tile.X, check_tile.Y, drawContinueColor);
+				}
+			}
+			if (SurfaceTiles.Count < MaxContinueCount)
 			{
-				DrawBlockBound(point.X, point.Y, drawContinueColor);
+				var drawSurfaceTilesColor = new Color(0.8f, 0.03f, 0.06f, 0);
+				foreach (var check_tile in SurfaceTiles)
+				{
+					DrawBlockBound(check_tile.X, check_tile.Y, drawSurfaceTilesColor);
+				}
 			}
 		}
 		if (CheckLiquidTiles.Count < MaxContinueCount)
 		{
 			var drawContinueColor = new Color(0.0f, 0.0f, 0.6f, 0);
-			foreach (Point point in CheckLiquidTiles)
+			foreach (var check_tile in CheckLiquidTiles)
 			{
-				DrawBlockBound(point.X, point.Y, drawContinueColor);
+				DrawBlockBound(check_tile.X, check_tile.Y, drawContinueColor);
 			}
 		}
 		string datas = GetDatas(i, j);
@@ -146,6 +160,7 @@ public string GetDatas(int i, int j)
 		string datas = "\nCoordinate: [" + i + ", " + j + "]";
 		datas += "\nHasTile: " + tile.HasTile;
 		datas += "\nType :" + tile.TileType;
+		//datas += "\nPaint :" + tile.BlockColorAndCoating().Invisible;
 		if (tile.HasTile)
 		{
 			datas += " " + TileID.Search.GetName(tile.TileType);
@@ -154,10 +169,31 @@ public string GetDatas(int i, int j)
 			{
 				datas += "\nContinue Tiles : " + ContinueTiles.Count;
 			}
+			if (SurfaceTiles.Count < MaxContinueCount)
+			{
+				datas += "\nSurface Tiles : " + SurfaceTiles.Count;
+			}
+			int multiStyle = TileObjectData.GetTileStyle(tile);
+			if (multiStyle >= 0)
+			{
+				datas += "\nMultiTile Style: " + multiStyle;
+			}
 		}
 		if (!tile.HasTile)
 		{
-			datas += "\nCan Fill Liquid Blocks: " + CheckLiquidTiles.Count;
+			if (CheckLiquidTiles.Count <= 900)
+			{
+				datas += "\nCan Fill Liquid Blocks: " + CheckLiquidTiles.Count;
+			}
+		}
+		//float waterLine;
+		//Collision.GetWaterLine(i, j, out waterLine);
+		//datas += "\n" + waterLine;
+
+		if (tile.WallType > WallID.None)
+		{
+			datas += "\nWallType :" + tile.WallType;
+			datas += " " + WallID.Search.GetName(tile.WallType);
 		}
 
 		// datas += "\nSlope: " + tile.Slope;
@@ -171,105 +207,16 @@ public string GetDatas(int i, int j)
 	/// <returns></returns>
 	public void UpdateContinueTiles(int i, int j)
 	{
-		ContinueTiles = new List<Point>();
-		CheckLiquidTiles = new List<Point>();
-		BFSContinueTile(i, j);
-		BFSFillLiquid(i, j);
-	}
-
-	private static readonly (int, int)[] directions =
-	{
-		(0, 1),
-		(1, 0),
-		(0, -1),
-		(-1, 0),
-	};
-
-	private static readonly (int, int)[] directionsLiquid =
-	{
-		(1, 0),
-		(0, 1),
-		(-1, 0),
-	};
-
-	public void BFSContinueTile(int i, int j)
-	{
-		BFSContinueTile(new Point(i, j));
-	}
-
-	public void BFSContinueTile(Point checkPoint)
-	{
-		var queueChecked = new Queue<Point>();
-
-		// 将起始点加入队列
-		queueChecked.Enqueue(checkPoint);
-		var visited = new List<Point>();
-
-		while (queueChecked.Count > 0)
+		Tile tile = TileUtils.SafeGetTile(i, j);
+		if (tile.HasTile)
 		{
-			var tilePos = queueChecked.Dequeue();
-
-			foreach (var (dx, dy) in directions)
-			{
-				int checkX = tilePos.X + dx;
-				int checkY = tilePos.Y + dy;
-				var point = new Point(checkX, checkY);
-				Tile tile = TileUtils.SafeGetTile(checkX, checkY);
-
-				// 检查边界和障碍物
-				if (checkX >= 20 && checkX < Main.maxTilesX - 20 && checkY >= 20 && checkY < Main.maxTilesY - 20 &&
-					tile.HasTile && !visited.Contains(point))
-				{
-					queueChecked.Enqueue(point);
-					visited.Add(point);
-				}
-			}
-			if (queueChecked.Count > MaxContinueCount || visited.Count > MaxContinueCount)
-			{
-				break;
-			}
+			SurfaceTiles = TileUtils.BFSSurface(new Point(i, j), 625);
+			ContinueTiles = TileUtils.BFSContinueTile(new Point(i, j), false, 625);
 		}
-		ContinueTiles = visited;
-	}
-
-	public void BFSFillLiquid(int i, int j)
-	{
-		BFSFillLiquid(new Point(i, j));
-	}
-
-	public void BFSFillLiquid(Point checkPoint)
-	{
-		var queueChecked = new Queue<Point>();
-
-		// 将起始点加入队列
-		queueChecked.Enqueue(checkPoint);
-		var visited = new List<Point>();
-
-		while (queueChecked.Count > 0)
+		else
 		{
-			var tilePos = queueChecked.Dequeue();
-
-			foreach (var (dx, dy) in directionsLiquid)
-			{
-				int checkX = tilePos.X + dx;
-				int checkY = tilePos.Y + dy;
-				var point = new Point(checkX, checkY);
-				Tile tile = TileUtils.SafeGetTile(checkX, checkY);
-
-				// 检查边界和障碍物
-				if (checkX >= 20 && checkX < Main.maxTilesX - 20 && checkY >= 20 && checkY < Main.maxTilesY - 20 &&
-					!Collision.IsWorldPointSolid(point.ToWorldCoordinates()) && !visited.Contains(point))
-				{
-					queueChecked.Enqueue(point);
-					visited.Add(point);
-				}
-			}
-			if (queueChecked.Count > MaxContinueCount || visited.Count > MaxContinueCount)
-			{
-				break;
-			}
+			CheckLiquidTiles = TileUtils.BFSGetCanFillLiquidTiles(i, j);
 		}
-		CheckLiquidTiles = visited;
 	}
 
 	public void DrawBlockBound(int i, int j, Color color)