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

Fixed map collider generation

Browse Source 
I didn't realize the bodies were generated in the same method that generates the mesh triangles, TODO consider splitting that
This commit is contained in:
juanjp600
2017-06-21 18:45:06 -03:00
parent 7ab01b8237
commit 6b65e94d41
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BarotraumaShared/Source/Map/Levels/CaveGenerator.cs
+2 -1
View File
@@ -347,9 +347,10 @@ namespace Barotrauma
return pathCells; return pathCells;
} }
public static List<Body> GeneratePolygons(List<VoronoiCell> cells, out List<VertexPositionTexture> verticeList, bool setSolid=true) public static List<Body> GeneratePolygons(List<VoronoiCell> cells, out List<VertexPositionTexture> verticeList, bool setSolid=true)
{ {
//TODO: consider separating body generation from render triangle generation
verticeList = new List<VertexPositionTexture>(); verticeList = new List<VertexPositionTexture>();
var bodies = new List<Body>(); var bodies = new List<Body>();
BarotraumaShared/Source/Map/Levels/Level.cs
+3 -2
View File
@@ -440,16 +440,17 @@ namespace Barotrauma
List<VoronoiCell> cellsWithBody = new List<VoronoiCell>(cells); List<VoronoiCell> cellsWithBody = new List<VoronoiCell>(cells);
#if CLIENT
List<VertexPositionTexture> bodyVertices; List<VertexPositionTexture> bodyVertices;
bodies = CaveGenerator.GeneratePolygons(cellsWithBody, out bodyVertices); bodies = CaveGenerator.GeneratePolygons(cellsWithBody, out bodyVertices);
#if CLIENT
renderer.SetBodyVertices(bodyVertices.ToArray()); renderer.SetBodyVertices(bodyVertices.ToArray());
renderer.SetWallVertices(CaveGenerator.GenerateWallShapes(cells)); renderer.SetWallVertices(CaveGenerator.GenerateWallShapes(cells));
renderer.PlaceSprites(generationParams.BackgroundSpriteAmount); renderer.PlaceSprites(generationParams.BackgroundSpriteAmount);
#endif #endif
ShaftBody = BodyFactory.CreateEdge(GameMain.World, ShaftBody = BodyFactory.CreateEdge(GameMain.World,
ConvertUnits.ToSimUnits(new Vector2(borders.X, 0)), ConvertUnits.ToSimUnits(new Vector2(borders.X, 0)),
ConvertUnits.ToSimUnits(new Vector2(borders.Right, 0))); ConvertUnits.ToSimUnits(new Vector2(borders.Right, 0)));