Nicola/RuinAdventurer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Reworked border placement

Browse Source
This commit is contained in:
=
2026-04-28 17:41:18 +02:00
parent 5e4e325ec7
commit c8debc316f
3 changed files with 59 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Scripts/WorldGeneration/Layer.cs
+25 -61
View File
@@ -13,6 +13,7 @@ public partial class Layer : Node3D
int level;
bool updateFailed = false;
public bool hasContentGenerated = false;
public Vector2I gateCoordinate;
// Called when the node enters the scene tree for the first time.
public override void _Ready()
@@ -40,7 +41,7 @@ public partial class Layer : Node3D
}
}
public void SetupLayer(int layerSize, int level, Dictionary<string, MeshInstance3D> tileMeshes)
public void SetupLayer(int layerSize, int level, Dictionary<string, MeshInstance3D> tileMeshes, Vector2I collapseOrigin)
{
this.layerSize = layerSize;
this.level = level;
@@ -49,7 +50,7 @@ public partial class Layer : Node3D
int safetyCounter = 0;
while (true)
{
if (GenerateLayer()) break;
if (GenerateLayer(collapseOrigin)) break;
ResetLayer(tileMeshes);
safetyCounter++;
if (safetyCounter > 1000) break;
@@ -104,65 +105,30 @@ public partial class Layer : Node3D
}
}
private bool GenerateBorder()
private void GenerateBorder()
{
for (int x = 0; x < layerSize; x++)
{
for (int y = 0; y < layerSize; y++)
for (int z = 0; z < layerSize; z++)
{
if (x == 0 || y == 0 || x == layerSize - 1 || y == layerSize - 1)
{
var tile = tiles[x, y];
if (!IsBorder(x, z))
continue;
List<string> possibilities = new();
var tile = tiles[x, z];
var possibilities = GetBorderPossibilities(x, z);
if (x == 0 && y == 0)
{
possibilities.Add("corner_down_right");
}
else if (x == 0 && y == layerSize - 1)
{
possibilities.Add("corner_up_right");
}
else if (x == layerSize - 1 && y == 0)
{
possibilities.Add("corner_down_left");
}
else if (x == layerSize - 1 && y == layerSize - 1)
{
possibilities.Add("corner_up_left");
}
else if (y == 0)
{
possibilities.Add("straight_left_right");
possibilities.Add("t_down");
}
else if (y == layerSize - 1)
{
possibilities.Add("straight_left_right");
possibilities.Add("t_up");
}
else if (x == 0)
{
possibilities.Add("straight_up_down");
possibilities.Add("t_right");
}
else if (x == layerSize - 1)
{
possibilities.Add("straight_up_down");
possibilities.Add("t_left");
}
if (possibilities.Count == 0)
continue;
string result = tile.Collapse(possibilities[rand.Next(0, possibilities.Count)]);
if (result == "ERR")
return false;
NewPropagate(new Vector2I(x, y));
}
tile.Collapse(possibilities[rand.Next(possibilities.Count)]);
Propagate(new Vector2I(x, z));
}
}
return true;
}
private bool IsBorder(int x, int z)
{
return x == 0 || z == 0 || x == layerSize - 1 || z == layerSize - 1;
}
private void GenerateNecessaryTiles()
@@ -177,30 +143,28 @@ public partial class Layer : Node3D
if (tiles[posX, posY].tileMeshes.ContainsKey("gate"))
{
tiles[posX, posY].Collapse("gate");
NewPropagate(new Vector2I(posX, posY));
gateCoordinate = new Vector2I(posX, posY);
Propagate(gateCoordinate);
break;
}
}
}
public bool GenerateLayer()
public bool GenerateLayer(Vector2I collapseOrigin)
{
bool result = true;
int safetyCounter = 0;
if (!GenerateBorder())
{
return false;
}
GenerateBorder();
GenerateNecessaryTiles();
Vector2I position = GetSmallestPossibilities();
Vector2I position = tiles[collapseOrigin.X, collapseOrigin.Y].collapsedMesh == null ? collapseOrigin : GetSmallestPossibilities();
while (true)
{
string keyword = tiles[position.X, position.Y].Collapse("");
if (keyword == "ERR") return false;
if (keyword != "")
{
NewPropagate(position);
Propagate(position);
if (updateFailed) break;
position = GetSmallestPossibilities();
if (position == new Vector2(-100, -100))
@@ -219,7 +183,7 @@ public partial class Layer : Node3D
return result;
}
private void NewPropagate(Vector2I startPos)
private void Propagate(Vector2I startPos)
{
Queue<Vector2I> queue = new Queue<Vector2I>();
queue.Enqueue(startPos);