vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Narrow caves in levels, more background sprites

Browse Source
This commit is contained in:
Regalis
2016-04-10 10:57:38 +03:00
parent c5685db0aa
commit c6df095a8b
10 changed files with 270 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
Subsurface/Source/Map/Levels/CaveGenerator.cs
View File

@@ -40,7 +40,9 @@ namespace Barotrauma
{
for (float y = edges.Y + sideInterval; y < edges.W - sideInterval; y += sideInterval)
{
sites.Add(new Vector2(x, y) + Rand.Vector(sideInterval*0.45f, false));
if (Rand.Int(10, false) == 0) continue;
sites.Add(new Vector2(x, y) + Rand.Vector(sideInterval*0.4f, false));
}
}
@@ -76,6 +78,8 @@ namespace Barotrauma
float closestDist = 0.0f;
foreach (VoronoiCell cell in newCells)
{
if (cell.CellType != CellType.Edge) continue;
float dist = Vector2.Distance(startPoint, cell.Center);
if (dist < closestDist || startCell == null)
{
@@ -87,27 +91,62 @@ namespace Barotrauma
startCell.CellType = CellType.Path;
List<VoronoiCell> path = new List<VoronoiCell>() {startCell};
//VoronoiCell pathCell = startCell;
//for (int i = 0; i < newCells.Count / 2; i++)
//{
VoronoiCell pathCell = startCell;
for (int i = 0; i < newCells.Count / 2; i++)
{
// var allowdNextCells = new List<VoronoiCell>();
// foreach (GraphEdge edge in pathCell.edges)
// {
// var adjacent = edge.AdjacentCell(pathCell);
// if (adjacent == null ||
// adjacent.CellType == CellType.Path ||
// adjacent.CellType == CellType.Removed ||
// adjacent.CellType == CellType.Edge) continue;
var allowedNextCells = new List<VoronoiCell>();
foreach (GraphEdge edge in pathCell.edges)
{
var adjacent = edge.AdjacentCell(pathCell);
if (adjacent == null ||
//adjacent.CellType == CellType.Path ||
adjacent.CellType == CellType.Removed ||
adjacent.CellType == CellType.Edge) continue;
// allowdNextCells.Add(adjacent);
// }
allowedNextCells.Add(adjacent);
}
if (allowedNextCells.Count == 0) break;
// if (allowdNextCells.Count == 0) break;
pathCell = allowedNextCells[Rand.Int(allowedNextCells.Count, false)];
if (Rand.Int(4,false)==0)
{
float furthestDist = 0.0f;
foreach (VoronoiCell nextCell in allowedNextCells)
{
float dist = Vector2.Distance(startCell.Center, nextCell.Center);
if (dist > furthestDist || furthestDist == 0.0f)
{
furthestDist = dist;
pathCell = nextCell;
}
}
}
// pathCell = allowdNextCells[Rand.Int(allowdNextCells.Count, false)];
// path.Add(pathCell);
//}
pathCell.CellType = CellType.Path;
path.Add(pathCell);
}
float minPathWidth = 100.0f;
for (int i = 0; i < path.Count; i++)
{
var cell = path[i];
foreach (GraphEdge edge in cell.edges)
{
if (edge.point1 == edge.point2) continue;
if (Vector2.Distance(edge.point1, edge.point2) > minPathWidth) continue;
GraphEdge adjacentEdge = cell.edges.Find(e => e != edge && (e.point1 == edge.point1 || e.point2 == edge.point1));
var adjacentCell = adjacentEdge.AdjacentCell(cell);
if (i>0 && (adjacentCell.CellType == CellType.Path || adjacentCell.CellType == CellType.Edge)) continue;
adjacentCell.CellType = CellType.Path;
path.Add(adjacentCell);
}
}
return path;
}

69
Subsurface/Source/Map/Levels/Level.cs
View File

@@ -310,47 +310,58 @@ namespace Barotrauma
foreach (VoronoiCell cell in pathCells)
{
cell.CellType = CellType.Path;
cells.Remove(cell);
}
//for (int i = 0; i < 3; i++)
//{
// Vector2 startPoint = Vector2.Zero;
// VoronoiCell startCell = null;
// while (true)
// {
// startCell = cells[Rand.Int(cells.Count, false)];
List<VoronoiCell> usedCaveCells = new List<VoronoiCell>();
for (int i = 0; i < 3; i++)
{
Vector2 startPoint = Vector2.Zero;
VoronoiCell startCell = null;
// GraphEdge startEdge =
// startCell.edges.Find(e => pathCells.Contains(e.AdjacentCell(startCell)));
var caveCells = new List<VoronoiCell>();
// if (startEdge != null)
// {
// startPoint = (startEdge.point1 + startEdge.point2) / 2.0f;
// break;
// }
// }
// var caveCells = GetCells(startCell.Center, 1);
while (true)
{
startCell = cells[Rand.Int(cells.Count, false)];
// List<VoronoiCell> caveSolidCells;
GraphEdge startEdge =
startCell.edges.Find(e => pathCells.Contains(e.AdjacentCell(startCell)));
// var cavePathCells = CaveGenerator.CarveCave(caveCells, startPoint, out caveSolidCells);
if (startEdge != null)
{
startPoint = (startEdge.point1 + startEdge.point2) / 2.0f;
startPoint += startPoint - startCell.Center;
// caveCells.ForEach(c => cells.Remove(c));
caveCells = GetCells(startCell.Center, 2);
caveCells.RemoveAll(c => c.CellType == CellType.Path);
// //caveSolidCells = CleanCells(cavePathCells);
if (usedCaveCells.Any(c => caveCells.Contains(c))) continue;
break;
}
}
// cells.AddRange(caveSolidCells);
usedCaveCells.AddRange(caveCells);
// foreach (VoronoiCell cell in cavePathCells)
// {
// cells.Remove(cell);
// }
List<VoronoiCell> caveSolidCells;
// pathCells.AddRange(cavePathCells);
//}
var cavePathCells = CaveGenerator.CarveCave(caveCells, startPoint, out caveSolidCells);
caveCells.ForEach(c => cells.Remove(c));
//caveSolidCells = CleanCells(cavePathCells);
cells.AddRange(caveSolidCells);
foreach (VoronoiCell cell in cavePathCells)
{
cells.Remove(cell);
}
pathCells.AddRange(cavePathCells);
}
for (int x = 0; x < cellGrid.GetLength(0); x++)
{
@@ -376,6 +387,7 @@ namespace Barotrauma
renderer.SetBodyVertices(bodyVertices.ToArray());
renderer.SetWallVertices(CaveGenerator.GenerateWallShapes(cells));
renderer.PlaceSprites(1000);
wrappingWalls = new WrappingWall[2, 2];
@@ -442,7 +454,6 @@ namespace Barotrauma
endPosition = temp;
}
renderer.PlaceSprites(100);
Debug.WriteLine("**********************************************************************************");
Debug.WriteLine("Generated a map with " + sites.Count + " sites in " + sw.ElapsedMilliseconds + " ms");

2
Subsurface/Source/Map/Levels/LevelRenderer.cs
View File

@@ -120,7 +120,7 @@ namespace Barotrauma
SamplerState.LinearWrap, DepthStencilState.Default, null, null,
cam.Transform);
backgroundSpriteManager.DrawSprites(spriteBatch);
backgroundSpriteManager.DrawSprites(spriteBatch, cam);
if (backgroundCreatureManager!=null) backgroundCreatureManager.Draw(spriteBatch);